X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Fmonitor_tests.rs;h=41ecd9da0fbef63970ba37a69291086e30159254;hb=c9d3544314f5823b8ac597996a80f695693d8702;hp=9ac79ad9008cff4f4a9f6d1b0d6739f446fc701e;hpb=82b646c548b489188b2be54cc36890302378da92;p=rust-lightning diff --git a/lightning/src/ln/monitor_tests.rs b/lightning/src/ln/monitor_tests.rs index 9ac79ad9..41ecd9da 100644 --- a/lightning/src/ln/monitor_tests.rs +++ b/lightning/src/ln/monitor_tests.rs @@ -1721,6 +1721,7 @@ fn do_test_monitor_rebroadcast_pending_claims(anchors: bool) { let mut config = test_default_channel_config(); if anchors { config.channel_handshake_config.negotiate_anchors_zero_fee_htlc_tx = true; + config.manually_accept_inbound_channels = true; } let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[Some(config), Some(config)]); let nodes = create_network(2, &node_cfgs, &node_chanmgrs); @@ -1777,15 +1778,10 @@ fn do_test_monitor_rebroadcast_pending_claims(anchors: bool) { // feerate for the test, we just want to make sure the feerates we receive from // the events never decrease. tx.input.push(descriptor.unsigned_tx_input()); - let signer = nodes[0].keys_manager.derive_channel_keys( - descriptor.channel_value_satoshis, &descriptor.channel_keys_id, - ); - let per_commitment_point = signer.get_per_commitment_point( - descriptor.per_commitment_number, &secp - ); - tx.output.push(descriptor.tx_output(&per_commitment_point, &secp)); + tx.output.push(descriptor.tx_output(&secp)); + let signer = descriptor.derive_channel_signer(&nodes[0].keys_manager); let our_sig = signer.sign_holder_htlc_transaction(&mut tx, 0, &descriptor, &secp).unwrap(); - let witness_script = descriptor.witness_script(&per_commitment_point, &secp); + let witness_script = descriptor.witness_script(&secp); tx.input[0].witness = descriptor.tx_input_witness(&our_sig, &witness_script); target_feerate_sat_per_1000_weight as u64 } else { panic!("unexpected event"); }; @@ -1870,6 +1866,7 @@ fn test_yield_anchors_events() { let mut anchors_config = UserConfig::default(); anchors_config.channel_handshake_config.announced_channel = true; anchors_config.channel_handshake_config.negotiate_anchors_zero_fee_htlc_tx = true; + anchors_config.manually_accept_inbound_channels = true; let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[Some(anchors_config), Some(anchors_config)]); let nodes = create_network(2, &node_cfgs, &node_chanmgrs); @@ -1908,9 +1905,7 @@ fn test_yield_anchors_events() { script_pubkey: Script::new_op_return(&[]), }], }; - let signer = nodes[0].keys_manager.derive_channel_keys( - anchor_descriptor.channel_value_satoshis, &anchor_descriptor.channel_keys_id, - ); + let signer = anchor_descriptor.derive_channel_signer(&nodes[0].keys_manager); let funding_sig = signer.sign_holder_anchor_input(&mut anchor_tx, 0, &secp).unwrap(); anchor_tx.input[0].witness = chan_utils::build_anchor_input_witness( &signer.pubkeys().funding_pubkey, &funding_sig @@ -1941,10 +1936,6 @@ fn test_yield_anchors_events() { Event::BumpTransaction(BumpTransactionEvent::HTLCResolution { htlc_descriptors, tx_lock_time, .. }) => { assert_eq!(htlc_descriptors.len(), 1); let htlc_descriptor = &htlc_descriptors[0]; - let signer = nodes[0].keys_manager.derive_channel_keys( - htlc_descriptor.channel_value_satoshis, &htlc_descriptor.channel_keys_id - ); - let per_commitment_point = signer.get_per_commitment_point(htlc_descriptor.per_commitment_number, &secp); let mut htlc_tx = Transaction { version: 2, lock_time: tx_lock_time, @@ -1953,15 +1944,16 @@ fn test_yield_anchors_events() { TxIn { ..Default::default() } // Fee input ], output: vec![ - htlc_descriptor.tx_output(&per_commitment_point, &secp), // HTLC output + htlc_descriptor.tx_output(&secp), // HTLC output TxOut { // Fee input change value: Amount::ONE_BTC.to_sat(), script_pubkey: Script::new_op_return(&[]), } ] }; + let signer = htlc_descriptor.derive_channel_signer(&nodes[0].keys_manager); let our_sig = signer.sign_holder_htlc_transaction(&mut htlc_tx, 0, htlc_descriptor, &secp).unwrap(); - let witness_script = htlc_descriptor.witness_script(&per_commitment_point, &secp); + let witness_script = htlc_descriptor.witness_script(&secp); htlc_tx.input[0].witness = htlc_descriptor.tx_input_witness(&our_sig, &witness_script); htlc_txs.push(htlc_tx); }, @@ -2002,6 +1994,7 @@ fn test_anchors_aggregated_revoked_htlc_tx() { let mut anchors_config = UserConfig::default(); anchors_config.channel_handshake_config.announced_channel = true; anchors_config.channel_handshake_config.negotiate_anchors_zero_fee_htlc_tx = true; + anchors_config.manually_accept_inbound_channels = true; let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[Some(anchors_config), Some(anchors_config)]); let bob_persister: test_utils::TestPersister; @@ -2119,9 +2112,7 @@ fn test_anchors_aggregated_revoked_htlc_tx() { previous_output: anchor_descriptor.outpoint, ..Default::default() }); - let signer = nodes[1].keys_manager.derive_channel_keys( - anchor_descriptor.channel_value_satoshis, &anchor_descriptor.channel_keys_id, - ); + let signer = anchor_descriptor.derive_channel_signer(&nodes[1].keys_manager); signers.push(signer); }, _ => panic!("Unexpected event"), @@ -2224,12 +2215,8 @@ fn test_anchors_aggregated_revoked_htlc_tx() { assert_eq!(htlc_descriptors.len(), 2); for htlc_descriptor in &htlc_descriptors { assert!(!htlc_descriptor.htlc.offered); - let signer = nodes[1].keys_manager.derive_channel_keys( - htlc_descriptor.channel_value_satoshis, &htlc_descriptor.channel_keys_id - ); - let per_commitment_point = signer.get_per_commitment_point(htlc_descriptor.per_commitment_number, &secp); htlc_tx.input.push(htlc_descriptor.unsigned_tx_input()); - htlc_tx.output.push(htlc_descriptor.tx_output(&per_commitment_point, &secp)); + htlc_tx.output.push(htlc_descriptor.tx_output(&secp)); } descriptors.append(&mut htlc_descriptors); htlc_tx.lock_time = tx_lock_time; @@ -2239,12 +2226,9 @@ fn test_anchors_aggregated_revoked_htlc_tx() { } for (idx, htlc_descriptor) in descriptors.into_iter().enumerate() { let htlc_input_idx = idx + 1; - let signer = nodes[1].keys_manager.derive_channel_keys( - htlc_descriptor.channel_value_satoshis, &htlc_descriptor.channel_keys_id - ); + let signer = htlc_descriptor.derive_channel_signer(&nodes[1].keys_manager); let our_sig = signer.sign_holder_htlc_transaction(&htlc_tx, htlc_input_idx, &htlc_descriptor, &secp).unwrap(); - let per_commitment_point = signer.get_per_commitment_point(htlc_descriptor.per_commitment_number, &secp); - let witness_script = htlc_descriptor.witness_script(&per_commitment_point, &secp); + let witness_script = htlc_descriptor.witness_script(&secp); htlc_tx.input[htlc_input_idx].witness = htlc_descriptor.tx_input_witness(&our_sig, &witness_script); } let fee_utxo_sig = {