X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Fonion_route_tests.rs;h=76d6723466b52b427d1567526c4a46740928bb5e;hb=e61f3a238a70cbac87209e223b7c396108a49b97;hp=1e340d4a15e0f06a998c541d949b808e5f5dc672;hpb=d2a7ee2c71e3f567819a9d1dc178fe3882a4f879;p=rust-lightning diff --git a/lightning/src/ln/onion_route_tests.rs b/lightning/src/ln/onion_route_tests.rs index 1e340d4a..76d67234 100644 --- a/lightning/src/ln/onion_route_tests.rs +++ b/lightning/src/ln/onion_route_tests.rs @@ -11,21 +11,23 @@ //! These tests work by standing up full nodes and route payments across the network, checking the //! returned errors decode to the correct thing. -use chain::channelmonitor::{CLTV_CLAIM_BUFFER, LATENCY_GRACE_PERIOD_BLOCKS}; +use chain::channelmonitor::{ChannelMonitor, CLTV_CLAIM_BUFFER, LATENCY_GRACE_PERIOD_BLOCKS}; use chain::keysinterface::{KeysInterface, Recipient}; use ln::{PaymentHash, PaymentSecret}; -use ln::channelmanager::{HTLCForwardInfo, CLTV_FAR_FAR_AWAY, MIN_CLTV_EXPIRY_DELTA, PendingHTLCInfo, PendingHTLCRouting}; +use ln::channel::EXPIRE_PREV_CONFIG_TICKS; +use ln::channelmanager::{self, ChannelManager, ChannelManagerReadArgs, HTLCForwardInfo, CLTV_FAR_FAR_AWAY, MIN_CLTV_EXPIRY_DELTA, PendingHTLCInfo, PendingHTLCRouting}; use ln::onion_utils; use routing::gossip::{NetworkUpdate, RoutingFees, NodeId}; use routing::router::{get_route, PaymentParameters, Route, RouteHint, RouteHintHop}; use ln::features::{InitFeatures, InvoiceFeatures, NodeFeatures}; use ln::msgs; -use ln::msgs::{ChannelMessageHandler, ChannelUpdate, OptionalField}; +use ln::msgs::{ChannelMessageHandler, ChannelUpdate}; use ln::wire::Encode; -use util::events::{Event, MessageSendEvent, MessageSendEventsProvider}; -use util::ser::{Writeable, Writer}; +use util::events::{Event, HTLCDestination, MessageSendEvent, MessageSendEventsProvider}; +use util::ser::{ReadableArgs, Writeable, Writer}; use util::{byte_utils, test_utils}; -use util::config::UserConfig; +use util::config::{UserConfig, ChannelConfig}; +use util::errors::APIError; use bitcoin::hash_types::BlockHash; @@ -124,7 +126,7 @@ fn run_onion_failure_test_with_fail_intercept(_name: &str, test_case: expect_htlc_forward!(&nodes[2]); expect_event!(&nodes[2], Event::PaymentReceived); callback_node(); - expect_pending_htlcs_forwardable!(nodes[2]); + expect_pending_htlcs_forwardable_and_htlc_handling_failed!(nodes[2], vec![HTLCDestination::FailedPayment { payment_hash: payment_hash.clone() }]); } let update_2_1 = get_htlc_update_msgs!(nodes[2], nodes[1].node.get_our_node_id()); @@ -165,8 +167,8 @@ fn run_onion_failure_test_with_fail_intercept(_name: &str, test_case: let events = nodes[0].node.get_and_clear_pending_events(); assert_eq!(events.len(), 1); - if let &Event::PaymentPathFailed { ref rejected_by_dest, ref network_update, ref all_paths_failed, ref short_channel_id, ref error_code, .. } = &events[0] { - assert_eq!(*rejected_by_dest, !expected_retryable); + if let &Event::PaymentPathFailed { ref payment_failed_permanently, ref network_update, ref all_paths_failed, ref short_channel_id, ref error_code, .. } = &events[0] { + assert_eq!(*payment_failed_permanently, !expected_retryable); assert_eq!(*all_paths_failed, true); assert_eq!(*error_code, expected_error_code); if expected_channel_update.is_some() { @@ -225,7 +227,7 @@ impl msgs::ChannelUpdate { flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, - htlc_maximum_msat: OptionalField::Absent, + htlc_maximum_msat: msgs::MAX_VALUE_MSAT, fee_base_msat: 0, fee_proportional_millionths: 0, excess_data: vec![], @@ -268,7 +270,7 @@ fn test_fee_failures() { let node_cfgs = create_node_cfgs(3, &chanmon_cfgs); let node_chanmgrs = create_node_chanmgrs(3, &node_cfgs, &[Some(config), Some(config), Some(config)]); let mut nodes = create_network(3, &node_cfgs, &node_chanmgrs); - let channels = [create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known()), create_announced_chan_between_nodes(&nodes, 1, 2, InitFeatures::known(), InitFeatures::known())]; + let channels = [create_announced_chan_between_nodes(&nodes, 0, 1, channelmanager::provided_init_features(), channelmanager::provided_init_features()), create_announced_chan_between_nodes(&nodes, 1, 2, channelmanager::provided_init_features(), channelmanager::provided_init_features())]; // positive case let (route, payment_hash_success, payment_preimage_success, payment_secret_success) = get_route_and_payment_hash!(nodes[0], nodes[2], 40_000); @@ -320,7 +322,7 @@ fn test_onion_failure() { let node_cfgs = create_node_cfgs(3, &chanmon_cfgs); let node_chanmgrs = create_node_chanmgrs(3, &node_cfgs, &[Some(config), Some(config), Some(node_2_cfg)]); let mut nodes = create_network(3, &node_cfgs, &node_chanmgrs); - let channels = [create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known()), create_announced_chan_between_nodes(&nodes, 1, 2, InitFeatures::known(), InitFeatures::known())]; + let channels = [create_announced_chan_between_nodes(&nodes, 0, 1, channelmanager::provided_init_features(), channelmanager::provided_init_features()), create_announced_chan_between_nodes(&nodes, 1, 2, channelmanager::provided_init_features(), channelmanager::provided_init_features())]; for node in nodes.iter() { *node.keys_manager.override_random_bytes.lock().unwrap() = Some([3; 32]); } @@ -506,8 +508,6 @@ fn test_onion_failure() { let preimage = send_along_route(&nodes[0], bogus_route, &[&nodes[1], &nodes[2]], amt_to_forward+1).0; claim_payment(&nodes[0], &[&nodes[1], &nodes[2]], preimage); - //TODO: with new config API, we will be able to generate both valid and - //invalid channel_update cases. let short_channel_id = channels[0].0.contents.short_channel_id; run_onion_failure_test("fee_insufficient", 0, &nodes, &route, &payment_hash, &payment_secret, |msg| { msg.amount_msat -= 1; @@ -540,7 +540,7 @@ fn test_onion_failure() { }, || {}, true, Some(17), None, None); run_onion_failure_test("final_incorrect_cltv_expiry", 1, &nodes, &route, &payment_hash, &payment_secret, |_| {}, || { - for (_, pending_forwards) in nodes[1].node.channel_state.lock().unwrap().forward_htlcs.iter_mut() { + for (_, pending_forwards) in nodes[1].node.forward_htlcs.lock().unwrap().iter_mut() { for f in pending_forwards.iter_mut() { match f { &mut HTLCForwardInfo::AddHTLC { ref mut forward_info, .. } => @@ -553,7 +553,7 @@ fn test_onion_failure() { run_onion_failure_test("final_incorrect_htlc_amount", 1, &nodes, &route, &payment_hash, &payment_secret, |_| {}, || { // violate amt_to_forward > msg.amount_msat - for (_, pending_forwards) in nodes[1].node.channel_state.lock().unwrap().forward_htlcs.iter_mut() { + for (_, pending_forwards) in nodes[1].node.forward_htlcs.lock().unwrap().iter_mut() { for f in pending_forwards.iter_mut() { match f { &mut HTLCForwardInfo::AddHTLC { ref mut forward_info, .. } => @@ -594,6 +594,202 @@ fn test_onion_failure() { }, true, Some(23), None, None); } +fn do_test_onion_failure_stale_channel_update(announced_channel: bool) { + // Create a network of three nodes and two channels connecting them. We'll be updating the + // HTLC relay policy of the second channel, causing forwarding failures at the first hop. + let mut config = UserConfig::default(); + config.channel_handshake_config.announced_channel = announced_channel; + config.channel_handshake_limits.force_announced_channel_preference = false; + config.accept_forwards_to_priv_channels = !announced_channel; + let chanmon_cfgs = create_chanmon_cfgs(3); + let node_cfgs = create_node_cfgs(3, &chanmon_cfgs); + let node_chanmgrs = create_node_chanmgrs(3, &node_cfgs, &[None, Some(config), None]); + let mut nodes = create_network(3, &node_cfgs, &node_chanmgrs); + + let other_channel = create_chan_between_nodes( + &nodes[0], &nodes[1], channelmanager::provided_init_features(), channelmanager::provided_init_features(), + ); + let channel_to_update = if announced_channel { + let channel = create_announced_chan_between_nodes( + &nodes, 1, 2, channelmanager::provided_init_features(), channelmanager::provided_init_features(), + ); + (channel.2, channel.0.contents.short_channel_id) + } else { + let channel = create_unannounced_chan_between_nodes_with_value( + &nodes, 1, 2, 100000, 10001, channelmanager::provided_init_features(), channelmanager::provided_init_features(), + ); + (channel.0.channel_id, channel.0.short_channel_id_alias.unwrap()) + }; + let channel_to_update_counterparty = &nodes[2].node.get_our_node_id(); + + let default_config = ChannelConfig::default(); + + // A test payment should succeed as the ChannelConfig has not been changed yet. + const PAYMENT_AMT: u64 = 40000; + let (route, payment_hash, payment_preimage, payment_secret) = if announced_channel { + get_route_and_payment_hash!(nodes[0], nodes[2], PAYMENT_AMT) + } else { + let hop_hints = vec![RouteHint(vec![RouteHintHop { + src_node_id: nodes[1].node.get_our_node_id(), + short_channel_id: channel_to_update.1, + fees: RoutingFees { + base_msat: default_config.forwarding_fee_base_msat, + proportional_millionths: default_config.forwarding_fee_proportional_millionths, + }, + cltv_expiry_delta: default_config.cltv_expiry_delta, + htlc_maximum_msat: None, + htlc_minimum_msat: None, + }])]; + let payment_params = PaymentParameters::from_node_id(*channel_to_update_counterparty) + .with_features(channelmanager::provided_invoice_features()) + .with_route_hints(hop_hints); + get_route_and_payment_hash!(nodes[0], nodes[2], payment_params, PAYMENT_AMT, TEST_FINAL_CLTV) + }; + send_along_route_with_secret(&nodes[0], route.clone(), &[&[&nodes[1], &nodes[2]]], PAYMENT_AMT, + payment_hash, payment_secret); + claim_payment(&nodes[0], &[&nodes[1], &nodes[2]], payment_preimage); + + // Closure to force expiry of a channel's previous config. + let expire_prev_config = || { + for _ in 0..EXPIRE_PREV_CONFIG_TICKS { + nodes[1].node.timer_tick_occurred(); + } + }; + + // Closure to update and retrieve the latest ChannelUpdate. + let update_and_get_channel_update = |config: &ChannelConfig, expect_new_update: bool, + prev_update: Option<&msgs::ChannelUpdate>, should_expire_prev_config: bool| -> Option { + nodes[1].node.update_channel_config( + channel_to_update_counterparty, &[channel_to_update.0], config, + ).unwrap(); + let events = nodes[1].node.get_and_clear_pending_msg_events(); + assert_eq!(events.len(), expect_new_update as usize); + if !expect_new_update { + return None; + } + let new_update = match &events[0] { + MessageSendEvent::BroadcastChannelUpdate { msg } => { + assert!(announced_channel); + msg.clone() + }, + MessageSendEvent::SendChannelUpdate { node_id, msg } => { + assert_eq!(node_id, channel_to_update_counterparty); + assert!(!announced_channel); + msg.clone() + }, + _ => panic!("expected Broadcast/SendChannelUpdate event"), + }; + if prev_update.is_some() { + assert!(new_update.contents.timestamp > prev_update.unwrap().contents.timestamp) + } + if should_expire_prev_config { + expire_prev_config(); + } + Some(new_update) + }; + + // We'll be attempting to route payments using the default ChannelUpdate for channels. This will + // lead to onion failures at the first hop once we update the ChannelConfig for the + // second hop. + let expect_onion_failure = |name: &str, error_code: u16, channel_update: &msgs::ChannelUpdate| { + let short_channel_id = channel_to_update.1; + let network_update = NetworkUpdate::ChannelUpdateMessage { msg: channel_update.clone() }; + run_onion_failure_test( + name, 0, &nodes, &route, &payment_hash, &payment_secret, |_| {}, || {}, true, + Some(error_code), Some(network_update), Some(short_channel_id), + ); + }; + + // Updates to cltv_expiry_delta below MIN_CLTV_EXPIRY_DELTA should fail with APIMisuseError. + let mut invalid_config = default_config.clone(); + invalid_config.cltv_expiry_delta = 0; + match nodes[1].node.update_channel_config( + channel_to_update_counterparty, &[channel_to_update.0], &invalid_config, + ) { + Err(APIError::APIMisuseError{ .. }) => {}, + _ => panic!("unexpected result applying invalid cltv_expiry_delta"), + } + + // Increase the base fee which should trigger a new ChannelUpdate. + let mut config = nodes[1].node.list_usable_channels().iter() + .find(|channel| channel.channel_id == channel_to_update.0).unwrap() + .config.unwrap(); + config.forwarding_fee_base_msat = u32::max_value(); + let msg = update_and_get_channel_update(&config, true, None, false).unwrap(); + + // The old policy should still be in effect until a new block is connected. + send_along_route_with_secret(&nodes[0], route.clone(), &[&[&nodes[1], &nodes[2]]], PAYMENT_AMT, + payment_hash, payment_secret); + claim_payment(&nodes[0], &[&nodes[1], &nodes[2]], payment_preimage); + + // Connect a block, which should expire the previous config, leading to a failure when + // forwarding the HTLC. + expire_prev_config(); + expect_onion_failure("fee_insufficient", UPDATE|12, &msg); + + // Redundant updates should not trigger a new ChannelUpdate. + assert!(update_and_get_channel_update(&config, false, None, false).is_none()); + + // Similarly, updates that do not have an affect on ChannelUpdate should not trigger a new one. + config.force_close_avoidance_max_fee_satoshis *= 2; + assert!(update_and_get_channel_update(&config, false, None, false).is_none()); + + // Reset the base fee to the default and increase the proportional fee which should trigger a + // new ChannelUpdate. + config.forwarding_fee_base_msat = default_config.forwarding_fee_base_msat; + config.cltv_expiry_delta = u16::max_value(); + let msg = update_and_get_channel_update(&config, true, Some(&msg), true).unwrap(); + expect_onion_failure("incorrect_cltv_expiry", UPDATE|13, &msg); + + // Reset the proportional fee and increase the CLTV expiry delta which should trigger a new + // ChannelUpdate. + config.cltv_expiry_delta = default_config.cltv_expiry_delta; + config.forwarding_fee_proportional_millionths = u32::max_value(); + let msg = update_and_get_channel_update(&config, true, Some(&msg), true).unwrap(); + expect_onion_failure("fee_insufficient", UPDATE|12, &msg); + + // To test persistence of the updated config, we'll re-initialize the ChannelManager. + let config_after_restart = { + let persister = test_utils::TestPersister::new(); + let chain_monitor = test_utils::TestChainMonitor::new( + Some(nodes[1].chain_source), nodes[1].tx_broadcaster.clone(), nodes[1].logger, + node_cfgs[1].fee_estimator, &persister, nodes[1].keys_manager, + ); + + let mut chanmon_1 = <(_, ChannelMonitor<_>)>::read( + &mut &get_monitor!(nodes[1], other_channel.3).encode()[..], nodes[1].keys_manager, + ).unwrap().1; + let mut chanmon_2 = <(_, ChannelMonitor<_>)>::read( + &mut &get_monitor!(nodes[1], channel_to_update.0).encode()[..], nodes[1].keys_manager, + ).unwrap().1; + let mut channel_monitors = HashMap::new(); + channel_monitors.insert(chanmon_1.get_funding_txo().0, &mut chanmon_1); + channel_monitors.insert(chanmon_2.get_funding_txo().0, &mut chanmon_2); + + let chanmgr = <(_, ChannelManager<_, _, _, _, _, _>)>::read( + &mut &nodes[1].node.encode()[..], ChannelManagerReadArgs { + default_config: *nodes[1].node.get_current_default_configuration(), + keys_manager: nodes[1].keys_manager, + fee_estimator: node_cfgs[1].fee_estimator, + chain_monitor: &chain_monitor, + tx_broadcaster: nodes[1].tx_broadcaster.clone(), + logger: nodes[1].logger, + channel_monitors: channel_monitors, + }, + ).unwrap().1; + chanmgr.list_channels().iter() + .find(|channel| channel.channel_id == channel_to_update.0).unwrap() + .config.unwrap() + }; + assert_eq!(config, config_after_restart); +} + +#[test] +fn test_onion_failure_stale_channel_update() { + do_test_onion_failure_stale_channel_update(false); + do_test_onion_failure_stale_channel_update(true); +} + #[test] fn test_default_to_onion_payload_tlv_format() { // Tests that we default to creating tlv format onion payloads when no `NodeAnnouncementInfo` @@ -606,10 +802,10 @@ fn test_default_to_onion_payload_tlv_format() { let node_chanmgrs = create_node_chanmgrs(5, &node_cfgs, &[None, None, None, None, Some(priv_channels_conf)]); let mut nodes = create_network(5, &node_cfgs, &node_chanmgrs); - create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known()); - create_announced_chan_between_nodes(&nodes, 1, 2, InitFeatures::known(), InitFeatures::known()); - create_announced_chan_between_nodes(&nodes, 2, 3, InitFeatures::known(), InitFeatures::known()); - create_unannounced_chan_between_nodes_with_value(&nodes, 3, 4, 100000, 10001, InitFeatures::known(), InitFeatures::known()); + create_announced_chan_between_nodes(&nodes, 0, 1, channelmanager::provided_init_features(), channelmanager::provided_init_features()); + create_announced_chan_between_nodes(&nodes, 1, 2, channelmanager::provided_init_features(), channelmanager::provided_init_features()); + create_announced_chan_between_nodes(&nodes, 2, 3, channelmanager::provided_init_features(), channelmanager::provided_init_features()); + create_unannounced_chan_between_nodes_with_value(&nodes, 3, 4, 100000, 10001, channelmanager::provided_init_features(), channelmanager::provided_init_features()); let payment_params = PaymentParameters::from_node_id(nodes[3].node.get_our_node_id()); let origin_node = &nodes[0]; @@ -634,7 +830,7 @@ fn test_default_to_onion_payload_tlv_format() { // supports variable length onions, as the `InitFeatures` exchanged in the init message // between the nodes will be used when creating the route. We therefore do not default to // supporting variable length onions for that hop, as the `InitFeatures` in this case are - // `InitFeatures::known()`. + // `channelmanager::provided_init_features()`. let unannounced_chan = &nodes[4].node.list_usable_channels()[0]; @@ -691,17 +887,19 @@ fn test_do_not_default_to_onion_payload_tlv_format_when_unsupported() { let chanmon_cfgs = create_chanmon_cfgs(4); let mut node_cfgs = create_node_cfgs(4, &chanmon_cfgs); - // Set `node[1]` config to `InitFeatures::empty()` which return `false` for - // `supports_variable_length_onion()` + // Set `node[1]` config to `InitFeatures::empty()` + `static_remote_key` which implies + // `!supports_variable_length_onion()` but still supports the required static-remote-key + // feature. let mut node_1_cfg = &mut node_cfgs[1]; node_1_cfg.features = InitFeatures::empty(); + node_1_cfg.features.set_static_remote_key_required(); let node_chanmgrs = create_node_chanmgrs(4, &node_cfgs, &[None, None, None, None]); let mut nodes = create_network(4, &node_cfgs, &node_chanmgrs); - create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known()); - create_announced_chan_between_nodes(&nodes, 1, 2, InitFeatures::known(), InitFeatures::known()); - create_announced_chan_between_nodes(&nodes, 2, 3, InitFeatures::known(), InitFeatures::known()); + create_announced_chan_between_nodes(&nodes, 0, 1, channelmanager::provided_init_features(), channelmanager::provided_init_features()); + create_announced_chan_between_nodes(&nodes, 1, 2, channelmanager::provided_init_features(), channelmanager::provided_init_features()); + create_announced_chan_between_nodes(&nodes, 2, 3, channelmanager::provided_init_features(), channelmanager::provided_init_features()); let payment_params = PaymentParameters::from_node_id(nodes[3].node.get_our_node_id()) .with_features(InvoiceFeatures::empty()); @@ -763,7 +961,7 @@ macro_rules! get_phantom_route { let phantom_pubkey = PublicKey::from_secret_key(&secp_ctx, &phantom_secret); let phantom_route_hint = $nodes[1].node.get_phantom_route_hints(); let payment_params = PaymentParameters::from_node_id(phantom_pubkey) - .with_features(InvoiceFeatures::known()) + .with_features(channelmanager::provided_invoice_features()) .with_route_hints(vec![RouteHint(vec![ RouteHintHop { src_node_id: $nodes[0].node.get_our_node_id(), @@ -805,7 +1003,7 @@ fn test_phantom_onion_hmac_failure() { let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]); let nodes = create_network(2, &node_cfgs, &node_chanmgrs); - let channel = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known()); + let channel = create_announced_chan_between_nodes(&nodes, 0, 1, channelmanager::provided_init_features(), channelmanager::provided_init_features()); // Get the route. let recv_value_msat = 10_000; @@ -823,8 +1021,8 @@ fn test_phantom_onion_hmac_failure() { // Modify the payload so the phantom hop's HMAC is bogus. let sha256_of_onion = { - let mut channel_state = nodes[1].node.channel_state.lock().unwrap(); - let mut pending_forward = channel_state.forward_htlcs.get_mut(&phantom_scid).unwrap(); + let mut forward_htlcs = nodes[1].node.forward_htlcs.lock().unwrap(); + let mut pending_forward = forward_htlcs.get_mut(&phantom_scid).unwrap(); match pending_forward[0] { HTLCForwardInfo::AddHTLC { forward_info: PendingHTLCInfo { @@ -840,7 +1038,7 @@ fn test_phantom_onion_hmac_failure() { }; expect_pending_htlcs_forwardable_ignore!(nodes[1]); nodes[1].node.process_pending_htlc_forwards(); - expect_pending_htlcs_forwardable_ignore!(nodes[1]); + expect_pending_htlcs_forwardable_and_htlc_handling_failed_ignore!(nodes[1], vec![HTLCDestination::FailedPayment { payment_hash }]); nodes[1].node.process_pending_htlc_forwards(); let update_1 = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id()); check_added_monitors!(&nodes[1], 1); @@ -864,7 +1062,7 @@ fn test_phantom_invalid_onion_payload() { let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]); let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs); - let channel = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known()); + let channel = create_announced_chan_between_nodes(&nodes, 0, 1, channelmanager::provided_init_features(), channelmanager::provided_init_features()); // Get the route. let recv_value_msat = 10_000; @@ -883,7 +1081,7 @@ fn test_phantom_invalid_onion_payload() { commitment_signed_dance!(nodes[1], nodes[0], &update_0.commitment_signed, false, true); // Modify the onion packet to have an invalid payment amount. - for (_, pending_forwards) in nodes[1].node.channel_state.lock().unwrap().forward_htlcs.iter_mut() { + for (_, pending_forwards) in nodes[1].node.forward_htlcs.lock().unwrap().iter_mut() { for f in pending_forwards.iter_mut() { match f { &mut HTLCForwardInfo::AddHTLC { @@ -912,7 +1110,7 @@ fn test_phantom_invalid_onion_payload() { } expect_pending_htlcs_forwardable_ignore!(nodes[1]); nodes[1].node.process_pending_htlc_forwards(); - expect_pending_htlcs_forwardable_ignore!(nodes[1]); + expect_pending_htlcs_forwardable_and_htlc_handling_failed_ignore!(nodes[1], vec![HTLCDestination::FailedPayment { payment_hash }]); nodes[1].node.process_pending_htlc_forwards(); let update_1 = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id()); check_added_monitors!(&nodes[1], 1); @@ -937,7 +1135,7 @@ fn test_phantom_final_incorrect_cltv_expiry() { let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]); let nodes = create_network(2, &node_cfgs, &node_chanmgrs); - let channel = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known()); + let channel = create_announced_chan_between_nodes(&nodes, 0, 1, channelmanager::provided_init_features(), channelmanager::provided_init_features()); // Get the route. let recv_value_msat = 10_000; @@ -954,7 +1152,7 @@ fn test_phantom_final_incorrect_cltv_expiry() { commitment_signed_dance!(nodes[1], nodes[0], &update_0.commitment_signed, false, true); // Modify the payload so the phantom hop's HMAC is bogus. - for (_, pending_forwards) in nodes[1].node.channel_state.lock().unwrap().forward_htlcs.iter_mut() { + for (_, pending_forwards) in nodes[1].node.forward_htlcs.lock().unwrap().iter_mut() { for f in pending_forwards.iter_mut() { match f { &mut HTLCForwardInfo::AddHTLC { @@ -968,7 +1166,7 @@ fn test_phantom_final_incorrect_cltv_expiry() { } expect_pending_htlcs_forwardable_ignore!(nodes[1]); nodes[1].node.process_pending_htlc_forwards(); - expect_pending_htlcs_forwardable_ignore!(nodes[1]); + expect_pending_htlcs_forwardable_and_htlc_handling_failed_ignore!(nodes[1], vec![HTLCDestination::FailedPayment { payment_hash }]); nodes[1].node.process_pending_htlc_forwards(); let update_1 = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id()); check_added_monitors!(&nodes[1], 1); @@ -993,7 +1191,7 @@ fn test_phantom_failure_too_low_cltv() { let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]); let nodes = create_network(2, &node_cfgs, &node_chanmgrs); - let channel = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known()); + let channel = create_announced_chan_between_nodes(&nodes, 0, 1, channelmanager::provided_init_features(), channelmanager::provided_init_features()); // Get the route. let recv_value_msat = 10_000; @@ -1014,7 +1212,7 @@ fn test_phantom_failure_too_low_cltv() { expect_pending_htlcs_forwardable_ignore!(nodes[1]); nodes[1].node.process_pending_htlc_forwards(); - expect_pending_htlcs_forwardable_ignore!(nodes[1]); + expect_pending_htlcs_forwardable_and_htlc_handling_failed_ignore!(nodes[1], vec![HTLCDestination::FailedPayment { payment_hash }]); nodes[1].node.process_pending_htlc_forwards(); let update_1 = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id()); check_added_monitors!(&nodes[1], 1); @@ -1038,7 +1236,7 @@ fn test_phantom_failure_too_low_recv_amt() { let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]); let nodes = create_network(2, &node_cfgs, &node_chanmgrs); - let channel = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known()); + let channel = create_announced_chan_between_nodes(&nodes, 0, 1, channelmanager::provided_init_features(), channelmanager::provided_init_features()); // Get the route with a too-low amount. let recv_amt_msat = 10_000; @@ -1059,7 +1257,7 @@ fn test_phantom_failure_too_low_recv_amt() { nodes[1].node.process_pending_htlc_forwards(); expect_pending_htlcs_forwardable_ignore!(nodes[1]); nodes[1].node.process_pending_htlc_forwards(); - expect_pending_htlcs_forwardable_ignore!(nodes[1]); + expect_pending_htlcs_forwardable_and_htlc_handling_failed_ignore!(nodes[1], vec![HTLCDestination::FailedPayment { payment_hash: payment_hash.clone() }]); nodes[1].node.process_pending_htlc_forwards(); let update_1 = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id()); check_added_monitors!(&nodes[1], 1); @@ -1092,7 +1290,7 @@ fn test_phantom_dust_exposure_failure() { let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, Some(receiver_config)]); let nodes = create_network(2, &node_cfgs, &node_chanmgrs); - let channel = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known()); + let channel = create_announced_chan_between_nodes(&nodes, 0, 1, channelmanager::provided_init_features(), channelmanager::provided_init_features()); // Get the route with an amount exceeding the dust exposure threshold of nodes[1]. let (_, payment_hash, payment_secret) = get_payment_preimage_hash!(nodes[1], Some(max_dust_exposure + 1)); @@ -1134,7 +1332,7 @@ fn test_phantom_failure_reject_payment() { let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]); let nodes = create_network(2, &node_cfgs, &node_chanmgrs); - let channel = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known()); + let channel = create_announced_chan_between_nodes(&nodes, 0, 1, channelmanager::provided_init_features(), channelmanager::provided_init_features()); // Get the route with a too-low amount. let recv_amt_msat = 10_000; @@ -1156,7 +1354,7 @@ fn test_phantom_failure_reject_payment() { nodes[1].node.process_pending_htlc_forwards(); expect_payment_received!(nodes[1], payment_hash, payment_secret, recv_amt_msat); nodes[1].node.fail_htlc_backwards(&payment_hash); - expect_pending_htlcs_forwardable_ignore!(nodes[1]); + expect_pending_htlcs_forwardable_and_htlc_handling_failed_ignore!(nodes[1], vec![HTLCDestination::FailedPayment { payment_hash }]); nodes[1].node.process_pending_htlc_forwards(); let update_1 = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());