projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #2746 from TheBlueMatt/2023-11-bitcoin-0.30-followups
[rust-lightning]
/
lightning
/
src
/
util
/
test_channel_signer.rs
diff --git
a/lightning/src/util/test_channel_signer.rs
b/lightning/src/util/test_channel_signer.rs
index ab576fee90de6c9920ad1e6836b3e9b207bec92b..fe1c8cfe06fbaefcaad288b327c02b67f5e49057 100644
(file)
--- a/
lightning/src/util/test_channel_signer.rs
+++ b/
lightning/src/util/test_channel_signer.rs
@@
-17,8
+17,10
@@
use core::cmp;
use crate::sync::{Mutex, Arc};
#[cfg(test)] use crate::sync::MutexGuard;
use crate::sync::{Mutex, Arc};
#[cfg(test)] use crate::sync::MutexGuard;
-use bitcoin::blockdata::transaction::{Transaction, EcdsaSighashType};
-use bitcoin::util::sighash;
+use bitcoin::blockdata::transaction::Transaction;
+use bitcoin::hashes::Hash;
+use bitcoin::sighash;
+use bitcoin::sighash::EcdsaSighashType;
use bitcoin::secp256k1;
use bitcoin::secp256k1::{SecretKey, PublicKey};
use bitcoin::secp256k1;
use bitcoin::secp256k1::{SecretKey, PublicKey};
@@
-234,7
+236,7
@@
impl EcdsaChannelSigner for TestChannelSigner {
&secp_ctx, &htlc_descriptor.per_commitment_point, &self.inner.counterparty_pubkeys().unwrap().htlc_basepoint
);
secp_ctx.verify_ecdsa(
&secp_ctx, &htlc_descriptor.per_commitment_point, &self.inner.counterparty_pubkeys().unwrap().htlc_basepoint
);
secp_ctx.verify_ecdsa(
- &hash_to_message!(
&sighash
), &htlc_descriptor.counterparty_sig, &countersignatory_htlc_key
+ &hash_to_message!(
sighash.as_byte_array()
), &htlc_descriptor.counterparty_sig, &countersignatory_htlc_key
).unwrap();
}
Ok(self.inner.sign_holder_htlc_transaction(htlc_tx, input, htlc_descriptor, secp_ctx).unwrap())
).unwrap();
}
Ok(self.inner.sign_holder_htlc_transaction(htlc_tx, input, htlc_descriptor, secp_ctx).unwrap())