Remove gRPC proxy from wRPC

Cargo.toml

@@ -38,7 +38,6 @@ members = [
     "rpc/grpc/server",
     "rpc/wrpc/server",
     "rpc/wrpc/client",
-    "rpc/wrpc/proxy",
     "rpc/wrpc/wasm",
     "rpc/wrpc/examples/subscriber",
     "rpc/wrpc/examples/simple_client",
@@ -129,7 +128,6 @@ kaspa-wallet-macros = { version = "0.15.3", path = "wallet/macros" }
 kaspa-wasm = { version = "0.15.3", path = "wasm" }
 kaspa-wasm-core = { version = "0.15.3", path = "wasm/core" }
 kaspa-wrpc-client = { version = "0.15.3", path = "rpc/wrpc/client" }
-kaspa-wrpc-proxy = { version = "0.15.3", path = "rpc/wrpc/proxy" }
 kaspa-wrpc-server = { version = "0.15.3", path = "rpc/wrpc/server" }
 kaspa-wrpc-wasm = { version = "0.15.3", path = "rpc/wrpc/wasm" }
 kaspa-wrpc-example-subscriber = { version = "0.15.3", path = "rpc/wrpc/examples/subscriber" }

kaspad/src/daemon.rs

@@ -618,13 +618,12 @@ do you confirm? (answer y/n or pass --yes to the Kaspad command line to confirm
         listen_address.map(|listen_address| {
             Arc::new(WrpcService::new(
                 wrpc_service_tasks,
-                Some(rpc_core_service.clone()),
+                rpc_core_service.clone(),
                 &encoding,
                 wrpc_server_counters,
                 WrpcServerOptions {
                     listen_address: listen_address.to_address(&network.network_type, &encoding).to_string(), // TODO: use a normalized ContextualNetAddress instead of a String
                     verbose: args.wrpc_verbose,
-                    ..WrpcServerOptions::default()
                 },
             ))
         })

rpc/macros/src/wrpc/server.rs

@@ -54,7 +54,7 @@ impl ToTokens for RpcTable {
                         let verbose = server_ctx.verbose();
                         if verbose { workflow_log::log_info!("request: {:?}",request); }
                         // TODO: RPC-CONNECT
-                        let response: #response_type = server_ctx.rpc_service(&connection_ctx).#fn_call(None, request.into_inner()).await
+                        let response: #response_type = server_ctx.rpc_service().#fn_call(None, request.into_inner()).await
                             .map_err(|e|ServerError::Text(e.to_string()))?;
                         if verbose { workflow_log::log_info!("response: {:?}",response); }
                         Ok(Serializable(response))

rpc/wrpc/server/Cargo.toml

@@ -18,7 +18,6 @@ borsh = { workspace = true, features = ["rc"] }
 futures.workspace = true
 kaspa-consensus-core.workspace = true
 kaspa-core.workspace = true
-kaspa-grpc-client.workspace = true
 kaspa-notify.workspace = true
 kaspa-rpc-core.workspace = true
 kaspa-rpc-macros.workspace = true

rpc/wrpc/server/src/connection.rs

@@ -1,12 +1,11 @@
-use kaspa_grpc_client::{GrpcClient, GrpcClientNotify};
 use kaspa_notify::{
     connection::Connection as ConnectionT,
     error::{Error as NotifyError, Result as NotifyResult},
     listener::ListenerId,
     notification::Notification as NotificationT,
     notifier::Notify,
 };
-use kaspa_rpc_core::{api::ops::RpcApiOps, notify::mode::NotificationMode, Notification};
+use kaspa_rpc_core::{api::ops::RpcApiOps, Notification};
 use std::{
     fmt::{Debug, Display},
     sync::{Arc, Mutex},
@@ -48,7 +47,6 @@ struct ConnectionInner {
     pub id: u64,
     pub peer: SocketAddr,
     pub messenger: Arc<Messenger>,
-    pub grpc_client: Option<Arc<GrpcClient>>,
     // not using an atomic in case an Id will change type in the future...
     pub listener_id: Mutex<Option<ListenerId>>,
 }
@@ -83,12 +81,8 @@ pub struct Connection {
 }
 
 impl Connection {
-    pub fn new(id: u64, peer: &SocketAddr, messenger: Arc<Messenger>, grpc_client: Option<Arc<GrpcClient>>) -> Connection {
-        // If a GrpcClient is provided, it has to come configured in direct mode
-        assert!(grpc_client.is_none() || grpc_client.as_ref().unwrap().notification_mode() == NotificationMode::Direct);
-        // Should a gRPC client be provided, no listener_id is required for subscriptions so the listener id is set to default
-        let listener_id = Mutex::new(grpc_client.clone().map(|_| ListenerId::default()));
-        Connection { inner: Arc::new(ConnectionInner { id, peer: *peer, messenger, grpc_client, listener_id }) }
+    pub fn new(id: u64, peer: &SocketAddr, messenger: Arc<Messenger>) -> Connection {
+        Connection { inner: Arc::new(ConnectionInner { id, peer: *peer, messenger, listener_id: Mutex::new(None) }) }
     }
 
     /// Obtain the connection id
@@ -101,18 +95,6 @@ impl Connection {
         &self.inner.messenger
     }
 
-    pub fn grpc_client(&self) -> Arc<GrpcClient> {
-        self.inner
-            .grpc_client
-            .as_ref()
-            .cloned()
-            .unwrap_or_else(|| panic!("Incorrect use: `server::Connection` does not carry RpcApi references"))
-    }
-
-    pub fn grpc_client_notify_target(&self) -> GrpcClientNotify {
-        self.inner.clone()
-    }
-
     pub fn listener_id(&self) -> Option<ListenerId> {
         *self.inner.listener_id.lock().unwrap()
     }