f Account for additional trait usage in OutputSweeper

Author: tnull

lightning-background-processor/src/lib.rs

@@ -927,8 +927,7 @@ mod tests {
 	use bitcoin::secp256k1::{SecretKey, PublicKey, Secp256k1};
 	use lightning::chain::{BestBlock, Confirm, chainmonitor, Filter};
 	use lightning::chain::channelmonitor::ANTI_REORG_DELAY;
-	use lightning::chain::chaininterface::{ConfirmationTarget, FeeEstimator};
-	use lightning::sign::{InMemorySigner, KeysManager, SpendableOutputDescriptor};
+	use lightning::sign::{InMemorySigner, KeysManager, ChangeDestinationSource};
 	use lightning::chain::transaction::OutPoint;
 	use lightning::events::{Event, PathFailure, MessageSendEventsProvider, MessageSendEvent};
 	use lightning::{get_event_msg, get_event};
@@ -1012,7 +1011,9 @@ mod tests {
 		logger: Arc<test_utils::TestLogger>,
 		best_block: BestBlock,
 		scorer: Arc<LockingWrapper<TestScorer>>,
-		sweeper: Arc<OutputSweeper<Arc<test_utils::TestBroadcaster>, Arc<dyn Filter + Sync + Send>, Arc<FilesystemStore>, Arc<test_utils::TestLogger>>>,
+		sweeper: Arc<OutputSweeper<Arc<test_utils::TestBroadcaster>, Arc<TestWallet>,
+			Arc<test_utils::TestFeeEstimator>, Arc<dyn Filter + Sync + Send>, Arc<FilesystemStore>,
+			Arc<test_utils::TestLogger>, Arc<KeysManager>>>,
 	}
 
 	impl Node {
@@ -1251,6 +1252,14 @@ mod tests {
 		}
 	}
 
+	struct TestWallet {}
+
+	impl ChangeDestinationSource for TestWallet {
+		fn get_change_destination_script(&self) -> Result<ScriptBuf, ()> {
+			Ok(ScriptBuf::new())
+		}
+	}
+
 	fn get_full_filepath(filepath: String, filename: String) -> String {
 		let mut path = PathBuf::from(filepath);
 		path.push(filename);
@@ -1281,24 +1290,9 @@ mod tests {
 			let best_block = BestBlock::from_network(network);
 			let params = ChainParameters { network, best_block };
 			let manager = Arc::new(ChannelManager::new(fee_estimator.clone(), chain_monitor.clone(), tx_broadcaster.clone(), router.clone(), logger.clone(), keys_manager.clone(), keys_manager.clone(), keys_manager.clone(), UserConfig::default(), params, genesis_block.header.time));
-
-			let spend_fee_estimator = Arc::clone(&fee_estimator);
-			let spend_keys_manager = Arc::clone(&keys_manager);
-			let spend_outputs_callback = move |output_descriptors: &[&SpendableOutputDescriptor]| {
-				let fee_rate = spend_fee_estimator
-					.get_est_sat_per_1000_weight(ConfirmationTarget::NonAnchorChannelFee);
-				spend_keys_manager.spend_spendable_outputs(
-					output_descriptors,
-					Vec::new(),
-					ScriptBuf::new(),
-					fee_rate,
-					None,
-					&Secp256k1::new(),
-					)
-			};
-			let sweeper = Arc::new(OutputSweeper::new(Arc::clone(&tx_broadcaster),
-				Arc::clone(&kv_store), best_block, None::<Arc<dyn Filter + Sync + Send>>,
-				Arc::clone(&logger), spend_outputs_callback));
+			let wallet = Arc::new(TestWallet {});
+			let sweeper = Arc::new(OutputSweeper::new(best_block, Arc::clone(&tx_broadcaster), Arc::clone(&fee_estimator),
+				None::<Arc<dyn Filter + Sync + Send>>, Arc::clone(&keys_manager), wallet, Arc::clone(&kv_store), Arc::clone(&logger)));
 			let p2p_gossip_sync = Arc::new(P2PGossipSync::new(network_graph.clone(), Some(chain_source.clone()), logger.clone()));
 			let rapid_gossip_sync = Arc::new(RapidGossipSync::new(network_graph.clone(), logger.clone()));
 			let msg_handler = MessageHandler {
@@ -1382,6 +1376,10 @@ mod tests {
 					node.node.best_block_updated(&header, height);
 					node.chain_monitor.best_block_updated(&header, height);
 					node.sweeper.best_block_updated(&header, height);
+					// We need the TestBroadcaster to know about the new height so that it doesn't think
+					// we're violating the time lock requirements of transactions broadcasted at that
+					// point.
+					node.tx_broadcaster.blocks.lock().unwrap().push((genesis_block(Network::Bitcoin), height));
 				},
 				_ => {},
 			}
@@ -1394,6 +1392,10 @@ mod tests {
 			let height = node.best_block.height + 1;
 			let header = create_dummy_header(prev_blockhash, height);
 			node.best_block = BestBlock::new(header.block_hash(), height);
+			// We need the TestBroadcaster to know about the new height so that it doesn't think
+			// we're violating the time lock requirements of transactions broadcasted at that
+			// point.
+			node.tx_broadcaster.blocks.lock().unwrap().push((genesis_block(Network::Bitcoin), height));
 			if i == num_blocks {
 				node.node.best_block_updated(&header, height);
 				node.chain_monitor.best_block_updated(&header, height);