PR comments

Author: carllin

local-cluster/tests/common/mod.rs

@@ -77,14 +77,20 @@ pub fn restore_tower(tower_path: &Path, node_pubkey: &Pubkey) -> Option<Tower> {
     Tower::restore(&file_tower_storage, node_pubkey).ok()
 }
 
-pub fn remove_tower(tower_path: &Path, node_pubkey: &Pubkey) {
+pub fn remove_tower_if_exists(tower_path: &Path, node_pubkey: &Pubkey) {
     let file_tower_storage = FileTowerStorage::new(tower_path.to_path_buf());
     let filename = file_tower_storage.filename(node_pubkey);
     if filename.exists() {
         fs::remove_file(file_tower_storage.filename(node_pubkey)).unwrap();
     }
 }
 
+pub fn remove_tower(tower_path: &Path, node_pubkey: &Pubkey) {
+    let file_tower_storage = FileTowerStorage::new(tower_path.to_path_buf());
+    let filename = file_tower_storage.filename(node_pubkey);
+    fs::remove_file(file_tower_storage.filename(node_pubkey)).unwrap();
+}
+
 pub fn open_blockstore(ledger_path: &Path) -> Blockstore {
     Blockstore::open_with_options(
         ledger_path,

local-cluster/tests/local_cluster.rs

@@ -5069,7 +5069,7 @@ fn test_duplicate_shreds_switch_failure() {
     }
 
     fn clear_ledger_and_tower(ledger_path: &Path, pubkey: &Pubkey, start_slot: Slot) {
-        remove_tower(ledger_path, pubkey);
+        remove_tower_if_exists(ledger_path, pubkey);
         let blockstore = open_blockstore(ledger_path);
         purge_slots_with_count(&blockstore, start_slot, 1000);
         {
@@ -5169,7 +5169,7 @@ fn test_duplicate_shreds_switch_failure() {
     // 1) Two nodes that sum to > DUPLICATE_THRESHOLD but < 2/3+ supermajority. It's important both
     // of them individually have <= DUPLICATE_THRESHOLD to avoid duplicate confirming their own blocks
     // immediately upon voting
-    // 2) One with < SWITCHING_THRESHOLD so that validator from 1) can't switch to it
+    // 2) One with <= SWITCHING_THRESHOLD so that validator from 1) can't switch to it
     // 3) One bad leader to make duplicate slots
     let total_stake = 100 * DEFAULT_NODE_STAKE;
     let target_switch_fork_stake = (total_stake as f64 * SWITCH_FORK_THRESHOLD) as u64;

turbine/src/broadcast_stage/broadcast_duplicates_run.rs

@@ -218,9 +218,6 @@ impl BroadcastRun for BroadcastDuplicatesRun {
                     bank.slot(),
                     sigs,
                 );
-                if let Some(duplicate_slot_sender) = &self.config.duplicate_slot_sender {
-                    let _ = duplicate_slot_sender.send(bank.slot());
-                }
 
                 self.next_shred_index += 1;
                 (original_last_data_shred, partition_last_data_shred)
@@ -267,6 +264,9 @@ impl BroadcastRun for BroadcastDuplicatesRun {
                 .iter()
                 .all(|shred| shred.slot() == bank.slot()));
 
+            if let Some(duplicate_slot_sender) = &self.config.duplicate_slot_sender {
+                let _ = duplicate_slot_sender.send(bank.slot());
+            }
             socket_sender.send((original_last_data_shred, None))?;
             socket_sender.send((partition_last_data_shred, None))?;
         }