f - refactor unborn to use list of ops instead of mask

Author: alecchendev

lightning/src/ln/functional_test_utils.rs

@@ -576,8 +576,8 @@ impl<'a, 'b, 'c> Node<'a, 'b, 'c> {
 	}
 
 	#[cfg(test)]
-	pub fn disable_unborn_channel_signer_ops(&self, mask: u32) {
-		*self.keys_manager.disable_next_signer_ops.lock().unwrap() = Some(mask);
+	pub fn disable_unborn_channel_signer_op(&self, signer_op: SignerOp) {
+		self.keys_manager.disable_next_signer_ops.lock().unwrap().push(signer_op);
 	}
 }
 

lightning/src/ln/mod.rs

@@ -79,7 +79,7 @@ mod monitor_tests;
 #[cfg(test)]
 #[allow(unused_mut)]
 mod shutdown_tests;
-#[cfg(all(test, async_signing))]
+#[cfg(test)]
 #[allow(unused_mut)]
 mod async_signer_tests;
 #[cfg(test)]

lightning/src/util/test_utils.rs

@@ -79,6 +79,8 @@ use std::time::{SystemTime, UNIX_EPOCH};
 use bitcoin::psbt::Psbt;
 use bitcoin::Sequence;
 
+use super::test_channel_signer::SignerOp;
+
 pub fn pubkey(byte: u8) -> PublicKey {
 	let secp_ctx = Secp256k1::new();
 	PublicKey::from_secret_key(&secp_ctx, &privkey(byte))
@@ -1214,8 +1216,8 @@ pub struct TestKeysInterface {
 	pub disable_revocation_policy_check: bool,
 	enforcement_states: Mutex<HashMap<[u8;32], Arc<Mutex<EnforcementState>>>>,
 	expectations: Mutex<Option<VecDeque<OnGetShutdownScriptpubkey>>>,
-	/// Holds a signer ops mask to disable for the next signer created by this interface.
-	pub disable_next_signer_ops: Mutex<Option<u32>>,
+	/// Holds a list of signer ops to disable for the next signer created by this interface.
+	pub disable_next_signer_ops: Mutex<Vec<SignerOp>>,
 }
 
 impl EntropySource for TestKeysInterface {
@@ -1276,8 +1278,8 @@ impl SignerProvider for TestKeysInterface {
 		let state = self.make_enforcement_state_cell(keys.commitment_seed);
 		let mut signer = TestChannelSigner::new_with_revoked(keys, state, self.disable_revocation_policy_check);
 		#[cfg(test)]
-		if let Some(mask) = self.disable_next_signer_ops.lock().unwrap().take() {
-			signer.disable_ops(mask)
+		for op in self.disable_next_signer_ops.lock().unwrap().drain(..) {
+			signer.disable_op(op)
 		}
 		signer
 	}
@@ -1317,7 +1319,7 @@ impl TestKeysInterface {
 			disable_revocation_policy_check: false,
 			enforcement_states: Mutex::new(new_hash_map()),
 			expectations: Mutex::new(None),
-			disable_next_signer_ops: Mutex::new(None),
+			disable_next_signer_ops: Mutex::new(vec![]),
 		}
 	}