X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Freorg_tests.rs;h=0db30b8178cdc6bb8dc6113168d93d56ecb7f762;hb=ea03b946bd1f0e2400454f646ce0006cca5ec4b5;hp=7845c089cf9fa71758a2af8de5272fc1b481e6ae;hpb=ad4459080e823d4e61de92add5f8b2748dcdc88c;p=rust-lightning

diff --git a/lightning/src/ln/reorg_tests.rs b/lightning/src/ln/reorg_tests.rs
index 7845c089..0db30b81 100644
--- a/lightning/src/ln/reorg_tests.rs
+++ b/lightning/src/ln/reorg_tests.rs
@@ -14,7 +14,8 @@ use chain::transaction::OutPoint;
 use chain::{Confirm, Watch};
 use ln::channelmanager::{ChannelManager, ChannelManagerReadArgs};
 use ln::features::InitFeatures;
-use ln::msgs::{ChannelMessageHandler, ErrorAction, HTLCFailChannelUpdate};
+use ln::msgs::{ChannelMessageHandler, ErrorAction};
+use routing::network_graph::NetworkUpdate;
 use util::enforcing_trait_impls::EnforcingSigner;
 use util::events::{Event, MessageSendEvent, MessageSendEventsProvider};
 use util::test_utils;
@@ -136,8 +137,9 @@ fn do_test_onchain_htlc_reorg(local_commitment: bool, claim: bool) {
 		connect_block(&nodes[1], &block);
 
 		// ChannelManager only polls chain::Watch::release_pending_monitor_events when we
-		// probe it for events, so we probe non-message events here (which should still end up empty):
-		assert_eq!(nodes[1].node.get_and_clear_pending_events().len(), 0);
+		// probe it for events, so we probe non-message events here (which should just be the
+		// PaymentForwarded event).
+		expect_payment_forwarded!(nodes[1], Some(1000), true);
 	} else {
 		// Confirm the timeout tx and check that we fail the HTLC backwards
 		let block = Block {
@@ -162,12 +164,7 @@ fn do_test_onchain_htlc_reorg(local_commitment: bool, claim: bool) {
 	if claim {
 		expect_payment_sent!(nodes[0], our_payment_preimage);
 	} else {
-		let events = nodes[0].node.get_and_clear_pending_msg_events();
-		assert_eq!(events.len(), 1);
-		if let MessageSendEvent::PaymentFailureNetworkUpdate { update: HTLCFailChannelUpdate::ChannelClosed { ref is_permanent, .. } } = events[0] {
-			assert!(is_permanent);
-		} else { panic!("Unexpected event!"); }
-		expect_payment_failed!(nodes[0], our_payment_hash, false);
+		expect_payment_failed_with_update!(nodes[0], our_payment_hash, false, chan_2.0.contents.short_channel_id, true);
 	}
 }