comments feedback

Author: chenyukang

rpc/src/lib.rs

@@ -18,4 +18,4 @@ pub use crate::server::RpcServer;
 pub use crate::service_builder::ServiceBuilder;
 
 #[doc(hidden)]
-pub type IoHandler = MetaIoHandler<std::option::Option<Session>>;
+pub type IoHandler = MetaIoHandler<Option<Session>>;

rpc/src/module/mod.rs

@@ -134,25 +134,14 @@ pub(crate) use self::stats::StatsRpcImpl;
 pub(crate) use self::subscription::SubscriptionRpcImpl;
 pub(crate) use self::test::IntegrationTestRpcImpl;
 
-pub use self::alert::add_alert_rpc_methods;
-pub use self::alert::AlertRpc;
-pub use self::chain::add_chain_rpc_methods;
-pub use self::chain::ChainRpc;
-pub use self::debug::add_debug_rpc_methods;
-pub use self::debug::DebugRpc;
-pub use self::experiment::add_experiment_rpc_methods;
-pub use self::experiment::ExperimentRpc;
-pub use self::indexer::add_indexer_rpc_methods;
-pub use self::indexer::IndexerRpc;
-pub use self::miner::add_miner_rpc_methods;
-pub use self::miner::MinerRpc;
-pub use self::net::add_net_rpc_methods;
-pub use self::net::NetRpc;
-pub use self::pool::add_pool_rpc_methods;
-pub use self::pool::PoolRpc;
-pub use self::stats::add_stats_rpc_methods;
-pub use self::stats::StatsRpc;
-pub use self::subscription::add_subscription_rpc_methods;
-pub use self::subscription::SubscriptionRpc;
-pub use self::test::add_integration_test_rpc_methods;
-pub use self::test::IntegrationTestRpc;
+pub use self::alert::{add_alert_rpc_methods, AlertRpc};
+pub use self::chain::{add_chain_rpc_methods, ChainRpc};
+pub use self::debug::{add_debug_rpc_methods, DebugRpc};
+pub use self::experiment::{add_experiment_rpc_methods, ExperimentRpc};
+pub use self::indexer::{add_indexer_rpc_methods, IndexerRpc};
+pub use self::miner::{add_miner_rpc_methods, MinerRpc};
+pub use self::net::{add_net_rpc_methods, NetRpc};
+pub use self::pool::{add_pool_rpc_methods, PoolRpc};
+pub use self::stats::{add_stats_rpc_methods, StatsRpc};
+pub use self::subscription::{add_subscription_rpc_methods, SubscriptionRpc};
+pub use self::test::{add_integration_test_rpc_methods, IntegrationTestRpc};

rpc/src/service_builder.rs

@@ -246,7 +246,7 @@ impl<'a> ServiceBuilder<'a> {
         rpc_methods.into_iter().for_each(|(name, _method)| {
             let error = Err(RPCError::rpc_module_is_disabled(module));
             self.io_handler.add_sync_method(
-                name.split("deprecated.")
+                name.split(DEPRECATED_RPC_PREFIX)
                     .collect::<Vec<&str>>()
                     .last()
                     .unwrap(),