switch object client to new code

[scpubgit/Tak.git] / lib / Tak / ObjectClient.pm

diff --git a/lib/Tak/ObjectClient.pm b/lib/Tak/ObjectClient.pm
index 2761cc6..bf3e5e3 100644 (file)
--- a/lib/Tak/ObjectClient.pm
+++ b/lib/Tak/ObjectClient.pm
@@ -5,41 +5,36 @@ use Moo;
 
 with 'Tak::Role::ObjectMangling';
 
-has world => (is => 'ro', required => 1);
+has remote => (is => 'ro', required => 1);
 
-has remote => (is => 'lazy');
+has object_service => (is => 'lazy');
 
-sub _build_remote {
+sub _build_object_service {
   my ($self) = @_;
-  my $world = $self->world;
-  $world->remote_for('meta')->blocking_request(
-    register => object_service => 'Tak::ObjectService'
-  );
-  $world->remote_for('object_service')
+  my $remote = $self->remote;
+  $remote->do(meta => register => object_service => 'Tak::ObjectService');
+  $remote->curry('object_service');
 }
 
 sub proxy_method_call {
   my ($self, @call) = @_;
+  my $client = $self->object_service;
   my $ready = $self->encode_objects(\@call);
   my $context = wantarray;
-  my @res = $self->remote->blocking_request(call_method => $context => $ready);
-  if ($res[0] eq 'RESULT') {
-    my $unpacked = $self->decode_objects($res[1]);
-    if ($context) {
-      return @$unpacked;
-    } elsif (defined $context) {
-      return $unpacked->[0];
-    } else {
-      return;
-    }
+  my $res = $client->do(call_method => $context => $ready);
+  my $unpacked = $self->decode_objects($res);
+  if ($context) {
+    return @$unpacked;
+  } elsif (defined $context) {
+    return $unpacked->[0];
   } else {
-    die $res[1];
+    return;
   }
 }
 
 sub proxy_death {
   my ($self, $proxy) = @_;
-  $self->remote->blocking_request(remove_object => $proxy->{tag});
+  $self->client->do(remove_object => $proxy->{tag});
 }
 
 sub inflate {