X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fln%2Fchannelmanager.rs;h=83ff021a7e9164b121f1503b599cd62d07d852c8;hb=fd141bbed2a900070cbecf7ef9f22e377e1f353f;hp=98371fbd6a0e6e89f8bf46a663bccefef691efdb;hpb=5918df84909109e965fe1784434227c06d93c249;p=rust-lightning diff --git a/src/ln/channelmanager.rs b/src/ln/channelmanager.rs index 98371fbd..83ff021a 100644 --- a/src/ln/channelmanager.rs +++ b/src/ln/channelmanager.rs @@ -167,7 +167,7 @@ macro_rules! secp_call { match $res { Ok(key) => key, //TODO: Make the err a parameter! - Err(_) => return Err(HandleError{err: "Key error", msg: None}) + Err(_) => return Err(HandleError{err: "Key error", action: None}) } }; } @@ -202,7 +202,7 @@ impl ChannelManager { /// the main "logic hub" for all channel-related actions, and implements ChannelMessageHandler. /// fee_proportional_millionths is an optional fee to charge any payments routed through us. /// Non-proportional fees are fixed according to our risk using the provided fee estimator. - /// panics if channel_value_satoshis is >= (1 << 24)! + /// panics if channel_value_satoshis is >= `MAX_FUNDING_SATOSHIS`! pub fn new(our_network_key: SecretKey, fee_proportional_millionths: u32, announce_channels_publicly: bool, network: Network, feeest: Arc, monitor: Arc, chain_monitor: Arc, tx_broadcaster: Arc) -> Result, secp256k1::Error> { let secp_ctx = Secp256k1::new(); @@ -233,7 +233,14 @@ impl ChannelManager { Ok(res) } - pub fn create_channel(&self, their_network_key: PublicKey, channel_value_satoshis: u64, user_id: u64) -> Result { + /// Creates a new outbound channel to the given remote node and with the given value. + /// user_id will be provided back as user_channel_id in FundingGenerationReady and + /// FundingBroadcastSafe events to allow tracking of which events correspond with which + /// create_channel call. Note that user_channel_id defaults to 0 for inbound channels, so you + /// may wish to avoid using 0 for user_id here. + /// If successful, will generate a SendOpenChannel event, so you should probably poll + /// PeerManager::process_events afterwards. + pub fn create_channel(&self, their_network_key: PublicKey, channel_value_satoshis: u64, user_id: u64) -> Result<(), HandleError> { let chan_keys = if cfg!(feature = "fuzztarget") { ChannelKeys { funding_key: SecretKey::from_slice(&self.secp_ctx, &[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]).unwrap(), @@ -259,8 +266,15 @@ impl ChannelManager { let mut channel_state = self.channel_state.lock().unwrap(); match channel_state.by_id.insert(channel.channel_id(), channel) { Some(_) => panic!("RNG is bad???"), - None => Ok(res) + None => {} } + + let mut events = self.pending_events.lock().unwrap(); + events.push(events::Event::SendOpenChannel { + node_id: their_network_key, + msg: res, + }); + Ok(()) } /// Gets the list of open channels, in random order. See ChannelDetail field documentation for @@ -297,7 +311,7 @@ impl ChannelManager { (res, Some(chan_entry.remove_entry().1)) } else { (res, None) } }, - hash_map::Entry::Vacant(_) => return Err(HandleError{err: "No such channel", msg: None}) + hash_map::Entry::Vacant(_) => return Err(HandleError{err: "No such channel", action: None}) } }; for payment_hash in res.1 { @@ -429,11 +443,11 @@ impl ChannelManager { }; cur_value_msat += hop.fee_msat; if cur_value_msat >= 21000000 * 100000000 * 1000 { - return Err(HandleError{err: "Channel fees overflowed?!", msg: None}); + return Err(HandleError{err: "Channel fees overflowed?!", action: None}); } cur_cltv += hop.cltv_expiry_delta as u32; if cur_cltv >= 500000000 { - return Err(HandleError{err: "Channel CLTV overflowed?!", msg: None}); + return Err(HandleError{err: "Channel CLTV overflowed?!", action: None}); } last_short_channel_id = hop.short_channel_id; } @@ -562,7 +576,7 @@ impl ChannelManager { /// only fails if the channel does not yet have an assigned short_id fn get_channel_update(&self, chan: &Channel) -> Result { let short_channel_id = match chan.get_short_channel_id() { - None => return Err(HandleError{err: "Channel not yet established", msg: None}), + None => return Err(HandleError{err: "Channel not yet established", action: None}), Some(id) => id, }; @@ -595,12 +609,12 @@ impl ChannelManager { /// May generate a SendHTLCs event on success, which should be relayed. pub fn send_payment(&self, route: Route, payment_hash: [u8; 32]) -> Result<(), HandleError> { if route.hops.len() < 1 || route.hops.len() > 20 { - return Err(HandleError{err: "Route didn't go anywhere/had bogus size", msg: None}); + return Err(HandleError{err: "Route didn't go anywhere/had bogus size", action: None}); } let our_node_id = self.get_our_node_id(); for (idx, hop) in route.hops.iter().enumerate() { if idx != route.hops.len() - 1 && hop.pubkey == our_node_id { - return Err(HandleError{err: "Route went through us but wasn't a simple rebalance loop to us", msg: None}); + return Err(HandleError{err: "Route went through us but wasn't a simple rebalance loop to us", action: None}); } } @@ -619,13 +633,13 @@ impl ChannelManager { let (first_hop_node_id, (update_add, commitment_signed, chan_monitor)) = { let mut channel_state = self.channel_state.lock().unwrap(); let id = match channel_state.short_to_id.get(&route.hops.first().unwrap().short_channel_id) { - None => return Err(HandleError{err: "No channel available with first hop!", msg: None}), + None => return Err(HandleError{err: "No channel available with first hop!", action: None}), Some(id) => id.clone() }; let res = { let chan = channel_state.by_id.get_mut(&id).unwrap(); if chan.get_their_node_id() != route.hops.first().unwrap().pubkey { - return Err(HandleError{err: "Node ID mismatch on first hop!", msg: None}); + return Err(HandleError{err: "Node ID mismatch on first hop!", action: None}); } chan.send_htlc_and_commit(htlc_msat, payment_hash.clone(), htlc_cltv, onion_packet)? }; @@ -730,7 +744,6 @@ impl ChannelManager { for forward_info in pending_forwards { failed_forwards.push((forward_info.payment_hash, 0x4000 | 10, None)); } - // TODO: Send a failure packet back on each pending_forward continue; } }; @@ -741,7 +754,7 @@ impl ChannelManager { match forward_chan.send_htlc(forward_info.amt_to_forward, forward_info.payment_hash, forward_info.outgoing_cltv_value, forward_info.onion_packet.unwrap()) { Err(_e) => { let chan_update = self.get_channel_update(forward_chan).unwrap(); - failed_forwards.push((forward_info.payment_hash, 0x4000 | 7, Some(chan_update))); + failed_forwards.push((forward_info.payment_hash, 0x1000 | 7, Some(chan_update))); continue; }, Ok(update_add) => { @@ -1086,11 +1099,11 @@ impl ChannelMessageHandler for ChannelManager { //TODO: Handle errors and close channel (or so) fn handle_open_channel(&self, their_node_id: &PublicKey, msg: &msgs::OpenChannel) -> Result { if msg.chain_hash != self.genesis_hash { - return Err(HandleError{err: "Unknown genesis block hash", msg: None}); + return Err(HandleError{err: "Unknown genesis block hash", action: None}); } let mut channel_state = self.channel_state.lock().unwrap(); if channel_state.by_id.contains_key(&msg.temporary_channel_id) { - return Err(HandleError{err: "temporary_channel_id collision!", msg: None}); + return Err(HandleError{err: "temporary_channel_id collision!", action: None}); } let chan_keys = if cfg!(feature = "fuzztarget") { @@ -1125,12 +1138,12 @@ impl ChannelMessageHandler for ChannelManager { match channel_state.by_id.get_mut(&msg.temporary_channel_id) { Some(chan) => { if chan.get_their_node_id() != *their_node_id { - return Err(HandleError{err: "Got a message for a channel from the wrong node!", msg: None}) + return Err(HandleError{err: "Got a message for a channel from the wrong node!", action: None}) } chan.accept_channel(&msg)?; (chan.get_value_satoshis(), chan.get_funding_redeemscript().to_v0_p2wsh(), chan.get_user_id()) }, - None => return Err(HandleError{err: "Failed to find corresponding channel", msg: None}) + None => return Err(HandleError{err: "Failed to find corresponding channel", action: None}) } }; let mut pending_events = self.pending_events.lock().unwrap(); @@ -1152,7 +1165,7 @@ impl ChannelMessageHandler for ChannelManager { match channel_state.by_id.remove(&msg.temporary_channel_id) { Some(mut chan) => { if chan.get_their_node_id() != *their_node_id { - return Err(HandleError{err: "Got a message for a channel from the wrong node!", msg: None}) + return Err(HandleError{err: "Got a message for a channel from the wrong node!", action: None}) } match chan.funding_created(msg) { Ok((funding_msg, monitor_update)) => { @@ -1163,7 +1176,7 @@ impl ChannelMessageHandler for ChannelManager { } } }, - None => return Err(HandleError{err: "Failed to find corresponding channel", msg: None}) + None => return Err(HandleError{err: "Failed to find corresponding channel", action: None}) } }; // Release channel lock for install_watch_outpoint call, // note that this means if the remote end is misbehaving and sends a message for the same @@ -1183,12 +1196,12 @@ impl ChannelMessageHandler for ChannelManager { match channel_state.by_id.get_mut(&msg.channel_id) { Some(chan) => { if chan.get_their_node_id() != *their_node_id { - return Err(HandleError{err: "Got a message for a channel from the wrong node!", msg: None}) + return Err(HandleError{err: "Got a message for a channel from the wrong node!", action: None}) } let chan_monitor = chan.funding_signed(&msg)?; (chan.get_funding_txo().unwrap(), chan.get_user_id(), chan_monitor) }, - None => return Err(HandleError{err: "Failed to find corresponding channel", msg: None}) + None => return Err(HandleError{err: "Failed to find corresponding channel", action: None}) } }; if let Err(_e) = self.monitor.add_update_monitor(monitor.get_funding_txo().unwrap(), monitor) { @@ -1207,12 +1220,12 @@ impl ChannelMessageHandler for ChannelManager { match channel_state.by_id.get_mut(&msg.channel_id) { Some(chan) => { if chan.get_their_node_id() != *their_node_id { - return Err(HandleError{err: "Got a message for a channel from the wrong node!", msg: None}) + return Err(HandleError{err: "Got a message for a channel from the wrong node!", action: None}) } chan.funding_locked(&msg)?; return Ok(self.get_announcement_sigs(chan)?); }, - None => return Err(HandleError{err: "Failed to find corresponding channel", msg: None}) + None => return Err(HandleError{err: "Failed to find corresponding channel", action: None}) }; } @@ -1224,7 +1237,7 @@ impl ChannelMessageHandler for ChannelManager { match channel_state.by_id.entry(msg.channel_id.clone()) { hash_map::Entry::Occupied(mut chan_entry) => { if chan_entry.get().get_their_node_id() != *their_node_id { - return Err(HandleError{err: "Got a message for a channel from the wrong node!", msg: None}) + return Err(HandleError{err: "Got a message for a channel from the wrong node!", action: None}) } let res = chan_entry.get_mut().shutdown(&*self.fee_estimator, &msg)?; if chan_entry.get().is_shutdown() { @@ -1234,7 +1247,7 @@ impl ChannelMessageHandler for ChannelManager { (res, Some(chan_entry.remove_entry().1)) } else { (res, None) } }, - hash_map::Entry::Vacant(_) => return Err(HandleError{err: "Failed to find corresponding channel", msg: None}) + hash_map::Entry::Vacant(_) => return Err(HandleError{err: "Failed to find corresponding channel", action: None}) } }; for payment_hash in res.2 { @@ -1259,7 +1272,7 @@ impl ChannelMessageHandler for ChannelManager { match channel_state.by_id.entry(msg.channel_id.clone()) { hash_map::Entry::Occupied(mut chan_entry) => { if chan_entry.get().get_their_node_id() != *their_node_id { - return Err(HandleError{err: "Got a message for a channel from the wrong node!", msg: None}) + return Err(HandleError{err: "Got a message for a channel from the wrong node!", action: None}) } let res = chan_entry.get_mut().closing_signed(&*self.fee_estimator, &msg)?; if res.1.is_some() { @@ -1274,7 +1287,7 @@ impl ChannelMessageHandler for ChannelManager { (res, Some(chan_entry.remove_entry().1)) } else { (res, None) } }, - hash_map::Entry::Vacant(_) => return Err(HandleError{err: "Failed to find corresponding channel", msg: None}) + hash_map::Entry::Vacant(_) => return Err(HandleError{err: "Failed to find corresponding channel", action: None}) } }; if let Some(broadcast_tx) = res.1 { @@ -1322,7 +1335,7 @@ impl ChannelMessageHandler for ChannelManager { ($msg: expr, $err_code: expr, $data: expr) => { return Err(msgs::HandleError { err: $msg, - msg: Some(msgs::ErrorAction::UpdateFailHTLC { + action: Some(msgs::ErrorAction::UpdateFailHTLC { msg: msgs::UpdateFailHTLC { channel_id: msg.channel_id, htlc_id: msg.htlc_id, @@ -1452,7 +1465,7 @@ impl ChannelMessageHandler for ChannelManager { let chan = channel_state.by_id.get_mut(&forwarding_id).unwrap(); if !chan.is_live() { let chan_update = self.get_channel_update(chan).unwrap(); - return_err!("Forwarding channel is not in a ready state.", 0x4000 | 7, &chan_update.encode_with_len()[..]); + return_err!("Forwarding channel is not in a ready state.", 0x1000 | 7, &chan_update.encode_with_len()[..]); } } @@ -1481,16 +1494,16 @@ impl ChannelMessageHandler for ChannelManager { let (source_short_channel_id, res) = match channel_state.by_id.get_mut(&msg.channel_id) { Some(chan) => { if chan.get_their_node_id() != *their_node_id { - return Err(HandleError{err: "Got a message for a channel from the wrong node!", msg: None}) + return Err(HandleError{err: "Got a message for a channel from the wrong node!", action: None}) } if !chan.is_usable() { - return Err(HandleError{err: "Channel not yet available for receiving HTLCs", msg: None}); + return Err(HandleError{err: "Channel not yet available for receiving HTLCs", action: None}); } let short_channel_id = chan.get_short_channel_id().unwrap(); pending_forward_info.prev_short_channel_id = short_channel_id; (short_channel_id, chan.update_add_htlc(&msg, pending_forward_info)?) }, - None => return Err(HandleError{err: "Failed to find corresponding channel", msg: None}), //TODO: panic? + None => return Err(HandleError{err: "Failed to find corresponding channel", action: None}), //TODO: panic? }; match claimable_htlcs_entry { @@ -1531,11 +1544,11 @@ impl ChannelMessageHandler for ChannelManager { match channel_state.by_id.get_mut(&msg.channel_id) { Some(chan) => { if chan.get_their_node_id() != *their_node_id { - return Err(HandleError{err: "Got a message for a channel from the wrong node!", msg: None}) + return Err(HandleError{err: "Got a message for a channel from the wrong node!", action: None}) } chan.update_fulfill_htlc(&msg)? }, - None => return Err(HandleError{err: "Failed to find corresponding channel", msg: None}) + None => return Err(HandleError{err: "Failed to find corresponding channel", action: None}) } }; if let Err(_e) = self.monitor.add_update_monitor(monitor.get_funding_txo().unwrap(), monitor) { @@ -1549,11 +1562,11 @@ impl ChannelMessageHandler for ChannelManager { let payment_hash = match channel_state.by_id.get_mut(&msg.channel_id) { Some(chan) => { if chan.get_their_node_id() != *their_node_id { - return Err(HandleError{err: "Got a message for a channel from the wrong node!", msg: None}) + return Err(HandleError{err: "Got a message for a channel from the wrong node!", action: None}) } chan.update_fail_htlc(&msg, HTLCFailReason::ErrorPacket { err: msg.reason.clone() }) }, - None => return Err(HandleError{err: "Failed to find corresponding channel", msg: None}) + None => return Err(HandleError{err: "Failed to find corresponding channel", action: None}) }?; if let Some(pending_htlc) = channel_state.claimable_htlcs.get(&payment_hash) { @@ -1624,11 +1637,11 @@ impl ChannelMessageHandler for ChannelManager { match channel_state.by_id.get_mut(&msg.channel_id) { Some(chan) => { if chan.get_their_node_id() != *their_node_id { - return Err(HandleError{err: "Got a message for a channel from the wrong node!", msg: None}) + return Err(HandleError{err: "Got a message for a channel from the wrong node!", action: None}) } chan.update_fail_malformed_htlc(&msg, HTLCFailReason::Reason { failure_code: msg.failure_code, data: Vec::new() }) }, - None => return Err(HandleError{err: "Failed to find corresponding channel", msg: None}) + None => return Err(HandleError{err: "Failed to find corresponding channel", action: None}) } } @@ -1638,11 +1651,11 @@ impl ChannelMessageHandler for ChannelManager { match channel_state.by_id.get_mut(&msg.channel_id) { Some(chan) => { if chan.get_their_node_id() != *their_node_id { - return Err(HandleError{err: "Got a message for a channel from the wrong node!", msg: None}) + return Err(HandleError{err: "Got a message for a channel from the wrong node!", action: None}) } chan.commitment_signed(&msg)? }, - None => return Err(HandleError{err: "Failed to find corresponding channel", msg: None}) + None => return Err(HandleError{err: "Failed to find corresponding channel", action: None}) } }; if let Err(_e) = self.monitor.add_update_monitor(chan_monitor.get_funding_txo().unwrap(), chan_monitor) { @@ -1658,11 +1671,11 @@ impl ChannelMessageHandler for ChannelManager { match channel_state.by_id.get_mut(&msg.channel_id) { Some(chan) => { if chan.get_their_node_id() != *their_node_id { - return Err(HandleError{err: "Got a message for a channel from the wrong node!", msg: None}) + return Err(HandleError{err: "Got a message for a channel from the wrong node!", action: None}) } chan.revoke_and_ack(&msg)? }, - None => return Err(HandleError{err: "Failed to find corresponding channel", msg: None}) + None => return Err(HandleError{err: "Failed to find corresponding channel", action: None}) } }; if let Err(_e) = self.monitor.add_update_monitor(chan_monitor.get_funding_txo().unwrap(), chan_monitor) { @@ -1708,11 +1721,11 @@ impl ChannelMessageHandler for ChannelManager { match channel_state.by_id.get_mut(&msg.channel_id) { Some(chan) => { if chan.get_their_node_id() != *their_node_id { - return Err(HandleError{err: "Got a message for a channel from the wrong node!", msg: None}) + return Err(HandleError{err: "Got a message for a channel from the wrong node!", action: None}) } chan.update_fee(&*self.fee_estimator, &msg) }, - None => return Err(HandleError{err: "Failed to find corresponding channel", msg: None}) + None => return Err(HandleError{err: "Failed to find corresponding channel", action: None}) } } @@ -1722,10 +1735,10 @@ impl ChannelMessageHandler for ChannelManager { match channel_state.by_id.get_mut(&msg.channel_id) { Some(chan) => { if chan.get_their_node_id() != *their_node_id { - return Err(HandleError{err: "Got a message for a channel from the wrong node!", msg: None}) + return Err(HandleError{err: "Got a message for a channel from the wrong node!", action: None}) } if !chan.is_usable() { - return Err(HandleError{err: "Got an announcement_signatures before we were ready for it", msg: None }); + return Err(HandleError{err: "Got an announcement_signatures before we were ready for it", action: None }); } let our_node_id = self.get_our_node_id(); @@ -1746,7 +1759,7 @@ impl ChannelMessageHandler for ChannelManager { contents: announcement, }, self.get_channel_update(chan).unwrap()) // can only fail if we're not in a ready state }, - None => return Err(HandleError{err: "Failed to find corresponding channel", msg: None}) + None => return Err(HandleError{err: "Failed to find corresponding channel", action: None}) } }; let mut pending_events = self.pending_events.lock().unwrap(); @@ -2004,17 +2017,27 @@ mod tests { static mut CHAN_COUNT: u32 = 0; fn create_chan_between_nodes(node_a: &Node, node_b: &Node) -> (msgs::ChannelAnnouncement, msgs::ChannelUpdate, msgs::ChannelUpdate, Uint256, Transaction) { - let open_chan = node_a.node.create_channel(node_b.node.get_our_node_id(), 100000, 42).unwrap(); - let accept_chan = node_b.node.handle_open_channel(&node_a.node.get_our_node_id(), &open_chan).unwrap(); + node_a.node.create_channel(node_b.node.get_our_node_id(), 100000, 42).unwrap(); + + let events_1 = node_a.node.get_and_clear_pending_events(); + assert_eq!(events_1.len(), 1); + let accept_chan = match events_1[0] { + Event::SendOpenChannel { ref node_id, ref msg } => { + assert_eq!(*node_id, node_b.node.get_our_node_id()); + node_b.node.handle_open_channel(&node_a.node.get_our_node_id(), msg).unwrap() + }, + _ => panic!("Unexpected event"), + }; + node_a.node.handle_accept_channel(&node_b.node.get_our_node_id(), &accept_chan).unwrap(); let chan_id = unsafe { CHAN_COUNT }; let tx; let funding_output; - let events_1 = node_a.node.get_and_clear_pending_events(); - assert_eq!(events_1.len(), 1); - match events_1[0] { + let events_2 = node_a.node.get_and_clear_pending_events(); + assert_eq!(events_2.len(), 1); + match events_2[0] { Event::FundingGenerationReady { ref temporary_channel_id, ref channel_value_satoshis, ref output_script, user_channel_id } => { assert_eq!(*channel_value_satoshis, 100000); assert_eq!(user_channel_id, 42); @@ -2033,9 +2056,9 @@ mod tests { _ => panic!("Unexpected event"), } - let events_2 = node_a.node.get_and_clear_pending_events(); - assert_eq!(events_2.len(), 1); - let funding_signed = match events_2[0] { + let events_3 = node_a.node.get_and_clear_pending_events(); + assert_eq!(events_3.len(), 1); + let funding_signed = match events_3[0] { Event::SendFundingCreated { ref node_id, ref msg } => { assert_eq!(*node_id, node_b.node.get_our_node_id()); let res = node_b.node.handle_funding_created(&node_a.node.get_our_node_id(), msg).unwrap(); @@ -2056,9 +2079,9 @@ mod tests { added_monitors.clear(); } - let events_3 = node_a.node.get_and_clear_pending_events(); - assert_eq!(events_3.len(), 1); - match events_3[0] { + let events_4 = node_a.node.get_and_clear_pending_events(); + assert_eq!(events_4.len(), 1); + match events_4[0] { Event::FundingBroadcastSafe { ref funding_txo, user_channel_id } => { assert_eq!(user_channel_id, 42); assert_eq!(*funding_txo, funding_output); @@ -2067,9 +2090,9 @@ mod tests { }; confirm_transaction(&node_a.chain_monitor, &tx, chan_id); - let events_4 = node_a.node.get_and_clear_pending_events(); - assert_eq!(events_4.len(), 1); - match events_4[0] { + let events_5 = node_a.node.get_and_clear_pending_events(); + assert_eq!(events_5.len(), 1); + match events_5[0] { Event::SendFundingLocked { ref node_id, ref msg, ref announcement_sigs } => { assert_eq!(*node_id, node_b.node.get_our_node_id()); assert!(announcement_sigs.is_none()); @@ -2081,9 +2104,9 @@ mod tests { let channel_id; confirm_transaction(&node_b.chain_monitor, &tx, chan_id); - let events_5 = node_b.node.get_and_clear_pending_events(); - assert_eq!(events_5.len(), 1); - let as_announcement_sigs = match events_5[0] { + let events_6 = node_b.node.get_and_clear_pending_events(); + assert_eq!(events_6.len(), 1); + let as_announcement_sigs = match events_6[0] { Event::SendFundingLocked { ref node_id, ref msg, ref announcement_sigs } => { assert_eq!(*node_id, node_a.node.get_our_node_id()); channel_id = msg.channel_id.clone(); @@ -2094,9 +2117,9 @@ mod tests { _ => panic!("Unexpected event"), }; - let events_6 = node_a.node.get_and_clear_pending_events(); - assert_eq!(events_6.len(), 1); - let (announcement, as_update) = match events_6[0] { + let events_7 = node_a.node.get_and_clear_pending_events(); + assert_eq!(events_7.len(), 1); + let (announcement, as_update) = match events_7[0] { Event::BroadcastChannelAnnouncement { ref msg, ref update_msg } => { (msg, update_msg) }, @@ -2104,9 +2127,9 @@ mod tests { }; node_b.node.handle_announcement_signatures(&node_a.node.get_our_node_id(), &as_announcement_sigs).unwrap(); - let events_7 = node_b.node.get_and_clear_pending_events(); - assert_eq!(events_7.len(), 1); - let bs_update = match events_7[0] { + let events_8 = node_b.node.get_and_clear_pending_events(); + assert_eq!(events_8.len(), 1); + let bs_update = match events_8[0] { Event::BroadcastChannelAnnouncement { ref msg, ref update_msg } => { assert!(*announcement == *msg); update_msg