Skip to content

Minor follow-up to #271 #274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tnull merged 2 commits into from
Mar 7, 2024
Merged

Minor follow-up to #271 #274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f68aee
Move `common` test module to `common/mod.rs`
tnull Mar 7, 2024
d79b8ae
Return payment hash directly from `expect_payment_received` macro
tnull Mar 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions tests/common.rs → tests/common/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,7 @@ macro_rules! expect_payment_received_event {
println!("{} got event {:?}", $node.node_id(), e);
assert_eq!(amount_msat, $amount_msat);
$node.event_handled();
let result = Ok(payment_hash);
result
payment_hash
},
ref e => {
panic!("{} got unexpected event!: {:?}", std::stringify!(node_b), e);
Expand Down
6 changes: 2 additions & 4 deletions tests/integration_tests_rust.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ use common::{
use ldk_node::{Builder, Event, NodeError};

use bitcoin::{Amount, Network};
use lightning::ln::PaymentHash;

use std::sync::Arc;

Expand Down Expand Up @@ -135,10 +134,9 @@ fn multi_hop_sending() {
let invoice = nodes[4].receive_payment(2_500_000, &"asdf", 9217).unwrap();
nodes[0].send_payment(&invoice).unwrap();

let payment_hash: Result<PaymentHash, ()> =
expect_payment_received_event!(&nodes[4], 2_500_000);
let payment_hash = expect_payment_received_event!(&nodes[4], 2_500_000);
let fee_paid_msat = Some(2000);
expect_payment_successful_event!(nodes[0], payment_hash.unwrap(), fee_paid_msat);
expect_payment_successful_event!(nodes[0], payment_hash, fee_paid_msat);
}

#[test]
Expand Down