f fix rebase

Author: TheBlueMatt

lightning/src/ln/functional_test_utils.rs

@@ -15,7 +15,7 @@ use chain::channelmonitor::ChannelMonitor;
 use chain::transaction::OutPoint;
 use ln::{PaymentPreimage, PaymentHash, PaymentSecret};
 use ln::channelmanager::{ChainParameters, ChannelManager, ChannelManagerReadArgs, RAACommitmentOrder, PaymentSendFailure, PaymentId, MIN_CLTV_EXPIRY_DELTA};
-use routing::gossip::{NetGraphMsgHandler, NetworkGraph, NetworkUpdate};
+use routing::gossip::{P2PGossipSync, NetworkGraph, NetworkUpdate};
 use routing::router::{PaymentParameters, Route, get_route};
 use ln::features::{InitFeatures, InvoiceFeatures};
 use ln::msgs;
@@ -1523,7 +1523,7 @@ pub fn expect_payment_failed_conditions<'a, 'b, 'c, 'd, 'e>(
 						const CHAN_DISABLED_FLAG: u8 = 2;
 						assert_eq!(msg.contents.flags & CHAN_DISABLED_FLAG, 0);
 					},
-					Some(NetworkUpdate::ChannelClosed { short_channel_id, is_permanent }) if chan_closed => {
+					Some(NetworkUpdate::ChannelFailure { short_channel_id, is_permanent }) if chan_closed => {
 						if let Some(scid) = conditions.expected_blamed_scid {
 							assert_eq!(short_channel_id, scid);
 						}