Merge pull request nervosnetwork#4061 from eval-exec/exec/fix-request…

…_proposal_txs-dedup Fix `Relayer::request_proposal_txs`
libraries · Jul 6, 2023 · 7fb84eb · 7fb84eb
2 parents ece7ad0 + 77a3271
commit 7fb84eb
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -93,6 +93,7 @@ members = [
 
 [workspace.dependencies]
 tempfile = "3"
+itertools = "0.11.0"
 
 [profile.release]
 overflow-checks = true

diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
@@ -43,7 +43,7 @@ ckb-tx-pool = { path = "../tx-pool", version = "= 0.112.0-pre" }
 ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.112.0-pre" }
 ckb-pow = { path = "../pow", version = "= 0.112.0-pre" }
 ckb-indexer = { path = "../util/indexer", version = "= 0.112.0-pre" }
-itertools = "0.10.5"
+itertools.workspace = true
 tokio = "1"
 
 [dev-dependencies]

diff --git a/sync/Cargo.toml b/sync/Cargo.toml
@@ -39,6 +39,7 @@ bitflags = "1.0"
 dashmap = "4.0"
 keyed_priority_queue = "0.3"
 sled = "0.34.7"
+itertools.workspace = true
 
 [dev-dependencies]
 ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.112.0-pre" }

diff --git a/sync/src/relayer/mod.rs b/sync/src/relayer/mod.rs
@@ -39,6 +39,7 @@ use ckb_types::{
     prelude::*,
 };
 use ckb_util::Mutex;
+use itertools::Itertools;
 use std::collections::{HashMap, HashSet};
 use std::sync::Arc;
 use std::time::{Duration, Instant};
@@ -238,11 +239,11 @@ impl Relayer {
         nc: &dyn CKBProtocolContext,
         peer: PeerIndex,
         block_hash_and_number: BlockNumberAndHash,
-        mut proposals: Vec<packed::ProposalShortId>,
+        proposals: Vec<packed::ProposalShortId>,
     ) {
-        proposals.dedup();
         let tx_pool = self.shared.shared().tx_pool_controller();
-        let fresh_proposals = match tx_pool.fresh_proposals_filter(proposals) {
+        let fresh_proposals: Vec<ProposalShortId> = match tx_pool.fresh_proposals_filter(proposals)
+        {
             Err(err) => {
                 debug_target!(
                     crate::LOG_TARGET_RELAY,
@@ -251,7 +252,7 @@ impl Relayer {
                 );
                 return;
             }
-            Ok(fresh_proposals) => fresh_proposals,
+            Ok(fresh_proposals) => fresh_proposals.into_iter().unique().collect(),
         };
 
         let to_ask_proposals: Vec<ProposalShortId> = self