f rebase

lightning/src/ln/functional_test_utils.rs

@@ -496,7 +496,7 @@ impl<'a, 'b, 'c> Node<'a, 'b, 'c> {
 	/// Toggles this node's signer to be available for the given signer operation.
 	/// This is useful for testing behavior for restoring an async signer that previously
 	/// could not return a signature immediately.
-	#[cfg(test)]
+	#[cfg(any(test, feature = "_test_utils"))]
 	pub fn enable_channel_signer_op(&self, peer_id: &PublicKey, chan_id: &ChannelId, signer_op: SignerOp) {
 		self.set_channel_signer_ops(peer_id, chan_id, signer_op, true);
 	}

lightning/src/ln/functional_tests.rs

@@ -11212,8 +11212,8 @@ pub fn test_accept_inbound_channel_errors_queued() {
 		open_channel_msg.common_fields.temporary_channel_id);
 }
 
-#[test]
-fn test_manual_funding_abandon() {
+#[xtest(feature = "_test_utils")]
+pub fn test_manual_funding_abandon() {
 	let mut cfg = UserConfig::default();
 	cfg.channel_handshake_config.minimum_depth = 1;
 	let chanmon_cfgs = create_chanmon_cfgs(2);