f Skip broadcast if persistence fails

Author: tnull

lightning/src/util/sweep.rs

@@ -389,7 +389,7 @@ where
 			return;
 		}
 
-		let spending_tx_opt;
+		let mut spending_tx_opt;
 		{
 			let mut state_lock = self.sweeper_state.lock().unwrap();
 			for descriptor in relevant_descriptors {
@@ -413,6 +413,8 @@ where
 			spending_tx_opt = self.regenerate_spend_if_necessary(&mut *state_lock);
 			self.persist_state(&*state_lock).unwrap_or_else(|e| {
 				log_error!(self.logger, "Error persisting OutputSweeper: {:?}", e);
+				// Skip broadcasting if the persist failed.
+				spending_tx_opt = None;
 			});
 		}
 
@@ -585,7 +587,7 @@ where
 	fn filtered_block_connected(
 		&self, header: &Header, txdata: &chain::transaction::TransactionData, height: u32,
 	) {
-		let spending_tx_opt;
+		let mut spending_tx_opt;
 		{
 			let mut state_lock = self.sweeper_state.lock().unwrap();
 			assert_eq!(state_lock.best_block.block_hash, header.prev_blockhash,
@@ -598,6 +600,8 @@ where
 
 			self.persist_state(&*state_lock).unwrap_or_else(|e| {
 				log_error!(self.logger, "Error persisting OutputSweeper: {:?}", e);
+				// Skip broadcasting if the persist failed.
+				spending_tx_opt = None;
 			});
 		}
 
@@ -677,12 +681,14 @@ where
 	}
 
 	fn best_block_updated(&self, header: &Header, height: u32) {
-		let spending_tx_opt;
+		let mut spending_tx_opt;
 		{
 			let mut state_lock = self.sweeper_state.lock().unwrap();
 			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);
+				// Skip broadcasting if the persist failed.
+				spending_tx_opt = None;
 			});
 		}