Merge pull request #3225 from Pana/feat/removeLegacyERpc

remove legacy eSpace RPC impl

Author: Pana

Cargo.lock

@@ -69,14 +69,12 @@ use crate::{
         extractor::RpcExtractor,
         impls::{
             cfx::RpcImpl, common::RpcImpl as CommonRpcImpl,
-            eth_pubsub::PubSubClient as EthPubSubClient, pubsub::PubSubClient,
+            pubsub::PubSubClient,
         },
-        launch_async_rpc_servers, setup_debug_rpc_apis,
-        setup_public_eth_rpc_apis, setup_public_rpc_apis,
+        launch_async_rpc_servers, setup_debug_rpc_apis, setup_public_rpc_apis,
     },
 };
 use cfxcore::consensus::pos_handler::read_initial_nodes_from_file;
-use std::net::SocketAddr;
 
 pub mod delegate_convert;
 pub mod shutdown_handler;
@@ -155,7 +153,6 @@ pub fn initialize_common_modules(
         Arc<AccountProvider>,
         Arc<Notifications>,
         PubSubClient,
-        EthPubSubClient,
         Arc<TokioRuntime>,
     ),
     String,
@@ -468,12 +465,6 @@ pub fn initialize_common_modules(
         *network.get_network_type(),
     );
 
-    let eth_pubsub = EthPubSubClient::new(
-        tokio_runtime.clone(),
-        consensus.clone(),
-        notifications.clone(),
-    );
-
     Ok((
         machine,
         secret_store,
@@ -489,7 +480,6 @@ pub fn initialize_common_modules(
         accounts,
         notifications,
         pubsub,
-        eth_pubsub,
         tokio_runtime,
     ))
 }
@@ -512,8 +502,6 @@ pub fn initialize_not_light_node_modules(
         Option<WSServer>,
         Option<WSServer>,
         Arc<PosVerifier>,
-        Option<HttpServer>,
-        Option<WSServer>,
         Arc<TokioRuntime>,
         Option<RpcServerHandle>,
         TaskManager,
@@ -533,9 +521,8 @@ pub fn initialize_not_light_node_modules(
         network,
         common_impl,
         accounts,
-        _notifications,
+        notifications,
         pubsub,
-        eth_pubsub,
         tokio_runtime,
     ) = initialize_common_modules(conf, exit.clone(), node_type)?;
 
@@ -677,7 +664,6 @@ pub fn initialize_not_light_node_modules(
             common_impl.clone(),
             rpc_impl.clone(),
             pubsub.clone(),
-            eth_pubsub.clone(),
             &conf,
         ),
     )?;
@@ -688,7 +674,6 @@ pub fn initialize_not_light_node_modules(
             common_impl.clone(),
             rpc_impl.clone(),
             pubsub.clone(),
-            eth_pubsub.clone(),
             &conf,
         ),
         RpcExtractor,
@@ -700,7 +685,6 @@ pub fn initialize_not_light_node_modules(
             common_impl.clone(),
             rpc_impl.clone(),
             pubsub.clone(),
-            eth_pubsub.clone(),
             &conf,
         ),
         RpcExtractor,
@@ -712,7 +696,6 @@ pub fn initialize_not_light_node_modules(
             common_impl.clone(),
             rpc_impl.clone(),
             pubsub.clone(),
-            eth_pubsub.clone(),
             &conf,
         ),
         RpcExtractor,
@@ -724,62 +707,26 @@ pub fn initialize_not_light_node_modules(
             common_impl.clone(),
             rpc_impl.clone(),
             pubsub.clone(),
-            eth_pubsub.clone(),
             &conf,
         ),
         RpcExtractor,
     )?;
 
