Skip to content

Commit 14dcc9b

Browse files
TheBlueMattTheBlueMatt
committed
Prefer fully-specified paths in test macros
This avoids macros being context-specific use-dependent.
1 parent 8f47cf8 commit 14dcc9b

File tree

9 files changed

+26
-39
lines changed

9 files changed

+26
-39
lines changed

‎lightning-persister/src/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,7 @@ mod tests {
191191
use lightning::{check_closed_broadcast, check_closed_event, check_added_monitors};
192192
use lightning::ln::features::InitFeatures;
193193
use lightning::ln::functional_test_utils::*;
194-
use lightning::ln::msgs::ErrorAction;
195-
use lightning::util::events::{ClosureReason, Event, MessageSendEventsProvider, MessageSendEvent};
194+
use lightning::util::events::{ClosureReason, MessageSendEventsProvider};
196195
use lightning::util::test_utils;
197196
use std::fs;
198197
#[cfg(target_os = "windows")]

‎lightning/src/ln/chanmon_update_fail_tests.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,17 @@ use bitcoin::network::constants::Network;
1919
use chain::channelmonitor::ChannelMonitor;
2020
use chain::transaction::OutPoint;
2121
use chain::{ChannelMonitorUpdateErr, Listen, Watch};
22-
use ln::{PaymentPreimage, PaymentHash};
2322
use ln::channelmanager::{ChannelManager, ChannelManagerReadArgs, RAACommitmentOrder, PaymentSendFailure};
2423
use ln::features::InitFeatures;
2524
use ln::msgs;
26-
use ln::msgs::{ChannelMessageHandler, ErrorAction, RoutingMessageHandler};
25+
use ln::msgs::{ChannelMessageHandler, RoutingMessageHandler};
2726
use util::config::UserConfig;
2827
use util::enforcing_trait_impls::EnforcingSigner;
2928
use util::events::{Event, MessageSendEvent, MessageSendEventsProvider, PaymentPurpose, ClosureReason};
3029
use util::errors::APIError;
3130
use util::ser::{ReadableArgs, Writeable};
3231
use util::test_utils::TestBroadcaster;
3332

34-
use bitcoin::hashes::sha256::Hash as Sha256;
35-
use bitcoin::hashes::Hash;
36-
3733
use ln::functional_test_utils::*;
3834

3935
use util::test_utils;

‎lightning/src/ln/functional_test_utils.rs

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ use bitcoin::blockdata::constants::genesis_block;
3333
use bitcoin::blockdata::transaction::{Transaction, TxOut};
3434
use bitcoin::network::constants::Network;
3535

36-
use bitcoin::hashes::sha256::Hash as Sha256;
37-
use bitcoin::hashes::Hash;
3836
use bitcoin::hash_types::BlockHash;
3937

4038
use bitcoin::secp256k1::key::PublicKey;
@@ -701,6 +699,7 @@ pub fn update_nodes_with_chan_announce<'a, 'b, 'c, 'd>(nodes: &'a Vec<Node<'b, '
701699
}
702700
}
703701

