From 0603928164ce2862b9bdd6021f371a6151ad8688 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Fri, 3 May 2024 23:43:27 -0600
Subject: [PATCH] remove requirement for type args on subcommand

---
 src/handler/adapters.rs | 13 ++++++-------
 tests/handler.rs        |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/handler/adapters.rs b/src/handler/adapters.rs
index 78fb735..00a49ca 100644
--- a/src/handler/adapters.rs
+++ b/src/handler/adapters.rs
@@ -590,13 +590,12 @@ impl<Context, RemoteContext, H: Debug> Debug for RemoteCaller<Context, RemoteCon
     }
 }
 
-impl<Context, H, Inherited, LocalContext, RemoteContext> Handler<Inherited>
-    for WithContext<Context, RemoteCaller<LocalContext, RemoteContext, H>>
+impl<Context, H, Inherited, RemoteContext> Handler<Inherited>
+    for WithContext<Context, RemoteCaller<Context, RemoteContext, H>>
 where
-    Context: crate::Context,
-    LocalContext: crate::Context + CallRemote<RemoteContext>,
+    Context: crate::Context + CallRemote<RemoteContext>,
     RemoteContext: crate::Context,
-    H: HandlerFor<RemoteContext> + CliBindings<LocalContext>,
+    H: HandlerFor<RemoteContext> + CliBindings<Context>,
     H::Ok: Serialize + DeserializeOwned,
     H::Err: From<RpcError>,
     H::Params: Serialize + DeserializeOwned,
@@ -608,8 +607,8 @@ where
     fn handler_for<C: crate::Context>(self) -> Option<DynHandler<C, Inherited>> {
         if TypeId::of::<C>() == TypeId::of::<RemoteContext>() {
             DynHandler::new(self.handler.handler.no_cli())
-        } else if TypeId::of::<C>() == TypeId::of::<LocalContext>() {
-            DynHandler::new(CallRemoteHandler::<LocalContext, RemoteContext, _>::new(
+        } else if TypeId::of::<C>() == TypeId::of::<Context>() {
+            DynHandler::new(CallRemoteHandler::<Context, RemoteContext, _>::new(
                 self.handler.handler,
             ))
         } else {
diff --git a/tests/handler.rs b/tests/handler.rs
index 7128ba2..4e2ce12 100644
--- a/tests/handler.rs
+++ b/tests/handler.rs
@@ -119,7 +119,7 @@ fn make_api<C: Context>() -> ParentHandler<C> {
         donde: String,
     }
     ParentHandler::<C>::new()
-        .subcommand::<C, _>(
+        .subcommand(
             "echo",
             from_fn_async(
                 |c: ServerContext, EchoParams { next }: EchoParams| async move {