-    let eth_rpc_http_server = super::rpc::start_http(
-        conf.eth_http_config(),
-        setup_public_eth_rpc_apis(
-            rpc_impl.clone(),
-            eth_pubsub.clone(),
-            &conf,
-            task_executor.clone(),
-        ),
-    )?;
-
-    let eth_rpc_ws_server = super::rpc::start_ws(
-        conf.eth_ws_config(),
-        setup_public_eth_rpc_apis(
-            rpc_impl.clone(),
-            eth_pubsub.clone(),
-            &conf,
-            task_executor.clone(),
-        ),
-        RpcExtractor,
-    )?;
-
     let rpc_http_server = super::rpc::start_http(
         conf.http_config(),
-        setup_public_rpc_apis(
-            common_impl,
-            rpc_impl,
-            pubsub,
-            eth_pubsub.clone(),
-            &conf,
-        ),
+        setup_public_rpc_apis(common_impl, rpc_impl, pubsub, &conf),
     )?;
 
     network.start();
 
-    let eth_rpc_http_server_addr =
-        conf.raw_conf.jsonrpc_http_eth_port_v2.map(|port| {
-            format!("0.0.0.0:{}", port)
-                .parse::<SocketAddr>()
-                .expect("Invalid socket port")
-        });
-    let async_eth_rpc_http_server =
+    let eth_rpc_server_handle =
         tokio_runtime.block_on(launch_async_rpc_servers(
-            conf.rpc_impl_config(),
-            conf.raw_conf.throttling_conf.clone(),
-            conf.raw_conf.public_evm_rpc_async_apis.clone(),
             consensus.clone(),
             sync.clone(),
             txpool.clone(),
-            eth_rpc_http_server_addr,
+            notifications.clone(),
             task_executor.clone(),
+            conf,
         ))?;
 
     metrics::initialize(conf.metrics_config(), task_executor.clone());
@@ -798,10 +745,8 @@ pub fn initialize_not_light_node_modules(
         debug_rpc_ws_server,
         rpc_ws_server,
         pos_verifier,
-        eth_rpc_http_server,
-        eth_rpc_ws_server,
         tokio_runtime,
-        async_eth_rpc_http_server,
+        eth_rpc_server_handle,
         task_manager,
     ))
 }

crates/client/src/common/mod.rs