702+
#[macro_export]
704703
macro_rules! check_spends {
705704
($tx: expr, $($spends_txn: expr),*) => {
706705
{
@@ -757,6 +756,9 @@ macro_rules! get_closing_signed_broadcast {
757756
#[macro_export]
758757
macro_rules! check_closed_broadcast {
759758
($node: expr, $with_error_msg: expr) => {{
759+
use $crate::util::events::MessageSendEvent;
760+
use $crate::ln::msgs::ErrorAction;
761+
760762
let msg_events = $node.node.get_and_clear_pending_msg_events();
761763
assert_eq!(msg_events.len(), if $with_error_msg { 2 } else { 1 });
762764
match msg_events[0] {
@@ -784,6 +786,8 @@ macro_rules! check_closed_event {
784786
check_closed_event!($node, $events, $reason, false);
785787
};
786788
($node: expr, $events: expr, $reason: expr, $is_check_discard_funding: expr) => {{
789+
use $crate::util::events::Event;
790+
787791
let events = $node.node.get_and_clear_pending_events();
788792
assert_eq!(events.len(), $events);
789793
let expected_reason = $reason;
@@ -992,23 +996,26 @@ macro_rules! get_payment_preimage_hash {
992996
};
993997
($dest_node: expr, $min_value_msat: expr) => {
994998
{
999+
use bitcoin::hashes::Hash as _;
9951000
let mut payment_count = $dest_node.network_payment_count.borrow_mut();
996-
let payment_preimage = PaymentPreimage([*payment_count; 32]);
1001+
let payment_preimage = $crate::ln::PaymentPreimage([*payment_count; 32]);
9971002
*payment_count += 1;
998-
let payment_hash = PaymentHash(Sha256::hash(&payment_preimage.0[..]).into_inner());
1003+
let payment_hash = $crate::ln::PaymentHash(
1004+
bitcoin::hashes::sha256::Hash::hash(&payment_preimage.0[..]).into_inner());
9991005
let payment_secret = $dest_node.node.create_inbound_payment_for_hash(payment_hash, $min_value_msat, 7200, 0).unwrap();
10001006
(payment_preimage, payment_hash, payment_secret)
10011007
}
10021008
}
10031009
}
10041010

10051011
#[cfg(test)]
1012+
#[macro_export]
10061013
macro_rules! get_route_and_payment_hash {
10071014
($send_node: expr, $recv_node: expr, $recv_value: expr) => {{
1008-
get_route_and_payment_hash!($send_node, $recv_node, vec![], $recv_value, TEST_FINAL_CLTV)
1015+
$crate::get_route_and_payment_hash!($send_node, $recv_node, vec![], $recv_value, TEST_FINAL_CLTV)
10091016
}};
10101017
($send_node: expr, $recv_node: expr, $last_hops: expr, $recv_value: expr, $cltv: expr) => {{
1011-
let (payment_preimage, payment_hash, payment_secret) = get_payment_preimage_hash!($recv_node, Some($recv_value));
1018+
let (payment_preimage, payment_hash, payment_secret) = $crate::get_payment_preimage_hash!($recv_node, Some($recv_value));
10121019
let net_graph_msg_handler = &$send_node.net_graph_msg_handler;
10131020
let route = ::routing::router::get_route(
10141021
&$send_node.node.get_our_node_id(), &net_graph_msg_handler.network_graph,
@@ -1074,19 +1081,22 @@ macro_rules! expect_payment_received {
10741081
}
10751082
}
10761083

1084+
#[macro_export]
10771085
macro_rules! expect_payment_sent {
1078-
($node: expr, $expected_payment_preimage: expr) => {
1086+
($node: expr, $expected_payment_preimage: expr) => { {
1087+
use bitcoin::hashes::Hash as _;
10791088
let events = $node.node.get_and_clear_pending_events();
1080-
let expected_payment_hash = PaymentHash(Sha256::hash(&$expected_payment_preimage.0).into_inner());
1089+
let expected_payment_hash = $crate::ln::PaymentHash(
1090+
bitcoin::hashes::sha256::Hash::hash(&$expected_payment_preimage.0).into_inner());
10811091
assert_eq!(events.len(), 1);
10821092
match events[0] {
1083-
Event::PaymentSent { ref payment_preimage, ref payment_hash } => {
1093+
$crate::util::events::Event::PaymentSent { ref payment_preimage, ref payment_hash } => {
10841094
assert_eq!($expected_payment_preimage, *payment_preimage);
10851095
assert_eq!(expected_payment_hash, *payment_hash);
10861096
},
10871097
_ => panic!("Unexpected event"),
10881098
}
1089-
}
1099+
} }
10901100
}
10911101

10921102
macro_rules! expect_payment_forwarded {

‎lightning/src/ln/functional_tests.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@ use bitcoin::blockdata::opcodes;
4242
use bitcoin::blockdata::constants::genesis_block;
4343
use bitcoin::network::constants::Network;
4444

45-
use bitcoin::hashes::sha256::Hash as Sha256;
46-
use bitcoin::hashes::Hash;
47-
4845
use bitcoin::secp256k1::Secp256k1;
4946
use bitcoin::secp256k1::key::{PublicKey,SecretKey};
5047

‎lightning/src/ln/monitor_tests.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,13 @@
1111
1212
use chain::channelmonitor::{ANTI_REORG_DELAY, Balance};
1313
use chain::transaction::OutPoint;
14-
use ln::{channel, PaymentPreimage, PaymentHash};
14+
use ln::channel;
1515
use ln::channelmanager::BREAKDOWN_TIMEOUT;
1616
use ln::features::InitFeatures;
17-
use ln::msgs::{ChannelMessageHandler, ErrorAction};
17+
use ln::msgs::ChannelMessageHandler;
1818
use util::events::{Event, MessageSendEvent, MessageSendEventsProvider, ClosureReason};
1919
use routing::network_graph::NetworkUpdate;
2020

21-
use bitcoin::hashes::sha256::Hash as Sha256;
22-
use bitcoin::hashes::Hash;
23-
2421
use bitcoin::blockdata::script::Builder;
2522
use bitcoin::blockdata::opcodes;
2623
use bitcoin::secp256k1::Secp256k1;

‎lightning/src/ln/onion_route_tests.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
//! returned errors decode to the correct thing.
1313
1414
use chain::channelmonitor::{CLTV_CLAIM_BUFFER, LATENCY_GRACE_PERIOD_BLOCKS};
15-
use ln::{PaymentPreimage, PaymentHash, PaymentSecret};
15+
use ln::{PaymentHash, PaymentSecret};
1616
use ln::channelmanager::{HTLCForwardInfo, CLTV_FAR_FAR_AWAY};
1717
use ln::onion_utils;
1818
use routing::network_graph::NetworkUpdate;
@@ -26,7 +26,6 @@ use util::config::UserConfig;
2626

2727
use bitcoin::hash_types::BlockHash;
2828

29-
use bitcoin::hashes::sha256::Hash as Sha256;
3029
use bitcoin::hashes::Hash;
3130

3231
use bitcoin::secp256k1;

‎lightning/src/ln/payment_tests.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,13 @@
1111
//! serialization ordering between ChannelManager/ChannelMonitors and ensuring we can still retry
1212
//! payments thereafter.
1313
14-
use ln::{PaymentPreimage, PaymentHash};
1514
use ln::channelmanager::{PaymentId, PaymentSendFailure};
1615
use ln::features::InitFeatures;
1716
use ln::msgs;
1817
use ln::msgs::ChannelMessageHandler;
1918
use util::events::{Event, MessageSendEvent, MessageSendEventsProvider};
2019
use util::errors::APIError;
2120

22-
use bitcoin::hashes::sha256::Hash as Sha256;
23-
use bitcoin::hashes::Hash;
24-
2521
use prelude::*;
2622

2723
use ln::functional_test_utils::*;

‎lightning/src/ln/reorg_tests.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,9 @@
1212
use chain::channelmonitor::{ANTI_REORG_DELAY, ChannelMonitor};
1313
use chain::transaction::OutPoint;
1414
use chain::{Confirm, Watch};
15-
use ln::PaymentHash;
1615
use ln::channelmanager::{ChannelManager, ChannelManagerReadArgs};
1716
use ln::features::InitFeatures;
18-
use ln::msgs::{ChannelMessageHandler, ErrorAction};
17+
use ln::msgs::ChannelMessageHandler;
1918
use routing::network_graph::NetworkUpdate;
2019
use util::enforcing_trait_impls::EnforcingSigner;
2120
use util::events::{Event, MessageSendEvent, MessageSendEventsProvider, ClosureReason};
@@ -25,8 +24,6 @@ use util::ser::{ReadableArgs, Writeable};
2524
use bitcoin::blockdata::block::{Block, BlockHeader};
2625
use bitcoin::blockdata::script::Builder;
2726
use bitcoin::blockdata::opcodes;
28-
use bitcoin::hashes::sha256::Hash as Sha256;
29-
use bitcoin::hashes::Hash;
3027
use bitcoin::hash_types::BlockHash;
3128
use bitcoin::secp256k1::Secp256k1;
3229

‎lightning/src/ln/shutdown_tests.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
1212
use chain::keysinterface::KeysInterface;
1313
use chain::transaction::OutPoint;
14-
use ln::{PaymentPreimage, PaymentHash};
1514
use ln::channelmanager::PaymentSendFailure;
1615
use routing::network_graph::NetworkUpdate;
1716
use routing::router::get_route;
@@ -28,9 +27,6 @@ use util::config::UserConfig;
2827
use bitcoin::blockdata::script::Builder;
2928
use bitcoin::blockdata::opcodes;
3029

31-
use bitcoin::hashes::sha256::Hash as Sha256;
32-
use bitcoin::hashes::Hash;
33-
3430
use regex;
3531

3632
use core::default::Default;

0 commit comments

Comments
 (0)