Create VerifyCallback type alias

nervosnetwork · Sep 20, 2023 · c8cb225 · c8cb225
1 parent ea9f7ea
commit c8cb225
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/chain/src/chain.rs b/chain/src/chain.rs
@@ -54,6 +54,8 @@ const ORPHAN_BLOCK_SIZE: usize = (BLOCK_DOWNLOAD_WINDOW * 2) as usize;
 type ProcessBlockRequest = Request<LonelyBlock, ()>;
 type TruncateRequest = Request<Byte32, Result<(), Error>>;
 
+pub type VerifyCallback = dyn FnOnce(Result<(), ckb_error::Error>) + Send + Sync;
+
 /// Controller to the chain service.
 ///
 /// The controller is internally reference-counted and can be freely cloned.
@@ -94,7 +96,7 @@ impl ChainController {
     pub fn process_block_with_callback(
         &self,
         block: Arc<BlockView>,
-        verify_callback: Box<dyn FnOnce(Result<(), ckb_error::Error>) + Send + Sync>,
+        verify_callback: Box<VerifyCallback>,
     ) {
         self.internal_process_lonely_block(LonelyBlock {
             block,
@@ -194,14 +196,12 @@ pub struct ChainService {
     orphan_blocks_broker: Arc<OrphanBlockPool>,
 }
 
-pub type VerifyCallbackArgs<'a> = (&'a Shared, PeerIndex, Arc<BlockView>);
-
 pub struct LonelyBlock {
     pub block: Arc<BlockView>,
     pub peer_id: Option<PeerIndex>,
     pub switch: Option<Switch>,
 
-    pub verify_callback: Option<Box<dyn FnOnce(Result<(), ckb_error::Error>) + Send + Sync>>,
+    pub verify_callback: Option<Box<VerifyCallback>>,
 }
 
 impl LonelyBlock {
@@ -220,7 +220,7 @@ struct UnverifiedBlock {
     pub block: Arc<BlockView>,
     pub peer_id: Option<PeerIndex>,
     pub switch: Switch,
-    pub verify_callback: Option<Box<dyn FnOnce(Result<(), ckb_error::Error>) + Send + Sync>>,
+    pub verify_callback: Option<Box<VerifyCallback>>,
     pub parent_header: HeaderView,
 }
 

diff --git a/sync/src/relayer/mod.rs b/sync/src/relayer/mod.rs
@@ -309,7 +309,7 @@ impl Relayer {
 
         let block = Arc::new(block);
 
-        let verify_success_callback: fn(Result<(), ckb_error::Error>) = {
+        let verify_success_callback = {
             let broadcast_compact_block_tx = self.broadcast_compact_block_tx.clone();
             let block = Arc::clone(&block);
             let peer = peer.clone();

diff --git a/sync/src/types/mod.rs b/sync/src/types/mod.rs
@@ -2,7 +2,7 @@ use crate::orphan_block_pool::OrphanBlockPool;
 use crate::utils::is_internal_db_error;
 use crate::{Status, StatusCode, FAST_INDEX, LOW_INDEX, NORMAL_INDEX, TIME_TRACE_SIZE};
 use ckb_app_config::SyncConfig;
-use ckb_chain::chain::{ChainController, LonelyBlock};
+use ckb_chain::chain::{ChainController, LonelyBlock, VerifyCallback};
 use ckb_chain_spec::consensus::Consensus;
 use ckb_channel::Receiver;
 use ckb_constant::sync::{
@@ -1121,7 +1121,7 @@ impl SyncShared {
             chain,
             Arc::clone(&block),
             peer_id,
-            None::<Box<dyn FnOnce(Result<(), ckb_error::Error>) + Send + Sync>>,
+            None::<Box<VerifyCallback>>,
         );
         // if ret.is_err() {
         //     debug!("accept block {:?} {:?}", block, ret);
@@ -1191,7 +1191,7 @@ impl SyncShared {
         chain: &ChainController,
         block: Arc<core::BlockView>,
         peer_id: PeerIndex,
-        verify_callback: Option<Box<dyn FnOnce(Result<(), ckb_error::Error>) + Sync + Send>>,
+        verify_callback: Option<Box<VerifyCallback>>,
     ) {
         // let ret = {
         //     let mut assume_valid_target = self.state.assume_valid_target();