Merge pull request #211 from f3r10/use_from_paymentpreimage_when_cons…

…tructing_payment_hash refactor(simln-lib): use from<paymentpreimage> when constructing paym…
bitcoin-dev-project · Feb 3, 2025 · aef31ae · aef31ae
2 parents efb1fe0 + ed1e2a9
commit aef31ae
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/simln-lib/Cargo.toml b/simln-lib/Cargo.toml
@@ -16,7 +16,7 @@ expanduser = "1.2.2"
 serde = { version="1.0.183", features=["derive"] }
 serde_json = "1.0.104"
 bitcoin = { version = "0.30.1", features=["serde"] }
-lightning = { version = "0.0.121" }
+lightning = { version = "0.0.123" }
 tonic_lnd = { package="fedimint-tonic-lnd", version="0.1.2", features=["lightningrpc", "routerrpc"]}
 tonic = { version = "0.8", features = ["tls", "transport"] }
 async-trait = "0.1.73"

diff --git a/simln-lib/src/sim_node.rs b/simln-lib/src/sim_node.rs
@@ -3,7 +3,6 @@ use crate::{
 };
 use async_trait::async_trait;
 use bitcoin::constants::ChainHash;
-use bitcoin::hashes::{sha256::Hash as Sha256, Hash};
 use bitcoin::secp256k1::PublicKey;
 use bitcoin::{Network, ScriptBuf, TxOut};
 use lightning::ln::chan_utils::make_funding_redeemscript;
@@ -541,7 +540,7 @@ impl<T: SimNetwork> LightningNode for SimNode<'_, T> {
         // our internal tracking state along with the chosen payment hash.
         let (sender, receiver) = channel();
         let preimage = PaymentPreimage(rand::random());
-        let payment_hash = PaymentHash(Sha256::hash(&preimage.0).to_byte_array());
+        let payment_hash = preimage.into();
 
         // Check for payment hash collision, failing the payment if we happen to repeat one.
         match self.in_flight.entry(payment_hash) {