f: error bubble up

Author: joostjager

lightning/src/util/sweep.rs

@@ -518,9 +518,7 @@ where
 
 		// Sweep the outputs.
 		{
-			let mut runtime_sweeper_state = self.sweeper_state.lock().unwrap();
-
-			let sweeper_state = &mut runtime_sweeper_state;
+			let mut sweeper_state = self.sweeper_state.lock().unwrap();
 
 			let change_destination_script = change_destination_script_result?;
 
@@ -539,24 +537,17 @@ where
 				return Ok(());
 			}
 
-			let spending_tx = match self.spend_outputs(
-				sweeper_state,
-				&respend_descriptors,
-				change_destination_script,
-			) {
-				Ok(spending_tx) => {
-					log_debug!(
-						self.logger,
-						"Generating and broadcasting sweeping transaction {}",
-						spending_tx.compute_txid()
-					);
-					spending_tx
-				},
-				Err(e) => {
+			let spending_tx = self
+				.spend_outputs(&sweeper_state, &respend_descriptors, change_destination_script)
+				.map_err(|e| {
 					log_error!(self.logger, "Error spending outputs: {:?}", e);
-					return Ok(());
-				},
-			};
+				})?;
+
+			log_debug!(
+				self.logger,
+				"Generating and broadcasting sweeping transaction {}",
+				spending_tx.compute_txid()
+			);
 
 			// As we didn't modify the state so far, the same filter_fn yields the same elements as
 			// above.