f - use hashset, merge functions

Author: alecchendev

lightning/src/ln/functional_test_utils.rs

@@ -532,11 +532,12 @@ impl<'a, 'b, 'c> Node<'a, 'b, 'c> {
 				}
 			});
 		}
-	}
 
-	#[cfg(test)]
-	pub fn disable_unborn_channel_signer_op(&self, signer_op: SignerOp) {
-		self.keys_manager.disable_next_signer_ops.lock().unwrap().push(signer_op);
+		if available {
+			self.keys_manager.disable_next_signer_ops.lock().unwrap().remove(&signer_op);
+		} else {
+			self.keys_manager.disable_next_signer_ops.lock().unwrap().insert(signer_op);
+		}
 	}
 }
 

lightning/src/util/test_utils.rs

@@ -1217,7 +1217,7 @@ pub struct TestKeysInterface {
 	enforcement_states: Mutex<HashMap<[u8;32], Arc<Mutex<EnforcementState>>>>,
 	expectations: Mutex<Option<VecDeque<OnGetShutdownScriptpubkey>>>,
 	/// Holds a list of signer ops to disable for the next signer created by this interface.
-	pub disable_next_signer_ops: Mutex<Vec<SignerOp>>,
+	pub disable_next_signer_ops: Mutex<HashSet<SignerOp>>,
 }
 
 impl EntropySource for TestKeysInterface {
@@ -1278,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)]
-		for op in self.disable_next_signer_ops.lock().unwrap().drain(..) {
-			signer.disable_op(op)
+		for op in self.disable_next_signer_ops.lock().unwrap().iter() {
+			signer.disable_op(*op)
 		}
 		signer
 	}
@@ -1319,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(vec![]),
+			disable_next_signer_ops: Mutex::new(HashSet::new()),
 		}
 	}