@@ -33,8 +33,6 @@ pub struct ArchiveClientExtraComponents {
     pub sync: Arc<SynchronizationService>,
     pub txpool: Arc<TransactionPool>,
     pub pow: Arc<PowComputer>,
-    pub eth_rpc_http_server: Option<HttpServer>,
-    pub eth_rpc_ws_server: Option<WsServer>,
     /// Handle to the started ETH RPC server. This is version 2 of the ETH RPC.
     /// Which use Rust async I/O
     pub eth_rpc_server_handle: Option<RpcServerHandle>,
@@ -77,8 +75,6 @@ impl ArchiveClient {
             debug_rpc_ws_server,
             rpc_ws_server,
             pos_handler,
-            eth_rpc_http_server,
-            eth_rpc_ws_server,
             tokio_runtime,
             eth_rpc_server_handle,
             task_manager,
@@ -102,8 +98,6 @@ impl ArchiveClient {
                 sync,
                 txpool,
                 pow,
-                eth_rpc_http_server,
-                eth_rpc_ws_server,
                 eth_rpc_server_handle,
                 tokio_runtime,
                 task_manager,

crates/client/src/node_types/archive.rs

@@ -33,8 +33,6 @@ pub struct FullClientExtraComponents {
     pub sync: Arc<SynchronizationService>,
     pub txpool: Arc<TransactionPool>,
     pub pow: Arc<PowComputer>,
-    pub eth_rpc_http_server: Option<HttpServer>,
-    pub eth_rpc_ws_server: Option<WsServer>,
     /// Handle to the started ETH RPC server. This is version 2 of the ETH RPC.
     /// Which use Rust async I/O
     pub eth_rpc_server_handle: Option<RpcServerHandle>,
@@ -70,8 +68,6 @@ impl FullClient {
             debug_rpc_ws_server,
             rpc_ws_server,
             pos_handler,
-            eth_rpc_http_server,
-            eth_rpc_ws_server,
             tokio_runtime,
             eth_rpc_server_handle,
             task_manager,
@@ -91,8 +87,6 @@ impl FullClient {
                 sync,
                 txpool,
                 pow,
-                eth_rpc_http_server,
-                eth_rpc_ws_server,
                 eth_rpc_server_handle,
                 tokio_runtime,
                 task_manager,

crates/client/src/node_types/full.rs

@@ -69,7 +69,6 @@ impl LightClient {
             accounts,
             notifications,
             pubsub,
-            _eth_pubsub,
             _tokio_runtime,
         ) = initialize_common_modules(
             &mut conf,

crates/client/src/node_types/light.rs

@@ -23,6 +23,7 @@ use cfx_executor::{
     executive::{ExecutionError, ExecutionOutcome, TxDropError},
     internal_contract::storage_point_prop,
 };
+use cfx_rpc_eth_types::Transaction as EthTransaction;
 use cfx_statedb::{
     global_params::{
         AccumulateInterestRate, BaseFeeProp, DistributablePoSInterest,
@@ -83,8 +84,7 @@ use crate::{
         },
         traits::{cfx::Cfx, debug::LocalRpc, test::TestRpc},
         types::{
-            eth::Transaction as EthTransaction, pos::Block as PosBlock,
-            Account as RpcAccount, AccountPendingInfo,
+            pos::Block as PosBlock, Account as RpcAccount, AccountPendingInfo,
             AccountPendingTransactions, BlameInfo, Block as RpcBlock,
             BlockHashOrEpochNumber, Bytes, CfxRpcLogFilter,
             CheckBalanceAgainstTransactionResponse, ConsensusGraphStates,

crates/client/src/rpc/apis.rs

@@ -18,7 +18,9 @@ use cfx_parameters::{
     consensus_internal::REWARD_EPOCH_COUNT,
 };
 use cfx_types::{Space, H256};
-use cfxcore::{BlockDataManager, Notifications, SharedConsensusGraph};
+use cfxcore::{
+    channel::Channel, BlockDataManager, Notifications, SharedConsensusGraph,
+};
 use futures::future::join_all;
 use itertools::zip;
 use jsonrpc_core::Result as RpcResult;
@@ -78,6 +80,10 @@ impl PubSubClient {
         }
     }
 
+    pub fn epochs_ordered(&self) -> Arc<Channel<(u64, Vec<H256>)>> {
+        self.notifications.epochs_ordered.clone()
+    }
+
     /// Returns a chain notification handler.
     pub fn handler(&self) -> Weak<ChainNotificationHandler> {
         Arc::downgrade(&self.handler)

crates/client/src/rpc/impls/cfx/cfx_handler.rs

@@ -10,17 +10,14 @@ use crate::{
             EpochNumber as RpcEpochNumber, LocalizedBlockTrace, LocalizedTrace,
             TraceFilter as RpcTraceFilter,
         },
-        CoreResult,
     },
 };
 use cfx_addr::Network;
-use cfx_execute_helper::exec_tracer::TraceFilter as PrimitiveTraceFilter;
-use cfx_parity_trace_types::LocalizedTrace as PrimitiveLocalizedTrace;
 use cfx_rpc_cfx_impl::TraceHandler as CfxTraceHandler;
 use cfx_rpc_cfx_types::trace::EpochTrace;
 use cfx_types::H256;
 
-use cfxcore::{ConsensusGraph, SharedConsensusGraph};
+use cfxcore::SharedConsensusGraph;
 use jsonrpc_core::Result as JsonRpcResult;
 
 #[derive(Clone)]
@@ -34,16 +31,6 @@ impl TraceHandler {
             inner: CfxTraceHandler::new(network, consensus),
         }
     }
-
-    pub(crate) fn consensus_graph(&self) -> &ConsensusGraph {
-        self.inner.consensus_graph()
-    }
-
-    pub(crate) fn filter_primitives_traces_impl(
-        &self, filter: PrimitiveTraceFilter,
-    ) -> CoreResult<Option<Vec<PrimitiveLocalizedTrace>>> {
-        self.inner.filter_primitives_traces_impl(filter)
-    }
 }
 
 impl Trace for TraceHandler {