X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Futil%2Ftest_utils.rs;h=0e67d6bbd25e708318dd3ada5de20e6636e9ee30;hb=494219e3889200e8f2cce70d8194dc85fe432f9a;hp=20479a33e1c41fa109d64a6163096928755ef339;hpb=0c595a7ff69bd177b2e7fa8c1b3611f1b2df8f58;p=rust-lightning

diff --git a/lightning/src/util/test_utils.rs b/lightning/src/util/test_utils.rs
index 20479a33..0e67d6bb 100644
--- a/lightning/src/util/test_utils.rs
+++ b/lightning/src/util/test_utils.rs
@@ -22,7 +22,7 @@ use secp256k1::{SecretKey, PublicKey};
 use std::time::{SystemTime, UNIX_EPOCH};
 use std::sync::{Arc,Mutex};
 use std::{mem};
-use std::collections::HashMap;
+use std::collections::{HashMap, HashSet};
 
 pub struct TestVecWriter(pub Vec<u8>);
 impl Writer for TestVecWriter {
@@ -80,9 +80,19 @@ impl channelmonitor::ManyChannelMonitor for TestChannelMonitor {
 
 pub struct TestBroadcaster {
 	pub txn_broadcasted: Mutex<Vec<Transaction>>,
+	pub broadcasted_txn: Mutex<HashSet<Sha256dHash>> // Temporary field while refactoring out tx duplication
 }
 impl chaininterface::BroadcasterInterface for TestBroadcaster {
 	fn broadcast_transaction(&self, tx: &Transaction) {
+		{
+			if let Some(_) = self.broadcasted_txn.lock().unwrap().get(&tx.txid()) {
+				// If commitment tx, HTLC-timeout or HTLC-Success, duplicate broadcast are still ok
+				if tx.input[0].sequence == 0xfffffffd {
+					return;
+				}
+			}
+		}
+		self.broadcasted_txn.lock().unwrap().insert(tx.txid());
 		self.txn_broadcasted.lock().unwrap().push(tx.clone());
 	}
 }