X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Fmonitor_tests.rs;h=41ecd9da0fbef63970ba37a69291086e30159254;hb=67868aec721b38c993ce0e48ecc46549092963f6;hp=4d37f936970702b576fb29f6f57a1d4274637d7b;hpb=72c42ee786d11ea1913d2898069f2c6b15285a2a;p=rust-lightning

diff --git a/lightning/src/ln/monitor_tests.rs b/lightning/src/ln/monitor_tests.rs
index 4d37f936..41ecd9da 100644
--- a/lightning/src/ln/monitor_tests.rs
+++ b/lightning/src/ln/monitor_tests.rs
@@ -1778,10 +1778,8 @@ 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,
-				);
 				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(&secp);
 				tx.input[0].witness = descriptor.tx_input_witness(&our_sig, &witness_script);
@@ -1907,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
@@ -1955,9 +1951,7 @@ fn test_yield_anchors_events() {
 						}
 					]
 				};
-				let signer = nodes[0].keys_manager.derive_channel_keys(
-					htlc_descriptor.channel_value_satoshis, &htlc_descriptor.channel_keys_id
-				);
+				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(&secp);
 				htlc_tx.input[0].witness = htlc_descriptor.tx_input_witness(&our_sig, &witness_script);
@@ -2118,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"),
@@ -2234,9 +2226,7 @@ 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 witness_script = htlc_descriptor.witness_script(&secp);
 			htlc_tx.input[htlc_input_idx].witness = htlc_descriptor.tx_input_witness(&our_sig, &witness_script);