f Move Confirm method internals to _internal methods

.. which allows us to save some additional persistence and lock churn

Author: tnull

lightning/src/util/sweep.rs

@@ -574,6 +574,29 @@ where
 			&Secp256k1::new(),
 		)
 	}
+
+	fn transactions_confirmed_internal(
+		&self, sweeper_state: &mut SweeperState, header: &Header,
+		txdata: &chain::transaction::TransactionData, height: u32,
+	) {
+		let confirmation_hash = header.block_hash();
+		for (_, tx) in txdata {
+			for output_info in sweeper_state.outputs.iter_mut() {
+				if output_info.is_spent_in(*tx) {
+					output_info.status.confirmed(confirmation_hash, height, (*tx).clone())
+				}
+			}
+		}
+	}
+
+	fn best_block_updated_internal(
+		&self, sweeper_state: &mut SweeperState, header: &Header, height: u32,
+	) -> Option<Transaction> {
+		sweeper_state.best_block = BestBlock::new(header.block_hash(), height);
+		self.prune_confirmed_outputs(sweeper_state);
+		let spending_tx_opt = self.regenerate_spend_if_necessary(sweeper_state);
+		spending_tx_opt
+	}
 }
 
 impl<B: Deref, D: Deref, E: Deref, F: Deref, K: Deref, L: Deref, O: Deref> Listen
@@ -590,16 +613,25 @@ where
 	fn filtered_block_connected(
 		&self, header: &Header, txdata: &chain::transaction::TransactionData, height: u32,
 	) {
+		let spending_tx_opt;
 		{
-			let state_lock = self.sweeper_state.lock().unwrap();
+			let mut state_lock = self.sweeper_state.lock().unwrap();
 			assert_eq!(state_lock.best_block.block_hash, header.prev_blockhash,
-			"Blocks must be connected in chain-order - the connected header must build on the last connected header");
+				"Blocks must be connected in chain-order - the connected header must build on the last connected header");
 			assert_eq!(state_lock.best_block.height, height - 1,
-			"Blocks must be connected in chain-order - the connected block height must be one greater than the previous height");
+				"Blocks must be connected in chain-order - the connected block height must be one greater than the previous height");
+
+			self.transactions_confirmed_internal(&mut *state_lock, header, txdata, height);
+			spending_tx_opt = self.best_block_updated_internal(&mut *state_lock, header, height);
+
+			self.persist_state(&*state_lock).unwrap_or_else(|e| {
+				log_error!(self.logger, "Error persisting OutputSweeper: {:?}", e);
+			});
 		}
 
-		self.transactions_confirmed(header, txdata, height);
-		self.best_block_updated(header, height);
+		if let Some(spending_tx) = spending_tx_opt {
+			self.broadcaster.broadcast_transactions(&[&spending_tx]);
+		}
 	}
 
 	fn block_disconnected(&self, header: &Header, height: u32) {
@@ -642,15 +674,7 @@ where
 		&self, header: &Header, txdata: &chain::transaction::TransactionData, height: u32,
 	) {
 		let mut state_lock = self.sweeper_state.lock().unwrap();
-		let confirmation_hash = header.block_hash();
-		for (_, tx) in txdata {
-			for output_info in state_lock.outputs.iter_mut() {
-				if output_info.is_spent_in(*tx) {
-					output_info.status.confirmed(confirmation_hash, height, (*tx).clone())
-				}
-			}
-		}
-
+		self.transactions_confirmed_internal(&mut *state_lock, header, txdata, height);
 		self.persist_state(&*state_lock).unwrap_or_else(|e| {
 			log_error!(self.logger, "Error persisting OutputSweeper: {:?}", e);
 		});
@@ -688,10 +712,7 @@ where
 		let spending_tx_opt;
 		{
 			let mut state_lock = self.sweeper_state.lock().unwrap();
-			state_lock.best_block = BestBlock::new(header.block_hash(), height);
-			self.prune_confirmed_outputs(&mut *state_lock);
-			spending_tx_opt = self.regenerate_spend_if_necessary(&mut *state_lock);
-
+			spending_tx_opt = self.best_block_updated_internal(&mut *state_lock, header, height);
 			self.persist_state(&*state_lock).unwrap_or_else(|e| {
 				log_error!(self.logger, "Error persisting OutputSweeper: {:?}", e);
 			});