X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Futil%2Ftest_channel_signer.rs;h=2009e4d0b08a9a22fd68941b8290bfabffe75203;hb=0881b24895a6175632c59991c9e84b0d98ced810;hp=bfa3e32c91f5b3d683c26d5b9f9bf2700512efb6;hpb=3fd85c8cf8be08480a3959bd2b829be17bdfdaa9;p=rust-lightning

diff --git a/lightning/src/util/test_channel_signer.rs b/lightning/src/util/test_channel_signer.rs
index bfa3e32c..2009e4d0 100644
--- a/lightning/src/util/test_channel_signer.rs
+++ b/lightning/src/util/test_channel_signer.rs
@@ -10,11 +10,14 @@
 use crate::ln::channel::{ANCHOR_OUTPUT_VALUE_SATOSHI, MIN_CHAN_DUST_LIMIT_SATOSHIS};
 use crate::ln::chan_utils::{HTLCOutputInCommitment, ChannelPublicKeys, HolderCommitmentTransaction, CommitmentTransaction, ChannelTransactionParameters, TrustedCommitmentTransaction, ClosingTransaction};
 use crate::ln::channel_keys::{HtlcKey};
-use crate::ln::{msgs, PaymentPreimage};
+use crate::ln::msgs;
+use crate::ln::types::PaymentPreimage;
 use crate::sign::{InMemorySigner, ChannelSigner};
-use crate::sign::ecdsa::{EcdsaChannelSigner, WriteableEcdsaChannelSigner};
+use crate::sign::ecdsa::EcdsaChannelSigner;
 
+#[allow(unused_imports)]
 use crate::prelude::*;
+
 use core::cmp;
 use crate::sync::{Mutex, Arc};
 #[cfg(test)] use crate::sync::MutexGuard;
@@ -247,8 +250,8 @@ impl EcdsaChannelSigner for TestChannelSigner {
 			} else {
 				EcdsaSighashType::All
 			};
-			let sighash = &sighash::SighashCache::new(&*htlc_tx).segwit_signature_hash(
-				input, &witness_script, htlc_descriptor.htlc.amount_msat / 1000, sighash_type
+			let sighash = &sighash::SighashCache::new(&*htlc_tx).p2wsh_signature_hash(
+				input, &witness_script, htlc_descriptor.htlc.to_bitcoin_amount(), sighash_type
 			).unwrap();
 			let countersignatory_htlc_key = HtlcKey::from_basepoint(
 				&secp_ctx, &self.inner.counterparty_pubkeys().unwrap().htlc_basepoint, &htlc_descriptor.per_commitment_point,
@@ -294,8 +297,6 @@ impl EcdsaChannelSigner for TestChannelSigner {
 	}
 }
 
-impl WriteableEcdsaChannelSigner for TestChannelSigner {}
-
 #[cfg(taproot)]
 impl TaprootChannelSigner for TestChannelSigner {
 	fn generate_local_nonce_pair(&self, commitment_number: u64, secp_ctx: &Secp256k1<All>) -> PublicNonce {