moved Endpoint prop. to RemoteCapability

Capnp.Net.Runtime/Rpc/ConsumedCapability.cs

@@ -16,8 +16,6 @@ namespace Capnp.Rpc
         /// </summary>
         protected abstract void ReleaseRemotely();
         internal abstract Action? Export(IRpcEndpoint endpoint, CapDescriptor.WRITER writer);
-        internal abstract IRpcEndpoint? Endpoint { get; }
-
         internal abstract void AddRef();
         internal abstract void Release();
 

Capnp.Net.Runtime/Rpc/ImportedCapability.cs

@@ -28,8 +28,6 @@ namespace Capnp.Rpc
             return call;
         }
 
-        internal override IRpcEndpoint? Endpoint => _ep;
-
         internal override Action? Export(IRpcEndpoint endpoint, CapDescriptor.WRITER capDesc)
         {
             if (endpoint == _ep)

Capnp.Net.Runtime/Rpc/Interception/CensorCapability.cs

@@ -34,7 +34,5 @@ namespace Capnp.Rpc.Interception
             writer.SenderHosted = endpoint.AllocateExport(MyVine, out bool _);
             return null;
         }
-
-        internal override IRpcEndpoint? Endpoint => null;
     }
 }

Capnp.Net.Runtime/Rpc/LazyCapability.cs

@@ -33,8 +33,6 @@ namespace Capnp.Rpc
             _capTask = AwaitCap();
         }
 
-        internal override IRpcEndpoint? Endpoint => null;
-
         internal override Action? Export(IRpcEndpoint endpoint, CapDescriptor.WRITER writer)
         {
             if (WhenResolved.ReplacementTaskIsCompletedSuccessfully())

Capnp.Net.Runtime/Rpc/LocalAnswerCapability.cs

@@ -29,8 +29,6 @@ namespace Capnp.Rpc
 
         }
 
-        internal override IRpcEndpoint? Endpoint => null;
-
         public Task WhenResolved => _whenResolvedProxy;
 
         public T? GetResolvedCapability<T>() where T : class => _whenResolvedProxy.GetResolvedCapability<T>();

Capnp.Net.Runtime/Rpc/LocalCapability.cs

@@ -52,8 +52,6 @@ namespace Capnp.Rpc
             return null;
         }
 
-        internal override IRpcEndpoint? Endpoint => null;
-
         protected override void ReleaseRemotely()
         {
         }

Capnp.Net.Runtime/Rpc/PromisedCapability.cs

@@ -23,8 +23,6 @@ namespace Capnp.Rpc
         public override Task WhenResolved => _resolvedCap.Task;
         public override T? GetResolvedCapability<T>() where T: class => _whenResolvedProxy.GetResolvedCapability<T>();
 
-        internal override IRpcEndpoint? Endpoint => _ep;
-
         internal override Action? Export(IRpcEndpoint endpoint, CapDescriptor.WRITER writer)
         {
             lock (_reentrancyBlocker)

Capnp.Net.Runtime/Rpc/RemoteAnswerCapability.cs

@@ -174,8 +174,6 @@ namespace Capnp.Rpc
             return call;
         }
 
-        internal override IRpcEndpoint Endpoint => _ep;
-
         internal override Action? Export(IRpcEndpoint endpoint, CapDescriptor.WRITER writer)
         {
             lock (_question.ReentrancyBlocker)

Capnp.Net.Runtime/Rpc/RemoteCapability.cs

@@ -13,6 +13,8 @@ namespace Capnp.Rpc
             _ep = ep;
         }
 
+        internal IRpcEndpoint Endpoint => _ep;
+
         internal override IPromisedAnswer DoCall(ulong interfaceId, ushort methodId, DynamicSerializerState args)
         {
             var call = SetupMessage(args, interfaceId, methodId);

Capnp.Net.Runtime/Rpc/RemoteResolvingCapability.cs

@@ -32,18 +32,11 @@ namespace Capnp.Rpc
 
         protected IPromisedAnswer CallOnResolution(ulong interfaceId, ushort methodId, DynamicSerializerState args)
         {
-            if (ResolvedCap == null)
+            var resolvedCap = ResolvedCap!;
-                throw new InvalidOperationException("Capability not yet resolved, calling on resolution not possible");
 
             try
             {
-                if (ResolvedCap.Endpoint!= null && ResolvedCap.Endpoint != _ep)
+                if (resolvedCap is RemoteCapability ||
-                {
-                    // Carol lives in a different Vat C.
-                    throw new NotImplementedException("Sorry, level 3 RPC is not yet supported.");
-                }
-
-                if (ResolvedCap.Endpoint != null ||
                     //# Note that in the case where Carol actually lives in Vat B (i.e., the same vat that the promise
                     //# already pointed at), no embargo is needed, because the pipelined calls are delivered over the
                     //# same path as the later direct calls.
@@ -58,7 +51,7 @@ namespace Capnp.Rpc
 #if DebugEmbargos
                     Logger.LogDebug("Direct call");
 #endif
-                    using var proxy = new Proxy(ResolvedCap);
+                    using var proxy = new Proxy(resolvedCap);
                     return proxy.Call(interfaceId, methodId, args, default);
                 }
                 else

Capnp.Net.Runtime/Rpc/RpcEngine.cs

@@ -891,7 +891,7 @@ namespace Capnp.Rpc
                                     {
                                         using var proxy = await t;
 
-                                        if (proxy.ConsumedCap?.Endpoint == this)
+                                        if (proxy.ConsumedCap is RemoteCapability remote && remote.Endpoint == this)
                                         {
 #if DebugEmbargos
                                             Logger.LogDebug($"Sender loopback disembargo. Thread = {Thread.CurrentThread.Name}");