From: Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Date: Wed, 12 Feb 2020 17:38:21 +0000 (+0000)
Subject: Merge pull request #461 from ariard/2020-remove-duplicata
X-Git-Tag: v0.0.12~137
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=c906f2843234ba9164e562a19bccaabde0243d95;p=rust-lightning

Merge pull request #461 from ariard/2020-remove-duplicata

Remove some duplicata of broadcast txn from ChannelMonitor
---

c906f2843234ba9164e562a19bccaabde0243d95
diff --cc lightning/src/ln/functional_tests.rs
index 5c16e7274,e9153fb63..9b1907cbb
--- a/lightning/src/ln/functional_tests.rs
+++ b/lightning/src/ln/functional_tests.rs
@@@ -6371,9 -6316,9 +6377,9 @@@ fn test_data_loss_protect() 
  
  	// Restore node A from previous state
  	let logger: Arc<Logger> = Arc::new(test_utils::TestLogger::with_id(format!("node {}", 0)));
 -	let mut chan_monitor = <(Sha256dHash, ChannelMonitor)>::read(&mut ::std::io::Cursor::new(previous_chan_monitor_state.0), Arc::clone(&logger)).unwrap().1;
 +	let mut chan_monitor = <(Sha256dHash, ChannelMonitor<EnforcingChannelKeys>)>::read(&mut ::std::io::Cursor::new(previous_chan_monitor_state.0), Arc::clone(&logger)).unwrap().1;
  	let chain_monitor = Arc::new(ChainWatchInterfaceUtil::new(Network::Testnet, Arc::clone(&logger)));
- 	let tx_broadcaster = Arc::new(test_utils::TestBroadcaster{txn_broadcasted: Mutex::new(Vec::new())});
+ 	let tx_broadcaster = Arc::new(test_utils::TestBroadcaster{txn_broadcasted: Mutex::new(Vec::new()), broadcasted_txn: Mutex::new(HashSet::new())});
  	let feeest = Arc::new(test_utils::TestFeeEstimator { sat_per_kw: 253 });
  	monitor = test_utils::TestChannelMonitor::new(chain_monitor.clone(), tx_broadcaster.clone(), logger.clone(), feeest.clone());
  	node_state_0 = {