diff --git a/chain/src/chain.rs b/chain/src/chain.rs index bcef1bfc12..c95ad4853c 100644 --- a/chain/src/chain.rs +++ b/chain/src/chain.rs @@ -99,15 +99,6 @@ impl ChainController { .into()) }) } - - /// Since a non-owning reference does not count towards ownership, - /// it will not prevent the value stored in the allocation from being dropped - pub fn non_owning_clone(&self) -> Self { - ChainController { - truncate_sender: self.truncate_sender.clone(), - process_block_sender: self.process_block_sender.clone(), - } - } } /// The struct represent fork diff --git a/ckb-bin/src/subcommand/run.rs b/ckb-bin/src/subcommand/run.rs index 726a415944..fd6355af33 100644 --- a/ckb-bin/src/subcommand/run.rs +++ b/ckb-bin/src/subcommand/run.rs @@ -47,13 +47,13 @@ pub fn run(args: RunArgs, version: Version, async_handle: Handle) -> Result<(), let (network_controller, _rpc_server) = launcher.start_network_and_rpc( &shared, - chain_controller.non_owning_clone(), + chain_controller.clone(), miner_enable, pack.take_relay_tx_receiver(), ); let tx_pool_builder = pack.take_tx_pool_builder(); - tx_pool_builder.start(network_controller.non_owning_clone()); + tx_pool_builder.start(network_controller.clone()); ctrlc::set_handler(|| { info!("Trapped exit signal, exiting..."); diff --git a/network/src/network.rs b/network/src/network.rs index b8a0998e2b..d7ce369897 100644 --- a/network/src/network.rs +++ b/network/src/network.rs @@ -1386,17 +1386,6 @@ impl NetworkController { let _ignore = ping_controller.try_send(()); } } - - /// Since a non-owning reference does not count towards ownership, - /// it will not prevent the value stored in the allocation from being dropped - pub fn non_owning_clone(&self) -> Self { - NetworkController { - version: self.version.clone(), - network_state: Arc::clone(&self.network_state), - p2p_control: self.p2p_control.clone(), - ping_controller: self.ping_controller.clone(), - } - } } // Send an optional message before disconnect a peer