Consistently log in propose_quiescence

Instead of logging both inside propose_quiescence and at the call site,
only log inside it. This simplifies the return type.

Author: jkczyz

lightning/src/ln/channel.rs

@@ -11929,8 +11929,7 @@ where
 		}
 
 		self.propose_quiescence(logger, QuiescentAction::Splice { contribution, locktime }).map_err(
-			|(e, action)| {
-				log_error!(logger, "{}", e);
+			|action| {
 				// FIXME: Any better way to do this?
 				if let QuiescentAction::Splice { contribution, .. } = action {
 					let (contributed_inputs, contributed_outputs) =
@@ -13070,14 +13069,19 @@ where
 	#[rustfmt::skip]
 	pub fn propose_quiescence<L: Logger>(
 		&mut self, logger: &L, action: QuiescentAction,
-	) -> Result<Option<msgs::Stfu>, (&'static str, QuiescentAction)> {
+	) -> Result<Option<msgs::Stfu>, QuiescentAction> {
 		log_debug!(logger, "Attempting to initiate quiescence");
 
 		if !self.context.is_usable() {
-			return Err(("Channel is not in a usable state to propose quiescence", action));
+			log_debug!(logger, "Channel is not in a usable state to propose quiescence");
+			return Err(action);
 		}
 		if self.quiescent_action.is_some() {
-			return Err(("Channel already has a pending quiescent action and cannot start another", action));
+			log_debug!(
+				logger,
+				"Channel already has a pending quiescent action and cannot start another",
+			);
+			return Err(action);
 		}
 
 		self.quiescent_action = Some(action);

lightning/src/ln/channelmanager.rs

@@ -13276,7 +13276,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 								});
 								notify = NotifyOption::SkipPersistHandleEvents;
 							},
-							Err((msg, _action)) => log_trace!(logger, "{}", msg),
+							Err(action) => log_trace!(logger, "Failed to propose quiescence for: {:?}", action),
 						}
 					} else {
 						result = Err(APIError::APIMisuseError {