Add test for async open and accept channel

lightning/src/ln/async_signer_tests.rs

@@ -22,6 +22,53 @@ use crate::ln::msgs::ChannelMessageHandler;
 use crate::ln::channelmanager::{PaymentId, RecipientOnionFields};
 use crate::util::test_channel_signer::SignerOp;
 
+#[test]
+fn test_open_channel() {
+ // Simulate acquiring the signature for `funding_created` asynchronously.
+ let chanmon_cfgs = create_chanmon_cfgs(2);
+ let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
+ let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
+ let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
+
+ // Open an outbound channel simulating an async signer.
+ let channel_value_satoshis = 100000;
+ let user_channel_id = 42;
+ nodes[0].disable_next_channel_signer_op(SignerOp::GetPerCommitmentPoint);
+ let channel_id_0 = nodes[0].node.create_channel(nodes[1].node.get_our_node_id(), channel_value_satoshis, 10001, user_channel_id, None, None).unwrap();
+
+ {
+ let msgs = nodes[0].node.get_and_clear_pending_msg_events();
+ assert!(msgs.is_empty(), "Expected no message events; got {:?}", msgs);
+ }
+
+ nodes[0].enable_channel_signer_op(&nodes[1].node.get_our_node_id(), &channel_id_0, SignerOp::GetPerCommitmentPoint);
+ nodes[0].node.signer_unblocked(None);
+
+ // nodes[0] --- open_channel --> nodes[1]
+ let mut open_chan_msg = get_event_msg!(nodes[0], MessageSendEvent::SendOpenChannel, nodes[1].node.get_our_node_id());
+
+ // Handle an inbound channel simulating an async signer.
+ nodes[1].disable_next_channel_signer_op(SignerOp::GetPerCommitmentPoint);
+ nodes[1].node.handle_open_channel(&nodes[0].node.get_our_node_id(), &open_chan_msg);
+
+ {
+ let msgs = nodes[1].node.get_and_clear_pending_msg_events();
+ assert!(msgs.is_empty(), "Expected no message events; got {:?}", msgs);
+ }
+
+ let channel_id_1 = {
+ let channels = nodes[1].node.list_channels();
+ assert_eq!(channels.len(), 1, "expected one channel, not {}", channels.len());
+ channels[0].channel_id
+ };
+
+ nodes[1].enable_channel_signer_op(&nodes[0].node.get_our_node_id(), &channel_id_1, SignerOp::GetPerCommitmentPoint);
+ nodes[1].node.signer_unblocked(None);
+
+ // nodes[0] <-- accept_channel --- nodes[1]
+ get_event_msg!(nodes[1], MessageSendEvent::SendAcceptChannel, nodes[0].node.get_our_node_id());
+}
+
 #[test]
 fn test_async_commitment_signature_for_funding_created() {
  // Simulate acquiring the signature for `funding_created` asynchronously.

lightning/src/ln/functional_test_utils.rs

@@ -553,6 +553,11 @@ impl<'a, 'b, 'c> Node<'a, 'b, 'c> {
  entry.insert(signer_op);
  };
  }
+
+ #[cfg(test)]
+ pub fn disable_next_channel_signer_op(&self, signer_op: SignerOp) {
+ self.keys_manager.next_signer_disabled_ops.lock().unwrap().insert(signer_op);
+ }
 }
 
 /// If we need an unsafe pointer to a `Node` (ie to reference it in a thread

lightning/src/util/test_channel_signer.rs

@@ -147,6 +147,9 @@ impl ChannelSigner for TestChannelSigner {
  fn get_per_commitment_point(&self, idx: u64, secp_ctx: &Secp256k1<secp256k1::All>) -> Result<PublicKey, ()> {
  // TODO: implement a mask in EnforcementState to let you test signatures being
  // unavailable
+ if !self.is_signer_available(SignerOp::GetPerCommitmentPoint) {
+ return Err(());
+ }
  self.inner.get_per_commitment_point(idx, secp_ctx)
  }
 

lightning/src/util/test_utils.rs

@@ -1217,6 +1217,7 @@ pub struct TestKeysInterface {
  enforcement_states: Mutex<HashMap<[u8;32], Arc<Mutex<EnforcementState>>>>,
  expectations: Mutex<Option<VecDeque<OnGetShutdownScriptpubkey>>>,
  pub unavailable_signers_ops: Mutex<HashMap<[u8; 32], HashSet<SignerOp>>>,
+ pub next_signer_disabled_ops: Mutex<HashSet<SignerOp>>,
 }
 
 impl EntropySource for TestKeysInterface {
@@ -1282,6 +1283,10 @@ impl SignerProvider for TestKeysInterface {
  signer.disable_op(op);
  }
  }
+ #[cfg(test)]
+ for op in self.next_signer_disabled_ops.lock().unwrap().drain() {
+ signer.disable_op(op);
+ }
  signer
  }
 
@@ -1321,6 +1326,7 @@ impl TestKeysInterface {
  enforcement_states: Mutex::new(new_hash_map()),
  expectations: Mutex::new(None),
  unavailable_signers_ops: Mutex::new(new_hash_map()),
+ next_signer_disabled_ops: Mutex::new(new_hash_set()),
  }
  }