f

Author: TheBlueMatt

lightning/src/ln/functional_test_utils.rs

@@ -1107,14 +1107,15 @@ macro_rules! expect_payment_sent_without_paths {
 	}
 }
 
+#[macro_export]
 macro_rules! expect_payment_sent {
 	($node: expr, $expected_payment_preimage: expr) => {
 		$crate::expect_payment_sent!($node, $expected_payment_preimage, None::<u64>, true);
 	};
 	($node: expr, $expected_payment_preimage: expr, $expected_fee_msat_opt: expr) => {
 		$crate::expect_payment_sent!($node, $expected_payment_preimage, $expected_fee_msat_opt, true);
 	};
-	($node: expr, $expected_payment_preimage: expr, $expected_fee_msat_opt: expr, $expect_paths: expr) => {
+	($node: expr, $expected_payment_preimage: expr, $expected_fee_msat_opt: expr, $expect_paths: expr) => { {
 		use bitcoin::hashes::Hash as _;
 		let events = $node.node.get_and_clear_pending_events();
 		let expected_payment_hash = $crate::ln::PaymentHash(
@@ -1147,7 +1148,7 @@ macro_rules! expect_payment_sent {
 				}
 			}
 		}
-	}
+	} }
 }
 
 #[cfg(test)]
@@ -1159,7 +1160,7 @@ macro_rules! expect_payment_path_successful {
 			Event::PaymentPathSuccessful { .. } => {},
 			_ => panic!("Unexpected event"),
 		}
-	} }
+	}
 }
 
 macro_rules! expect_payment_forwarded {

lightning/src/ln/payment_tests.rs

@@ -11,19 +11,20 @@
 //! serialization ordering between ChannelManager/ChannelMonitors and ensuring we can still retry
 //! payments thereafter.
 
-use ln::channelmanager::{PaymentId, PaymentSendFailure};
+use chain::{ChannelMonitorUpdateErr, Confirm, Listen, Watch};
+use chain::channelmonitor::{ANTI_REORG_DELAY, ChannelMonitor, LATENCY_GRACE_PERIOD_BLOCKS};
+use chain::transaction::OutPoint;
+use ln::channelmanager::{BREAKDOWN_TIMEOUT, ChannelManager, ChannelManagerReadArgs, PaymentId, PaymentSendFailure};
 use ln::features::InitFeatures;
 use ln::msgs;
-use ln::msgs::{ChannelMessageHandler, ErrorAction};
+use ln::msgs::ChannelMessageHandler;
 use util::events::{ClosureReason, Event, MessageSendEvent, MessageSendEventsProvider};
 use util::test_utils;
 use util::errors::APIError;
 use util::enforcing_trait_impls::EnforcingSigner;
 use util::ser::{ReadableArgs, Writeable};
 use io;
 
-use bitcoin::hashes::sha256::Hash as Sha256;
-use bitcoin::hashes::Hash;
 use bitcoin::{Block, BlockHeader, BlockHash};
 
 use prelude::*;