tmp commit

Cargo.toml

@@ -168,6 +168,7 @@ dirs = "5.0.1"
 downcast = "0.11.0"
 downcast-rs = "1.2.0"
 duration-string = "0.3.0"
+enum_dispatch = "0.3.13"
 enum-primitive-derive = "0.2.2"
 event-listener = "2.5.3" # TODO "3.0.1"
 evpkdf = "0.2.0"

kaspad/src/daemon.rs

@@ -32,6 +32,7 @@ use kaspa_mining::{
 use kaspa_p2p_flows::{flow_context::FlowContext, service::P2pService};
 
 use kaspa_perf_monitor::{builder::Builder as PerfMonitorBuilder, counters::CountersSnapshot};
+use kaspa_rpc_core::api::rpc::DummyRpcConnection;
 use kaspa_utxoindex::{api::UtxoIndexProxy, UtxoIndex};
 use kaspa_wrpc_server::service::{Options as WrpcServerOptions, WebSocketCounters as WrpcServerCounters, WrpcEncoding, WrpcService};
 
@@ -171,6 +172,30 @@ impl Runtime {
     }
 }
 
+use kaspa_rpc_core::api::connection::RpcConnection;
+pub enum DaemonConnection {
+    Wrpc(DummyRpcConnection),
+    Grpc(DummyRpcConnection),
+}
+
+impl RpcConnection for DaemonConnection {
+    fn id(&self) -> u64 {
+        match self {
+            DaemonConnection::Wrpc(conn) => conn.id(),
+            DaemonConnection::Grpc(conn) => conn.id(),
+        }
+    }
+}
+
+impl Clone for DaemonConnection {
+    fn clone(&self) -> Self {
+        match self {
+            DaemonConnection::Wrpc(dummy) => Self::Wrpc(DummyRpcConnection {}),
+            DaemonConnection::Grpc(dummy) => Self::Grpc(DummyRpcConnection {}),
+        }
+    }
+}
+
 /// Create [`Core`] instance with supplied [`Args`].
 /// This function will automatically create a [`Runtime`]
 /// instance with the supplied [`Args`] and then
@@ -182,7 +207,7 @@ impl Runtime {
 /// The instance of the [`RpcCoreService`] needs to be released
 /// (dropped) before the `Core` is shut down.
 ///
-pub fn create_core(args: Args, fd_total_budget: i32) -> (Arc<Core>, Arc<RpcCoreService>) {
+pub fn create_core(args: Args, fd_total_budget: i32) -> (Arc<Core>, Arc<RpcCoreService<DaemonConnection>>) {
     let rt = Runtime::from_args(&args);
     create_core_with_runtime(&rt, &args, fd_total_budget)
 }
@@ -198,7 +223,7 @@ pub fn create_core(args: Args, fd_total_budget: i32) -> (Arc<Core>, Arc<RpcCoreS
 /// The instance of the [`RpcCoreService`] needs to be released
 /// (dropped) before the `Core` is shut down.
 ///
-pub fn create_core_with_runtime(runtime: &Runtime, args: &Args, fd_total_budget: i32) -> (Arc<Core>, Arc<RpcCoreService>) {
+pub fn create_core_with_runtime(runtime: &Runtime, args: &Args, fd_total_budget: i32) -> (Arc<Core>, Arc<RpcCoreService<DaemonConnection>>) {
     let network = args.network();
     let mut fd_remaining = fd_total_budget;
     let utxo_files_limit = if args.utxoindex {

metrics/core/src/lib.rs

@@ -22,14 +22,14 @@ use workflow_log::*;
 pub type MetricsSinkFn =
     Arc<Box<dyn Send + Sync + Fn(MetricsSnapshot) -> Option<Pin<Box<(dyn Send + 'static + Future<Output = Result<()>>)>>> + 'static>>;
 
-pub struct Metrics {
+pub struct Metrics<Rpc: RpcApi> {
     task_ctl: DuplexChannel,
-    rpc: Arc<Mutex<Option<Arc<dyn RpcApi>>>>,
+    rpc: Arc<Mutex<Option<Arc<Rpc>>>>,
     sink: Arc<Mutex<Option<MetricsSinkFn>>>,
     data: Arc<Mutex<Option<MetricsData>>>,
 }
 
-impl Default for Metrics {
+impl<Rpc: RpcApi> Default for Metrics<Rpc> {
     fn default() -> Self {
         Metrics {
             task_ctl: DuplexChannel::oneshot(),
@@ -40,12 +40,12 @@ impl Default for Metrics {
     }
 }
 
-impl Metrics {
-    pub fn bind_rpc(&self, rpc: Option<Arc<dyn RpcApi>>) {
+impl<Rpc: RpcApi> Metrics<Rpc> {
+    pub fn bind_rpc(&self, rpc: Option<Arc<Rpc>>) {
         *self.rpc.lock().unwrap() = rpc;
     }
 
-    fn rpc(&self) -> Option<Arc<dyn RpcApi>> {
+    fn rpc(&self) -> Option<Arc<Rpc>> {
         self.rpc.lock().unwrap().clone()
     }
 
@@ -114,7 +114,7 @@ impl Metrics {
 
     // --- samplers
 
-    async fn sample_metrics(self: &Arc<Self>, rpc: Arc<dyn RpcApi>, data: &mut MetricsData) -> Result<()> {
+    async fn sample_metrics(self: &Arc<Self>, rpc: Arc<Rpc>, data: &mut MetricsData) -> Result<()> {
         let GetMetricsResponse { server_time: _, consensus_metrics, connection_metrics, bandwidth_metrics, process_metrics } =
             rpc.get_metrics(true, true, true, true).await?;
 

rpc/core/Cargo.toml

@@ -37,6 +37,7 @@ borsh.workspace = true
 cfg-if.workspace = true
 derive_more.workspace = true
 downcast.workspace = true
+enum_dispatch.workspace = true
 faster-hex.workspace = true
 hex.workspace = true
 js-sys.workspace = true

rpc/core/src/api/connection.rs

@@ -1,7 +1,9 @@
 use std::sync::Arc;
+use enum_dispatch::enum_dispatch;
 
+#[enum_dispatch]
 pub trait RpcConnection: Send + Sync {
     fn id(&self) -> u64;
 }
 
-pub type DynRpcConnection = Arc<dyn RpcConnection>;
+// pub type DynRpcConnection = Arc<dyn RpcConnection>;