From ed1e2a9a86bb268d65408e43e1934cfa815cfdc4 Mon Sep 17 00:00:00 2001 From: f3r10 Date: Fri, 24 Jan 2025 13:19:38 -0500 Subject: [PATCH] refactor(simln-lib): use from when constructing paymenthash --- Cargo.lock | 4 ++-- simln-lib/Cargo.toml | 2 +- simln-lib/src/sim_node.rs | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0d052bb..3387070 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1174,9 +1174,9 @@ checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" [[package]] name = "lightning" -version = "0.0.121" +version = "0.0.123" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0c1f811ae288f86c6767055c55b5f7a721ca1e61bf1897a9ae2ec663e8aba1" +checksum = "5fd92d4aa159374be430c7590e169b4a6c0fb79018f5bc4ea1bffde536384db3" dependencies = [ "bitcoin", "hex-conservative", diff --git a/simln-lib/Cargo.toml b/simln-lib/Cargo.toml index a326c84..fc36ab6 100644 --- 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 index a4f2c61..81a8b1a 100644 --- 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 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) {