X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=inline;f=lightning%2Fsrc%2Fln%2Ffunctional_test_utils.rs;h=766fad2d7c8589745b6357d43cd37aa91d6b4ea4;hb=4e9a358baad21496734334e723db5a6645e6a205;hp=96b9dde5aa6fbc8a7379418b287bf89664889665;hpb=41e94f94046dc6247547270336d55a105570d1e1;p=rust-lightning

diff --git a/lightning/src/ln/functional_test_utils.rs b/lightning/src/ln/functional_test_utils.rs
index 96b9dde5..766fad2d 100644
--- a/lightning/src/ln/functional_test_utils.rs
+++ b/lightning/src/ln/functional_test_utils.rs
@@ -10,7 +10,8 @@
 //! A bunch of useful utilities for building networks of nodes and exchanging messages between
 //! nodes for functional tests.
 
-use crate::chain::{BestBlock, ChannelMonitorUpdateStatus, Confirm, Listen, Watch, keysinterface::EntropySource};
+use crate::chain::{BestBlock, ChannelMonitorUpdateStatus, Confirm, Listen, Watch};
+use crate::sign::EntropySource;
 use crate::chain::channelmonitor::ChannelMonitor;
 use crate::chain::transaction::OutPoint;
 use crate::events::{ClosureReason, Event, HTLCDestination, MessageSendEvent, MessageSendEventsProvider, PathFailure, PaymentPurpose, PaymentFailureReason};
@@ -723,6 +724,39 @@ pub fn remove_first_msg_event_to_node(msg_node_id: &PublicKey, msg_events: &mut
 		MessageSendEvent::SendGossipTimestampFilter { node_id, .. } => {
 			node_id == msg_node_id
 		},
+		MessageSendEvent::SendAcceptChannelV2 { node_id, .. } => {
+			node_id == msg_node_id
+		},
+		MessageSendEvent::SendOpenChannelV2 { node_id, .. } => {
+			node_id == msg_node_id
+		},
+		MessageSendEvent::SendTxAddInput { node_id, .. } => {
+			node_id == msg_node_id
+		},
+		MessageSendEvent::SendTxAddOutput { node_id, .. } => {
+			node_id == msg_node_id
+		},
+		MessageSendEvent::SendTxRemoveInput { node_id, .. } => {
+			node_id == msg_node_id
+		},
+		MessageSendEvent::SendTxRemoveOutput { node_id, .. } => {
+			node_id == msg_node_id
+		},
+		MessageSendEvent::SendTxComplete { node_id, .. } => {
+			node_id == msg_node_id
+		},
+		MessageSendEvent::SendTxSignatures { node_id, .. } => {
+			node_id == msg_node_id
+		},
+		MessageSendEvent::SendTxInitRbf { node_id, .. } => {
+			node_id == msg_node_id
+		},
+		MessageSendEvent::SendTxAckRbf { node_id, .. } => {
+			node_id == msg_node_id
+		},
+		MessageSendEvent::SendTxAbort { node_id, .. } => {
+			node_id == msg_node_id
+		},
 	}});
 	if ev_index.is_some() {
 		msg_events.remove(ev_index.unwrap())