Fix rebase conflicts with develop: https://github.com/nervosnetwork/c…

…kb/tree/dfa4f3753862261818eb93c540e7a3679ef4acc9
nervosnetwork · Feb 2, 2024 · aa71451 · aa71451
1 parent 11abfc6
commit aa71451
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/sync/src/relayer/block_transactions_process.rs b/sync/src/relayer/block_transactions_process.rs
@@ -116,10 +116,9 @@ impl<'a> BlockTransactionsProcess<'a> {
                 match ret {
                     ReconstructionResult::Block(block) => {
                         pending.remove();
-                        let status = self
-                            .relayer
+                        self.relayer
                             .accept_block(self.nc.as_ref(), self.peer, block);
-                        return status;
+                        return Status::ok();
                     }
                     ReconstructionResult::Missing(transactions, uncles) => {
                         // We need to get all transactions and uncles that do not exist locally

diff --git a/sync/src/relayer/compact_block_process.rs b/sync/src/relayer/compact_block_process.rs
@@ -117,16 +117,15 @@ impl<'a> CompactBlockProcess<'a> {
                         >= block.epoch().number()
                 });
                 shrink_to_fit!(pending_compact_blocks, 20);
-                let status = self
-                    .relayer
+                self.relayer
                     .accept_block(self.nc.as_ref(), self.peer, block);
 
                 if let Some(metrics) = ckb_metrics::handle() {
                     metrics
                         .ckb_relay_cb_verify_duration
                         .observe(instant.elapsed().as_secs_f64());
                 }
-                status
+                Status::ok()
             }
             ReconstructionResult::Missing(transactions, uncles) => {
                 let missing_transactions: Vec<u32> =

diff --git a/sync/src/relayer/mod.rs b/sync/src/relayer/mod.rs
@@ -21,9 +21,7 @@ use self::get_transactions_process::GetTransactionsProcess;
 use self::transaction_hashes_process::TransactionHashesProcess;
 use self::transactions_process::TransactionsProcess;
 use crate::types::{ActiveChain, SyncShared};
-use crate::utils::{
-    is_internal_db_error, metric_ckb_message_bytes, send_message_to, MetricDirection,
-};
+use crate::utils::{metric_ckb_message_bytes, send_message_to, MetricDirection};
 use crate::{Status, StatusCode};
 use ckb_chain::VerifyResult;
 use ckb_chain::{ChainController, RemoteBlock};
@@ -303,13 +301,13 @@ impl Relayer {
         _nc: &dyn CKBProtocolContext,
         peer_id: PeerIndex,
         block: core::BlockView,
-    ) -> Status {
+    ) {
         if self
             .shared()
             .active_chain()
             .contains_block_status(&block.hash(), BlockStatus::BLOCK_STORED)
         {
-            return Status::ok();
+            return;
         }
 
         let block = Arc::new(block);