Add default implementation for tracking metadata#636

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sourabhmarathe wants to merge 16 commits into from
Closed

Add default implementation for tracking metadata #636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
e76ac4e
Add default implementation for tracking metadata
sourabhmarathe Jun 7, 2020
42f7d56
Track failed portion of MPP, not entire MPP
sourabhmarathe Jun 8, 2020
a424c63
Remove failed route tracking methods
sourabhmarathe Jun 8, 2020
51c8d1b
Remove functions that would never be called
sourabhmarathe Jun 8, 2020
1a1dc96
Return u64::MAX if chan is on failed list
sourabhmarathe Jun 8, 2020
4664e99
Change output of get_channel_fee_penalty
sourabhmarathe Jun 12, 2020
37c6de6
Add failed_route()
sourabhmarathe Jun 12, 2020
4397c0e
Add RoutingFeePenalty param to get_route
sourabhmarathe Jun 12, 2020
84b7f6b
Add fee penalty to htlc minimum in get_route()
sourabhmarathe Jun 14, 2020
33deb1f
Do not add route to failed list on success
sourabhmarathe Jun 17, 2020
5e229fc
Move penalty fee check to correct place in code
sourabhmarathe Jun 17, 2020
6beca99
Address ariard review
sourabhmarathe Jun 24, 2020
9e7e2f6
Add constructor for DefaultMetadata
sourabhmarathe Jun 24, 2020
7529726
Add DefaultMetadata param to get_route calls
sourabhmarathe Jun 24, 2020
8dd338c
Use checked_add when calculating new_fee in get_route()
sourabhmarathe Jun 25, 2020
bb5c725
Remove channel from failed channels on success
sourabhmarathe Jun 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 43 additions & 21 deletions lightning/src/ln/chanmon_update_fail_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ use ln::features::InitFeatures;
use ln::msgs;
use ln::msgs::{ChannelMessageHandler, ErrorAction, RoutingMessageHandler};
use routing::router::get_route;
use routing::network_graph::DefaultMetadata;
use util::events::{Event, EventsProvider, MessageSendEvent, MessageSendEventsProvider};
use util::errors::APIError;

Expand All@@ -34,7 +35,8 @@ fn test_simple_monitor_permanent_update_fail() {

*nodes[0].chan_monitor.update_ret.lock().unwrap() = Err(ChannelMonitorUpdateErr::PermanentFailure);
let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
let default_metadata = DefaultMetadata::new();
let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
unwrap_send_err!(nodes[0].node.send_payment(&route, payment_hash_1, &None), true, APIError::ChannelUnavailable {..}, {});
check_added_monitors!(nodes[0], 2);

Expand DownExpand Up@@ -71,7 +73,8 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {

{
let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
let default_metadata = DefaultMetadata::new();
let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
unwrap_send_err!(nodes[0].node.send_payment(&route, payment_hash_1, &None), false, APIError::MonitorUpdateFailed, {});
check_added_monitors!(nodes[0], 1);
}
Expand DownExpand Up@@ -118,7 +121,8 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
{
*nodes[0].chan_monitor.update_ret.lock().unwrap() = Err(ChannelMonitorUpdateErr::TemporaryFailure);
let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
let default_metadata = DefaultMetadata::new();
let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
unwrap_send_err!(nodes[0].node.send_payment(&route, payment_hash_2, &None), false, APIError::MonitorUpdateFailed, {});
check_added_monitors!(nodes[0], 1);
}
Expand DownExpand Up@@ -184,7 +188,8 @@ fn do_test_monitor_temporary_update_fail(disconnect_count: usize) {
{
*nodes[0].chan_monitor.update_ret.lock().unwrap() = Err(ChannelMonitorUpdateErr::TemporaryFailure);
let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
let default_metadata = DefaultMetadata::new();
let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
unwrap_send_err!(nodes[0].node.send_payment(&route, payment_hash_2, &None), false, APIError::MonitorUpdateFailed, {});
check_added_monitors!(nodes[0], 1);
}
Expand DownExpand Up@@ -515,7 +520,8 @@ fn test_monitor_update_fail_cs() {
let (payment_preimage, our_payment_hash) = get_payment_preimage_hash!(nodes[0]);
{
let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
let default_metadata = DefaultMetadata::new();
let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
nodes[0].node.send_payment(&route, our_payment_hash, &None).unwrap();
check_added_monitors!(nodes[0], 1);
}
Expand DownExpand Up@@ -604,7 +610,8 @@ fn test_monitor_update_fail_no_rebroadcast() {
let (payment_preimage_1, our_payment_hash) = get_payment_preimage_hash!(nodes[0]);
{
let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
let default_metadata = DefaultMetadata::new();
let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
nodes[0].node.send_payment(&route, our_payment_hash, &None).unwrap();
check_added_monitors!(nodes[0], 1);
}
Expand DownExpand Up@@ -655,7 +662,8 @@ fn test_monitor_update_raa_while_paused() {
let (payment_preimage_1, our_payment_hash_1) = get_payment_preimage_hash!(nodes[0]);
{
let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
let default_metadata = DefaultMetadata::new();
let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
nodes[0].node.send_payment(&route, our_payment_hash_1, &None).unwrap();
check_added_monitors!(nodes[0], 1);
}
Expand All@@ -664,7 +672,8 @@ fn test_monitor_update_raa_while_paused() {
let (payment_preimage_2, our_payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
{
let net_graph_msg_handler = &nodes[1].net_graph_msg_handler;
let route = get_route(&nodes[1].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
let default_metadata = DefaultMetadata::new();
let route = get_route(&nodes[1].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
nodes[1].node.send_payment(&route, our_payment_hash_2, &None).unwrap();
check_added_monitors!(nodes[1], 1);
}
Expand DownExpand Up@@ -756,7 +765,8 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
{
let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[2].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
let default_metadata = DefaultMetadata::new();
let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[2].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
check_added_monitors!(nodes[0], 1);
}
Expand All@@ -783,7 +793,8 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
let (_, payment_hash_3) = get_payment_preimage_hash!(nodes[0]);
{
let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[2].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
let default_metadata = DefaultMetadata::new();
let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[2].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
nodes[0].node.send_payment(&route, payment_hash_3, &None).unwrap();
check_added_monitors!(nodes[0], 1);
}
Expand DownExpand Up@@ -832,7 +843,8 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
// Try to route another payment backwards from 2 to make sure 1 holds off on responding
let (payment_preimage_4, payment_hash_4) = get_payment_preimage_hash!(nodes[0]);
let net_graph_msg_handler = &nodes[2].net_graph_msg_handler;
let route = get_route(&nodes[2].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
let default_metadata = DefaultMetadata::new();
let route = get_route(&nodes[2].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
nodes[2].node.send_payment(&route, payment_hash_4, &None).unwrap();
check_added_monitors!(nodes[2], 1);

Expand DownExpand Up@@ -1086,7 +1098,8 @@ fn raa_no_response_awaiting_raa_state() {
// generation during RAA while in monitor-update-failed state.
{
let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
let default_metadata = DefaultMetadata::new();
let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
nodes[0].node.send_payment(&route, payment_hash_1, &None).unwrap();
check_added_monitors!(nodes[0], 1);
nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
Expand DownExpand Up@@ -1140,7 +1153,8 @@ fn raa_no_response_awaiting_raa_state() {
// commitment transaction states) whereas here we can explicitly check for it.
{
let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
let default_metadata = DefaultMetadata::new();
let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
nodes[0].node.send_payment(&route, payment_hash_3, &None).unwrap();
check_added_monitors!(nodes[0], 0);
assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
Expand DownExpand Up@@ -1232,7 +1246,8 @@ fn claim_while_disconnected_monitor_update_fail() {
let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
{
let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
let default_metadata = DefaultMetadata::new();
let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
check_added_monitors!(nodes[0], 1);
}
Expand DownExpand Up@@ -1328,7 +1343,8 @@ fn monitor_failed_no_reestablish_response() {
let (payment_preimage_1, payment_hash_1) = get_payment_preimage_hash!(nodes[0]);
{
let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
let default_metadata = DefaultMetadata::new();
let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
nodes[0].node.send_payment(&route, payment_hash_1, &None).unwrap();
check_added_monitors!(nodes[0], 1);
}
Expand DownExpand Up@@ -1402,7 +1418,8 @@ fn first_message_on_recv_ordering() {
let (payment_preimage_1, payment_hash_1) = get_payment_preimage_hash!(nodes[0]);
{
let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
let default_metadata = DefaultMetadata::new();
let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
nodes[0].node.send_payment(&route, payment_hash_1, &None).unwrap();
check_added_monitors!(nodes[0], 1);
}
Expand All@@ -1427,7 +1444,8 @@ fn first_message_on_recv_ordering() {
let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
{
let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
let default_metadata = DefaultMetadata::new();
let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
check_added_monitors!(nodes[0], 1);
}
Expand DownExpand Up@@ -1507,7 +1525,8 @@ fn test_monitor_update_fail_claim() {
let (_, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
{
let net_graph_msg_handler = &nodes[2].net_graph_msg_handler;
let route = get_route(&nodes[2].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
let default_metadata = DefaultMetadata::new();
let route = get_route(&nodes[2].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
nodes[2].node.send_payment(&route, payment_hash_2, &None).unwrap();
check_added_monitors!(nodes[2], 1);
}
Expand DownExpand Up@@ -1592,7 +1611,8 @@ fn test_monitor_update_on_pending_forwards() {
let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
{
let net_graph_msg_handler = &nodes[2].net_graph_msg_handler;
let route = get_route(&nodes[2].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
let default_metadata = DefaultMetadata::new();
let route = get_route(&nodes[2].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
nodes[2].node.send_payment(&route, payment_hash_2, &None).unwrap();
check_added_monitors!(nodes[2], 1);
}
Expand DownExpand Up@@ -1655,7 +1675,8 @@ fn monitor_update_claim_fail_no_response() {
let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
{
let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
let default_metadata = DefaultMetadata::new();
let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
check_added_monitors!(nodes[0], 1);
}
Expand DownExpand Up@@ -1820,7 +1841,8 @@ fn test_path_paused_mpp() {

let (payment_preimage, payment_hash) = get_payment_preimage_hash!(&nodes[0]);
let payment_secret = PaymentSecret([0xdb; 32]);
let mut route = get_route(&nodes[0].node.get_our_node_id(), &nodes[0].net_graph_msg_handler, &nodes[3].node.get_our_node_id(), None, &[], 100000, TEST_FINAL_CLTV, &logger).unwrap();
let default_metadata = DefaultMetadata::new();
let mut route = get_route(&nodes[0].node.get_our_node_id(), &nodes[0].net_graph_msg_handler, &nodes[3].node.get_our_node_id(), None, &[], 100000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();

// Set us up to take multiple routes, one 0 -> 1 -> 3 and one 0 -> 2 -> 3:
let path = route.paths[0].clone();
Expand Down
8 changes: 5 additions & 3 deletions lightning/src/ln/functional_test_utils.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ use chain::transaction::OutPoint;
use ln::channelmanager::{ChannelManager, ChannelManagerReadArgs, RAACommitmentOrder, PaymentPreimage, PaymentHash, PaymentSecret, PaymentSendFailure};
use ln::channelmonitor::{ChannelMonitor, ManyChannelMonitor};
use routing::router::{Route, get_route};
use routing::network_graph::{NetGraphMsgHandler, NetworkGraph};
use routing::network_graph::{NetGraphMsgHandler, NetworkGraph, DefaultMetadata};
use ln::features::InitFeatures;
use ln::msgs;
use ln::msgs::{ChannelMessageHandler,RoutingMessageHandler};
Expand DownExpand Up@@ -953,7 +953,8 @@ pub const TEST_FINAL_CLTV: u32 = 32;
pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) -> (PaymentPreimage, PaymentHash) {
let net_graph_msg_handler = &origin_node.net_graph_msg_handler;
let logger = test_utils::TestLogger::new();
let route = get_route(&origin_node.node.get_our_node_id(), net_graph_msg_handler, &expected_route.last().unwrap().node.get_our_node_id(), None, &Vec::new(), recv_value, TEST_FINAL_CLTV, &logger).unwrap();
let default_metadata = DefaultMetadata::new();
let route = get_route(&origin_node.node.get_our_node_id(), net_graph_msg_handler, &expected_route.last().unwrap().node.get_our_node_id(), None, &Vec::new(), recv_value, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
assert_eq!(route.paths.len(), 1);
assert_eq!(route.paths[0].len(), expected_route.len());
for (node, hop) in expected_route.iter().zip(route.paths[0].iter()) {
Expand All@@ -966,7 +967,8 @@ pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route:
pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) {
let logger = test_utils::TestLogger::new();
let net_graph_msg_handler = &origin_node.net_graph_msg_handler;
let route = get_route(&origin_node.node.get_our_node_id(), net_graph_msg_handler, &expected_route.last().unwrap().node.get_our_node_id(), None, &Vec::new(), recv_value, TEST_FINAL_CLTV, &logger).unwrap();
let default_metadata = DefaultMetadata::new();
let route = get_route(&origin_node.node.get_our_node_id(), net_graph_msg_handler, &expected_route.last().unwrap().node.get_our_node_id(), None, &Vec::new(), recv_value, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
assert_eq!(route.paths.len(), 1);
assert_eq!(route.paths[0].len(), expected_route.len());
for (node, hop) in expected_route.iter().zip(route.paths[0].iter()) {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Add default implementation for tracking metadata#636

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

sourabhmarathe
wants to merge
16
commits into

from

 Closed


Add default implementation for tracking metadata
#636
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


16 commits


Select commit
Hold shift + click to select a range
e76ac4e

Add default implementation for tracking metadata


sourabhmarathe Jun 7, 2020
42f7d56

Track failed portion of MPP, not entire MPP


sourabhmarathe Jun 8, 2020
a424c63

Remove failed route tracking methods


sourabhmarathe Jun 8, 2020
51c8d1b

Remove functions that would never be called


sourabhmarathe Jun 8, 2020
1a1dc96

Return u64::MAX if chan is on failed list


sourabhmarathe Jun 8, 2020
4664e99

Change output of get_channel_fee_penalty


sourabhmarathe Jun 12, 2020
37c6de6

Add failed_route()


sourabhmarathe Jun 12, 2020
4397c0e

Add RoutingFeePenalty param to get_route


sourabhmarathe Jun 12, 2020
84b7f6b

Add fee penalty to htlc minimum in get_route()


sourabhmarathe Jun 14, 2020
33deb1f

Do not add route to failed list on success


sourabhmarathe Jun 17, 2020
5e229fc

Move penalty fee check to correct place in code


sourabhmarathe Jun 17, 2020
6beca99

Address ariard review


sourabhmarathe Jun 24, 2020
9e7e2f6

Add constructor for DefaultMetadata


sourabhmarathe Jun 24, 2020
7529726

Add DefaultMetadata param to get_route calls


sourabhmarathe Jun 24, 2020
8dd338c

Use checked_add when calculating new_fee in get_route()


sourabhmarathe Jun 25, 2020
bb5c725

Remove channel from failed channels on success


sourabhmarathe Jun 25, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


64 changes: 43 additions & 21 deletions
lightning/src/ln/chanmon_update_fail_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ use ln::features::InitFeatures;
use ln::msgs;
use ln::msgs::{ChannelMessageHandler, ErrorAction, RoutingMessageHandler};
use routing::router::get_route;
use routing::network_graph::DefaultMetadata;
use util::events::{Event, EventsProvider, MessageSendEvent, MessageSendEventsProvider};
use util::errors::APIError;

Expand All@@ -34,7 +35,8 @@ fn test_simple_monitor_permanent_update_fail() {

	*nodes[0].chan_monitor.update_ret.lock().unwrap() = Err(ChannelMonitorUpdateErr::PermanentFailure);
	let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
	let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
	let default_metadata = DefaultMetadata::new();
	let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
	unwrap_send_err!(nodes[0].node.send_payment(&route, payment_hash_1, &None), true, APIError::ChannelUnavailable {..}, {});
	check_added_monitors!(nodes[0], 2);

Expand DownExpand Up@@ -71,7 +73,8 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {

	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 unwrap_send_err!(nodes[0].node.send_payment(&route, payment_hash_1, &None), false, APIError::MonitorUpdateFailed, {});
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -118,7 +121,8 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
	{
 *nodes[0].chan_monitor.update_ret.lock().unwrap() = Err(ChannelMonitorUpdateErr::TemporaryFailure);
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 unwrap_send_err!(nodes[0].node.send_payment(&route, payment_hash_2, &None), false, APIError::MonitorUpdateFailed, {});
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -184,7 +188,8 @@ fn do_test_monitor_temporary_update_fail(disconnect_count: usize) {
	{
 *nodes[0].chan_monitor.update_ret.lock().unwrap() = Err(ChannelMonitorUpdateErr::TemporaryFailure);
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 unwrap_send_err!(nodes[0].node.send_payment(&route, payment_hash_2, &None), false, APIError::MonitorUpdateFailed, {});
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -515,7 +520,8 @@ fn test_monitor_update_fail_cs() {
	let (payment_preimage, our_payment_hash) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, our_payment_hash, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -604,7 +610,8 @@ fn test_monitor_update_fail_no_rebroadcast() {
	let (payment_preimage_1, our_payment_hash) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, our_payment_hash, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -655,7 +662,8 @@ fn test_monitor_update_raa_while_paused() {
	let (payment_preimage_1, our_payment_hash_1) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, our_payment_hash_1, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand All@@ -664,7 +672,8 @@ fn test_monitor_update_raa_while_paused() {
	let (payment_preimage_2, our_payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[1].net_graph_msg_handler;
 let route = get_route(&nodes[1].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[1].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[1].node.send_payment(&route, our_payment_hash_2, &None).unwrap();
 check_added_monitors!(nodes[1], 1);
	}
Expand DownExpand Up@@ -756,7 +765,8 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
	let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[2].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[2].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand All@@ -783,7 +793,8 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
	let (_, payment_hash_3) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[2].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[2].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_3, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -832,7 +843,8 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
 // Try to route another payment backwards from 2 to make sure 1 holds off on responding
 let (payment_preimage_4, payment_hash_4) = get_payment_preimage_hash!(nodes[0]);
 let net_graph_msg_handler = &nodes[2].net_graph_msg_handler;
 let route = get_route(&nodes[2].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[2].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[2].node.send_payment(&route, payment_hash_4, &None).unwrap();
 check_added_monitors!(nodes[2], 1);

Expand DownExpand Up@@ -1086,7 +1098,8 @@ fn raa_no_response_awaiting_raa_state() {
	// generation during RAA while in monitor-update-failed state.
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_1, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
 nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
Expand DownExpand Up@@ -1140,7 +1153,8 @@ fn raa_no_response_awaiting_raa_state() {
	// commitment transaction states) whereas here we can explicitly check for it.
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_3, &None).unwrap();
 check_added_monitors!(nodes[0], 0);
 assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
Expand DownExpand Up@@ -1232,7 +1246,8 @@ fn claim_while_disconnected_monitor_update_fail() {
	let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -1328,7 +1343,8 @@ fn monitor_failed_no_reestablish_response() {
	let (payment_preimage_1, payment_hash_1) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_1, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -1402,7 +1418,8 @@ fn first_message_on_recv_ordering() {
	let (payment_preimage_1, payment_hash_1) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_1, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand All@@ -1427,7 +1444,8 @@ fn first_message_on_recv_ordering() {
	let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -1507,7 +1525,8 @@ fn test_monitor_update_fail_claim() {
	let (_, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[2].net_graph_msg_handler;
 let route = get_route(&nodes[2].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[2].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[2].node.send_payment(&route, payment_hash_2, &None).unwrap();
 check_added_monitors!(nodes[2], 1);
	}
Expand DownExpand Up@@ -1592,7 +1611,8 @@ fn test_monitor_update_on_pending_forwards() {
	let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[2].net_graph_msg_handler;
 let route = get_route(&nodes[2].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[2].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[2].node.send_payment(&route, payment_hash_2, &None).unwrap();
 check_added_monitors!(nodes[2], 1);
	}
Expand DownExpand Up@@ -1655,7 +1675,8 @@ fn monitor_update_claim_fail_no_response() {
	let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -1820,7 +1841,8 @@ fn test_path_paused_mpp() {

	let (payment_preimage, payment_hash) = get_payment_preimage_hash!(&nodes[0]);
	let payment_secret = PaymentSecret([0xdb; 32]);
	let mut route = get_route(&nodes[0].node.get_our_node_id(), &nodes[0].net_graph_msg_handler, &nodes[3].node.get_our_node_id(), None, &[], 100000, TEST_FINAL_CLTV, &logger).unwrap();
	let default_metadata = DefaultMetadata::new();
	let mut route = get_route(&nodes[0].node.get_our_node_id(), &nodes[0].net_graph_msg_handler, &nodes[3].node.get_our_node_id(), None, &[], 100000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();

	// Set us up to take multiple routes, one 0 -> 1 -> 3 and one 0 -> 2 -> 3:
	let path = route.paths[0].clone();
Expand Down

8 changes: 5 additions & 3 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ use chain::transaction::OutPoint;
use ln::channelmanager::{ChannelManager, ChannelManagerReadArgs, RAACommitmentOrder, PaymentPreimage, PaymentHash, PaymentSecret, PaymentSendFailure};
use ln::channelmonitor::{ChannelMonitor, ManyChannelMonitor};
use routing::router::{Route, get_route};
use routing::network_graph::{NetGraphMsgHandler, NetworkGraph};
use routing::network_graph::{NetGraphMsgHandler, NetworkGraph, DefaultMetadata};
use ln::features::InitFeatures;
use ln::msgs;
use ln::msgs::{ChannelMessageHandler,RoutingMessageHandler};
Expand DownExpand Up@@ -953,7 +953,8 @@ pub const TEST_FINAL_CLTV: u32 = 32;
pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) -> (PaymentPreimage, PaymentHash) {
	let net_graph_msg_handler = &origin_node.net_graph_msg_handler;
	let logger = test_utils::TestLogger::new();
	let route = get_route(&origin_node.node.get_our_node_id(), net_graph_msg_handler, &expected_route.last().unwrap().node.get_our_node_id(), None, &Vec::new(), recv_value, TEST_FINAL_CLTV, &logger).unwrap();
	let default_metadata = DefaultMetadata::new();
	let route = get_route(&origin_node.node.get_our_node_id(), net_graph_msg_handler, &expected_route.last().unwrap().node.get_our_node_id(), None, &Vec::new(), recv_value, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
	assert_eq!(route.paths.len(), 1);
	assert_eq!(route.paths[0].len(), expected_route.len());
	for (node, hop) in expected_route.iter().zip(route.paths[0].iter()) {
Expand All@@ -966,7 +967,8 @@ pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route:
pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) {
	let logger = test_utils::TestLogger::new();
	let net_graph_msg_handler = &origin_node.net_graph_msg_handler;
	let route = get_route(&origin_node.node.get_our_node_id(), net_graph_msg_handler, &expected_route.last().unwrap().node.get_our_node_id(), None, &Vec::new(), recv_value, TEST_FINAL_CLTV, &logger).unwrap();
	let default_metadata = DefaultMetadata::new();
	let route = get_route(&origin_node.node.get_our_node_id(), net_graph_msg_handler, &expected_route.last().unwrap().node.get_our_node_id(), None, &Vec::new(), recv_value, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
	assert_eq!(route.paths.len(), 1);
	assert_eq!(route.paths[0].len(), expected_route.len());
	for (node, hop) in expected_route.iter().zip(route.paths[0].iter()) {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add default implementation for tracking metadata#636

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

sourabhmarathe
wants to merge
16
commits into

from

 Closed


Add default implementation for tracking metadata
#636
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


16 commits


Select commit
Hold shift + click to select a range
e76ac4e

Add default implementation for tracking metadata


sourabhmarathe Jun 7, 2020
42f7d56

Track failed portion of MPP, not entire MPP


sourabhmarathe Jun 8, 2020
a424c63

Remove failed route tracking methods


sourabhmarathe Jun 8, 2020
51c8d1b

Remove functions that would never be called


sourabhmarathe Jun 8, 2020
1a1dc96

Return u64::MAX if chan is on failed list


sourabhmarathe Jun 8, 2020
4664e99

Change output of get_channel_fee_penalty


sourabhmarathe Jun 12, 2020
37c6de6

Add failed_route()


sourabhmarathe Jun 12, 2020
4397c0e

Add RoutingFeePenalty param to get_route


sourabhmarathe Jun 12, 2020
84b7f6b

Add fee penalty to htlc minimum in get_route()


sourabhmarathe Jun 14, 2020
33deb1f

Do not add route to failed list on success


sourabhmarathe Jun 17, 2020
5e229fc

Move penalty fee check to correct place in code


sourabhmarathe Jun 17, 2020
6beca99

Address ariard review


sourabhmarathe Jun 24, 2020
9e7e2f6

Add constructor for DefaultMetadata


sourabhmarathe Jun 24, 2020
7529726

Add DefaultMetadata param to get_route calls


sourabhmarathe Jun 24, 2020
8dd338c

Use checked_add when calculating new_fee in get_route()


sourabhmarathe Jun 25, 2020
bb5c725

Remove channel from failed channels on success


sourabhmarathe Jun 25, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


64 changes: 43 additions & 21 deletions
lightning/src/ln/chanmon_update_fail_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ use ln::features::InitFeatures;
use ln::msgs;
use ln::msgs::{ChannelMessageHandler, ErrorAction, RoutingMessageHandler};
use routing::router::get_route;
use routing::network_graph::DefaultMetadata;
use util::events::{Event, EventsProvider, MessageSendEvent, MessageSendEventsProvider};
use util::errors::APIError;

Expand All@@ -34,7 +35,8 @@ fn test_simple_monitor_permanent_update_fail() {

	*nodes[0].chan_monitor.update_ret.lock().unwrap() = Err(ChannelMonitorUpdateErr::PermanentFailure);
	let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
	let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
	let default_metadata = DefaultMetadata::new();
	let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
	unwrap_send_err!(nodes[0].node.send_payment(&route, payment_hash_1, &None), true, APIError::ChannelUnavailable {..}, {});
	check_added_monitors!(nodes[0], 2);

Expand DownExpand Up@@ -71,7 +73,8 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {

	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 unwrap_send_err!(nodes[0].node.send_payment(&route, payment_hash_1, &None), false, APIError::MonitorUpdateFailed, {});
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -118,7 +121,8 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
	{
 *nodes[0].chan_monitor.update_ret.lock().unwrap() = Err(ChannelMonitorUpdateErr::TemporaryFailure);
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 unwrap_send_err!(nodes[0].node.send_payment(&route, payment_hash_2, &None), false, APIError::MonitorUpdateFailed, {});
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -184,7 +188,8 @@ fn do_test_monitor_temporary_update_fail(disconnect_count: usize) {
	{
 *nodes[0].chan_monitor.update_ret.lock().unwrap() = Err(ChannelMonitorUpdateErr::TemporaryFailure);
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 unwrap_send_err!(nodes[0].node.send_payment(&route, payment_hash_2, &None), false, APIError::MonitorUpdateFailed, {});
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -515,7 +520,8 @@ fn test_monitor_update_fail_cs() {
	let (payment_preimage, our_payment_hash) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, our_payment_hash, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -604,7 +610,8 @@ fn test_monitor_update_fail_no_rebroadcast() {
	let (payment_preimage_1, our_payment_hash) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, our_payment_hash, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -655,7 +662,8 @@ fn test_monitor_update_raa_while_paused() {
	let (payment_preimage_1, our_payment_hash_1) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, our_payment_hash_1, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand All@@ -664,7 +672,8 @@ fn test_monitor_update_raa_while_paused() {
	let (payment_preimage_2, our_payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[1].net_graph_msg_handler;
 let route = get_route(&nodes[1].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[1].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[1].node.send_payment(&route, our_payment_hash_2, &None).unwrap();
 check_added_monitors!(nodes[1], 1);
	}
Expand DownExpand Up@@ -756,7 +765,8 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
	let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[2].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[2].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand All@@ -783,7 +793,8 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
	let (_, payment_hash_3) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[2].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[2].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_3, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -832,7 +843,8 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
 // Try to route another payment backwards from 2 to make sure 1 holds off on responding
 let (payment_preimage_4, payment_hash_4) = get_payment_preimage_hash!(nodes[0]);
 let net_graph_msg_handler = &nodes[2].net_graph_msg_handler;
 let route = get_route(&nodes[2].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[2].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[2].node.send_payment(&route, payment_hash_4, &None).unwrap();
 check_added_monitors!(nodes[2], 1);

Expand DownExpand Up@@ -1086,7 +1098,8 @@ fn raa_no_response_awaiting_raa_state() {
	// generation during RAA while in monitor-update-failed state.
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_1, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
 nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
Expand DownExpand Up@@ -1140,7 +1153,8 @@ fn raa_no_response_awaiting_raa_state() {
	// commitment transaction states) whereas here we can explicitly check for it.
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_3, &None).unwrap();
 check_added_monitors!(nodes[0], 0);
 assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
Expand DownExpand Up@@ -1232,7 +1246,8 @@ fn claim_while_disconnected_monitor_update_fail() {
	let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -1328,7 +1343,8 @@ fn monitor_failed_no_reestablish_response() {
	let (payment_preimage_1, payment_hash_1) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_1, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -1402,7 +1418,8 @@ fn first_message_on_recv_ordering() {
	let (payment_preimage_1, payment_hash_1) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_1, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand All@@ -1427,7 +1444,8 @@ fn first_message_on_recv_ordering() {
	let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -1507,7 +1525,8 @@ fn test_monitor_update_fail_claim() {
	let (_, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[2].net_graph_msg_handler;
 let route = get_route(&nodes[2].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[2].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[2].node.send_payment(&route, payment_hash_2, &None).unwrap();
 check_added_monitors!(nodes[2], 1);
	}
Expand DownExpand Up@@ -1592,7 +1611,8 @@ fn test_monitor_update_on_pending_forwards() {
	let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[2].net_graph_msg_handler;
 let route = get_route(&nodes[2].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[2].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[2].node.send_payment(&route, payment_hash_2, &None).unwrap();
 check_added_monitors!(nodes[2], 1);
	}
Expand DownExpand Up@@ -1655,7 +1675,8 @@ fn monitor_update_claim_fail_no_response() {
	let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -1820,7 +1841,8 @@ fn test_path_paused_mpp() {

	let (payment_preimage, payment_hash) = get_payment_preimage_hash!(&nodes[0]);
	let payment_secret = PaymentSecret([0xdb; 32]);
	let mut route = get_route(&nodes[0].node.get_our_node_id(), &nodes[0].net_graph_msg_handler, &nodes[3].node.get_our_node_id(), None, &[], 100000, TEST_FINAL_CLTV, &logger).unwrap();
	let default_metadata = DefaultMetadata::new();
	let mut route = get_route(&nodes[0].node.get_our_node_id(), &nodes[0].net_graph_msg_handler, &nodes[3].node.get_our_node_id(), None, &[], 100000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();

	// Set us up to take multiple routes, one 0 -> 1 -> 3 and one 0 -> 2 -> 3:
	let path = route.paths[0].clone();
Expand Down

8 changes: 5 additions & 3 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ use chain::transaction::OutPoint;
use ln::channelmanager::{ChannelManager, ChannelManagerReadArgs, RAACommitmentOrder, PaymentPreimage, PaymentHash, PaymentSecret, PaymentSendFailure};
use ln::channelmonitor::{ChannelMonitor, ManyChannelMonitor};
use routing::router::{Route, get_route};
use routing::network_graph::{NetGraphMsgHandler, NetworkGraph};
use routing::network_graph::{NetGraphMsgHandler, NetworkGraph, DefaultMetadata};
use ln::features::InitFeatures;
use ln::msgs;
use ln::msgs::{ChannelMessageHandler,RoutingMessageHandler};
Expand DownExpand Up@@ -953,7 +953,8 @@ pub const TEST_FINAL_CLTV: u32 = 32;
pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) -> (PaymentPreimage, PaymentHash) {
	let net_graph_msg_handler = &origin_node.net_graph_msg_handler;
	let logger = test_utils::TestLogger::new();
	let route = get_route(&origin_node.node.get_our_node_id(), net_graph_msg_handler, &expected_route.last().unwrap().node.get_our_node_id(), None, &Vec::new(), recv_value, TEST_FINAL_CLTV, &logger).unwrap();
	let default_metadata = DefaultMetadata::new();
	let route = get_route(&origin_node.node.get_our_node_id(), net_graph_msg_handler, &expected_route.last().unwrap().node.get_our_node_id(), None, &Vec::new(), recv_value, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
	assert_eq!(route.paths.len(), 1);
	assert_eq!(route.paths[0].len(), expected_route.len());
	for (node, hop) in expected_route.iter().zip(route.paths[0].iter()) {
Expand All@@ -966,7 +967,8 @@ pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route:
pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) {
	let logger = test_utils::TestLogger::new();
	let net_graph_msg_handler = &origin_node.net_graph_msg_handler;
	let route = get_route(&origin_node.node.get_our_node_id(), net_graph_msg_handler, &expected_route.last().unwrap().node.get_our_node_id(), None, &Vec::new(), recv_value, TEST_FINAL_CLTV, &logger).unwrap();
	let default_metadata = DefaultMetadata::new();
	let route = get_route(&origin_node.node.get_our_node_id(), net_graph_msg_handler, &expected_route.last().unwrap().node.get_our_node_id(), None, &Vec::new(), recv_value, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
	assert_eq!(route.paths.len(), 1);
	assert_eq!(route.paths[0].len(), expected_route.len());
	for (node, hop) in expected_route.iter().zip(route.paths[0].iter()) {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add default implementation for tracking metadata#636

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

sourabhmarathe
wants to merge
16
commits into

from

 Closed


Add default implementation for tracking metadata
#636
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


16 commits


Select commit
Hold shift + click to select a range
e76ac4e

Add default implementation for tracking metadata


sourabhmarathe Jun 7, 2020
42f7d56

Track failed portion of MPP, not entire MPP


sourabhmarathe Jun 8, 2020
a424c63

Remove failed route tracking methods


sourabhmarathe Jun 8, 2020
51c8d1b

Remove functions that would never be called


sourabhmarathe Jun 8, 2020
1a1dc96

Return u64::MAX if chan is on failed list


sourabhmarathe Jun 8, 2020
4664e99

Change output of get_channel_fee_penalty


sourabhmarathe Jun 12, 2020
37c6de6

Add failed_route()


sourabhmarathe Jun 12, 2020
4397c0e

Add RoutingFeePenalty param to get_route


sourabhmarathe Jun 12, 2020
84b7f6b

Add fee penalty to htlc minimum in get_route()


sourabhmarathe Jun 14, 2020
33deb1f

Do not add route to failed list on success


sourabhmarathe Jun 17, 2020
5e229fc

Move penalty fee check to correct place in code


sourabhmarathe Jun 17, 2020
6beca99

Address ariard review


sourabhmarathe Jun 24, 2020
9e7e2f6

Add constructor for DefaultMetadata


sourabhmarathe Jun 24, 2020
7529726

Add DefaultMetadata param to get_route calls


sourabhmarathe Jun 24, 2020
8dd338c

Use checked_add when calculating new_fee in get_route()


sourabhmarathe Jun 25, 2020
bb5c725

Remove channel from failed channels on success


sourabhmarathe Jun 25, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


64 changes: 43 additions & 21 deletions
lightning/src/ln/chanmon_update_fail_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ use ln::features::InitFeatures;
use ln::msgs;
use ln::msgs::{ChannelMessageHandler, ErrorAction, RoutingMessageHandler};
use routing::router::get_route;
use routing::network_graph::DefaultMetadata;
use util::events::{Event, EventsProvider, MessageSendEvent, MessageSendEventsProvider};
use util::errors::APIError;

Expand All@@ -34,7 +35,8 @@ fn test_simple_monitor_permanent_update_fail() {

	*nodes[0].chan_monitor.update_ret.lock().unwrap() = Err(ChannelMonitorUpdateErr::PermanentFailure);
	let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
	let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
	let default_metadata = DefaultMetadata::new();
	let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
	unwrap_send_err!(nodes[0].node.send_payment(&route, payment_hash_1, &None), true, APIError::ChannelUnavailable {..}, {});
	check_added_monitors!(nodes[0], 2);

Expand DownExpand Up@@ -71,7 +73,8 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {

	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 unwrap_send_err!(nodes[0].node.send_payment(&route, payment_hash_1, &None), false, APIError::MonitorUpdateFailed, {});
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -118,7 +121,8 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
	{
 *nodes[0].chan_monitor.update_ret.lock().unwrap() = Err(ChannelMonitorUpdateErr::TemporaryFailure);
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 unwrap_send_err!(nodes[0].node.send_payment(&route, payment_hash_2, &None), false, APIError::MonitorUpdateFailed, {});
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -184,7 +188,8 @@ fn do_test_monitor_temporary_update_fail(disconnect_count: usize) {
	{
 *nodes[0].chan_monitor.update_ret.lock().unwrap() = Err(ChannelMonitorUpdateErr::TemporaryFailure);
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 unwrap_send_err!(nodes[0].node.send_payment(&route, payment_hash_2, &None), false, APIError::MonitorUpdateFailed, {});
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -515,7 +520,8 @@ fn test_monitor_update_fail_cs() {
	let (payment_preimage, our_payment_hash) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, our_payment_hash, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -604,7 +610,8 @@ fn test_monitor_update_fail_no_rebroadcast() {
	let (payment_preimage_1, our_payment_hash) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, our_payment_hash, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -655,7 +662,8 @@ fn test_monitor_update_raa_while_paused() {
	let (payment_preimage_1, our_payment_hash_1) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, our_payment_hash_1, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand All@@ -664,7 +672,8 @@ fn test_monitor_update_raa_while_paused() {
	let (payment_preimage_2, our_payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[1].net_graph_msg_handler;
 let route = get_route(&nodes[1].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[1].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[1].node.send_payment(&route, our_payment_hash_2, &None).unwrap();
 check_added_monitors!(nodes[1], 1);
	}
Expand DownExpand Up@@ -756,7 +765,8 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
	let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[2].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[2].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand All@@ -783,7 +793,8 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
	let (_, payment_hash_3) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[2].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[2].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_3, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -832,7 +843,8 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
 // Try to route another payment backwards from 2 to make sure 1 holds off on responding
 let (payment_preimage_4, payment_hash_4) = get_payment_preimage_hash!(nodes[0]);
 let net_graph_msg_handler = &nodes[2].net_graph_msg_handler;
 let route = get_route(&nodes[2].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[2].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[2].node.send_payment(&route, payment_hash_4, &None).unwrap();
 check_added_monitors!(nodes[2], 1);

Expand DownExpand Up@@ -1086,7 +1098,8 @@ fn raa_no_response_awaiting_raa_state() {
	// generation during RAA while in monitor-update-failed state.
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_1, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
 nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
Expand DownExpand Up@@ -1140,7 +1153,8 @@ fn raa_no_response_awaiting_raa_state() {
	// commitment transaction states) whereas here we can explicitly check for it.
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_3, &None).unwrap();
 check_added_monitors!(nodes[0], 0);
 assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
Expand DownExpand Up@@ -1232,7 +1246,8 @@ fn claim_while_disconnected_monitor_update_fail() {
	let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -1328,7 +1343,8 @@ fn monitor_failed_no_reestablish_response() {
	let (payment_preimage_1, payment_hash_1) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_1, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -1402,7 +1418,8 @@ fn first_message_on_recv_ordering() {
	let (payment_preimage_1, payment_hash_1) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_1, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand All@@ -1427,7 +1444,8 @@ fn first_message_on_recv_ordering() {
	let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -1507,7 +1525,8 @@ fn test_monitor_update_fail_claim() {
	let (_, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[2].net_graph_msg_handler;
 let route = get_route(&nodes[2].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[2].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[2].node.send_payment(&route, payment_hash_2, &None).unwrap();
 check_added_monitors!(nodes[2], 1);
	}
Expand DownExpand Up@@ -1592,7 +1611,8 @@ fn test_monitor_update_on_pending_forwards() {
	let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[2].net_graph_msg_handler;
 let route = get_route(&nodes[2].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[2].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[2].node.send_payment(&route, payment_hash_2, &None).unwrap();
 check_added_monitors!(nodes[2], 1);
	}
Expand DownExpand Up@@ -1655,7 +1675,8 @@ fn monitor_update_claim_fail_no_response() {
	let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -1820,7 +1841,8 @@ fn test_path_paused_mpp() {

	let (payment_preimage, payment_hash) = get_payment_preimage_hash!(&nodes[0]);
	let payment_secret = PaymentSecret([0xdb; 32]);
	let mut route = get_route(&nodes[0].node.get_our_node_id(), &nodes[0].net_graph_msg_handler, &nodes[3].node.get_our_node_id(), None, &[], 100000, TEST_FINAL_CLTV, &logger).unwrap();
	let default_metadata = DefaultMetadata::new();
	let mut route = get_route(&nodes[0].node.get_our_node_id(), &nodes[0].net_graph_msg_handler, &nodes[3].node.get_our_node_id(), None, &[], 100000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();

	// Set us up to take multiple routes, one 0 -> 1 -> 3 and one 0 -> 2 -> 3:
	let path = route.paths[0].clone();
Expand Down

8 changes: 5 additions & 3 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ use chain::transaction::OutPoint;
use ln::channelmanager::{ChannelManager, ChannelManagerReadArgs, RAACommitmentOrder, PaymentPreimage, PaymentHash, PaymentSecret, PaymentSendFailure};
use ln::channelmonitor::{ChannelMonitor, ManyChannelMonitor};
use routing::router::{Route, get_route};
use routing::network_graph::{NetGraphMsgHandler, NetworkGraph};
use routing::network_graph::{NetGraphMsgHandler, NetworkGraph, DefaultMetadata};
use ln::features::InitFeatures;
use ln::msgs;
use ln::msgs::{ChannelMessageHandler,RoutingMessageHandler};
Expand DownExpand Up@@ -953,7 +953,8 @@ pub const TEST_FINAL_CLTV: u32 = 32;
pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) -> (PaymentPreimage, PaymentHash) {
	let net_graph_msg_handler = &origin_node.net_graph_msg_handler;
	let logger = test_utils::TestLogger::new();
	let route = get_route(&origin_node.node.get_our_node_id(), net_graph_msg_handler, &expected_route.last().unwrap().node.get_our_node_id(), None, &Vec::new(), recv_value, TEST_FINAL_CLTV, &logger).unwrap();
	let default_metadata = DefaultMetadata::new();
	let route = get_route(&origin_node.node.get_our_node_id(), net_graph_msg_handler, &expected_route.last().unwrap().node.get_our_node_id(), None, &Vec::new(), recv_value, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
	assert_eq!(route.paths.len(), 1);
	assert_eq!(route.paths[0].len(), expected_route.len());
	for (node, hop) in expected_route.iter().zip(route.paths[0].iter()) {
Expand All@@ -966,7 +967,8 @@ pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route:
pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) {
	let logger = test_utils::TestLogger::new();
	let net_graph_msg_handler = &origin_node.net_graph_msg_handler;
	let route = get_route(&origin_node.node.get_our_node_id(), net_graph_msg_handler, &expected_route.last().unwrap().node.get_our_node_id(), None, &Vec::new(), recv_value, TEST_FINAL_CLTV, &logger).unwrap();
	let default_metadata = DefaultMetadata::new();
	let route = get_route(&origin_node.node.get_our_node_id(), net_graph_msg_handler, &expected_route.last().unwrap().node.get_our_node_id(), None, &Vec::new(), recv_value, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
	assert_eq!(route.paths.len(), 1);
	assert_eq!(route.paths[0].len(), expected_route.len());
	for (node, hop) in expected_route.iter().zip(route.paths[0].iter()) {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Add default implementation for tracking metadata#636

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

sourabhmarathe
wants to merge
16
commits into

from

 Closed


Add default implementation for tracking metadata
#636
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


16 commits


Select commit
Hold shift + click to select a range
e76ac4e

Add default implementation for tracking metadata


sourabhmarathe Jun 7, 2020
42f7d56

Track failed portion of MPP, not entire MPP


sourabhmarathe Jun 8, 2020
a424c63

Remove failed route tracking methods


sourabhmarathe Jun 8, 2020
51c8d1b

Remove functions that would never be called


sourabhmarathe Jun 8, 2020
1a1dc96

Return u64::MAX if chan is on failed list


sourabhmarathe Jun 8, 2020
4664e99

Change output of get_channel_fee_penalty


sourabhmarathe Jun 12, 2020
37c6de6

Add failed_route()


sourabhmarathe Jun 12, 2020
4397c0e

Add RoutingFeePenalty param to get_route


sourabhmarathe Jun 12, 2020
84b7f6b

Add fee penalty to htlc minimum in get_route()


sourabhmarathe Jun 14, 2020
33deb1f

Do not add route to failed list on success


sourabhmarathe Jun 17, 2020
5e229fc

Move penalty fee check to correct place in code


sourabhmarathe Jun 17, 2020
6beca99

Address ariard review


sourabhmarathe Jun 24, 2020
9e7e2f6

Add constructor for DefaultMetadata


sourabhmarathe Jun 24, 2020
7529726

Add DefaultMetadata param to get_route calls


sourabhmarathe Jun 24, 2020
8dd338c

Use checked_add when calculating new_fee in get_route()


sourabhmarathe Jun 25, 2020
bb5c725

Remove channel from failed channels on success


sourabhmarathe Jun 25, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


64 changes: 43 additions & 21 deletions
lightning/src/ln/chanmon_update_fail_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ use ln::features::InitFeatures;
use ln::msgs;
use ln::msgs::{ChannelMessageHandler, ErrorAction, RoutingMessageHandler};
use routing::router::get_route;
use routing::network_graph::DefaultMetadata;
use util::events::{Event, EventsProvider, MessageSendEvent, MessageSendEventsProvider};
use util::errors::APIError;

Expand All@@ -34,7 +35,8 @@ fn test_simple_monitor_permanent_update_fail() {

	*nodes[0].chan_monitor.update_ret.lock().unwrap() = Err(ChannelMonitorUpdateErr::PermanentFailure);
	let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
	let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
	let default_metadata = DefaultMetadata::new();
	let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
	unwrap_send_err!(nodes[0].node.send_payment(&route, payment_hash_1, &None), true, APIError::ChannelUnavailable {..}, {});
	check_added_monitors!(nodes[0], 2);

Expand DownExpand Up@@ -71,7 +73,8 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {

	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 unwrap_send_err!(nodes[0].node.send_payment(&route, payment_hash_1, &None), false, APIError::MonitorUpdateFailed, {});
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -118,7 +121,8 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
	{
 *nodes[0].chan_monitor.update_ret.lock().unwrap() = Err(ChannelMonitorUpdateErr::TemporaryFailure);
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 unwrap_send_err!(nodes[0].node.send_payment(&route, payment_hash_2, &None), false, APIError::MonitorUpdateFailed, {});
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -184,7 +188,8 @@ fn do_test_monitor_temporary_update_fail(disconnect_count: usize) {
	{
 *nodes[0].chan_monitor.update_ret.lock().unwrap() = Err(ChannelMonitorUpdateErr::TemporaryFailure);
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 unwrap_send_err!(nodes[0].node.send_payment(&route, payment_hash_2, &None), false, APIError::MonitorUpdateFailed, {});
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -515,7 +520,8 @@ fn test_monitor_update_fail_cs() {
	let (payment_preimage, our_payment_hash) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, our_payment_hash, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -604,7 +610,8 @@ fn test_monitor_update_fail_no_rebroadcast() {
	let (payment_preimage_1, our_payment_hash) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, our_payment_hash, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -655,7 +662,8 @@ fn test_monitor_update_raa_while_paused() {
	let (payment_preimage_1, our_payment_hash_1) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, our_payment_hash_1, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand All@@ -664,7 +672,8 @@ fn test_monitor_update_raa_while_paused() {
	let (payment_preimage_2, our_payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[1].net_graph_msg_handler;
 let route = get_route(&nodes[1].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[1].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[1].node.send_payment(&route, our_payment_hash_2, &None).unwrap();
 check_added_monitors!(nodes[1], 1);
	}
Expand DownExpand Up@@ -756,7 +765,8 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
	let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[2].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[2].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand All@@ -783,7 +793,8 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
	let (_, payment_hash_3) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[2].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[2].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_3, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -832,7 +843,8 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
 // Try to route another payment backwards from 2 to make sure 1 holds off on responding
 let (payment_preimage_4, payment_hash_4) = get_payment_preimage_hash!(nodes[0]);
 let net_graph_msg_handler = &nodes[2].net_graph_msg_handler;
 let route = get_route(&nodes[2].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[2].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[2].node.send_payment(&route, payment_hash_4, &None).unwrap();
 check_added_monitors!(nodes[2], 1);

Expand DownExpand Up@@ -1086,7 +1098,8 @@ fn raa_no_response_awaiting_raa_state() {
	// generation during RAA while in monitor-update-failed state.
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_1, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
 nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
Expand DownExpand Up@@ -1140,7 +1153,8 @@ fn raa_no_response_awaiting_raa_state() {
	// commitment transaction states) whereas here we can explicitly check for it.
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_3, &None).unwrap();
 check_added_monitors!(nodes[0], 0);
 assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
Expand DownExpand Up@@ -1232,7 +1246,8 @@ fn claim_while_disconnected_monitor_update_fail() {
	let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -1328,7 +1343,8 @@ fn monitor_failed_no_reestablish_response() {
	let (payment_preimage_1, payment_hash_1) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_1, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -1402,7 +1418,8 @@ fn first_message_on_recv_ordering() {
	let (payment_preimage_1, payment_hash_1) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_1, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand All@@ -1427,7 +1444,8 @@ fn first_message_on_recv_ordering() {
	let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -1507,7 +1525,8 @@ fn test_monitor_update_fail_claim() {
	let (_, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[2].net_graph_msg_handler;
 let route = get_route(&nodes[2].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[2].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[2].node.send_payment(&route, payment_hash_2, &None).unwrap();
 check_added_monitors!(nodes[2], 1);
	}
Expand DownExpand Up@@ -1592,7 +1611,8 @@ fn test_monitor_update_on_pending_forwards() {
	let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[2].net_graph_msg_handler;
 let route = get_route(&nodes[2].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[2].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[2].node.send_payment(&route, payment_hash_2, &None).unwrap();
 check_added_monitors!(nodes[2], 1);
	}
Expand DownExpand Up@@ -1655,7 +1675,8 @@ fn monitor_update_claim_fail_no_response() {
	let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -1820,7 +1841,8 @@ fn test_path_paused_mpp() {

	let (payment_preimage, payment_hash) = get_payment_preimage_hash!(&nodes[0]);
	let payment_secret = PaymentSecret([0xdb; 32]);
	let mut route = get_route(&nodes[0].node.get_our_node_id(), &nodes[0].net_graph_msg_handler, &nodes[3].node.get_our_node_id(), None, &[], 100000, TEST_FINAL_CLTV, &logger).unwrap();
	let default_metadata = DefaultMetadata::new();
	let mut route = get_route(&nodes[0].node.get_our_node_id(), &nodes[0].net_graph_msg_handler, &nodes[3].node.get_our_node_id(), None, &[], 100000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();

	// Set us up to take multiple routes, one 0 -> 1 -> 3 and one 0 -> 2 -> 3:
	let path = route.paths[0].clone();
Expand Down

8 changes: 5 additions & 3 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ use chain::transaction::OutPoint;
use ln::channelmanager::{ChannelManager, ChannelManagerReadArgs, RAACommitmentOrder, PaymentPreimage, PaymentHash, PaymentSecret, PaymentSendFailure};
use ln::channelmonitor::{ChannelMonitor, ManyChannelMonitor};
use routing::router::{Route, get_route};
use routing::network_graph::{NetGraphMsgHandler, NetworkGraph};
use routing::network_graph::{NetGraphMsgHandler, NetworkGraph, DefaultMetadata};
use ln::features::InitFeatures;
use ln::msgs;
use ln::msgs::{ChannelMessageHandler,RoutingMessageHandler};
Expand DownExpand Up@@ -953,7 +953,8 @@ pub const TEST_FINAL_CLTV: u32 = 32;
pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) -> (PaymentPreimage, PaymentHash) {
	let net_graph_msg_handler = &origin_node.net_graph_msg_handler;
	let logger = test_utils::TestLogger::new();
	let route = get_route(&origin_node.node.get_our_node_id(), net_graph_msg_handler, &expected_route.last().unwrap().node.get_our_node_id(), None, &Vec::new(), recv_value, TEST_FINAL_CLTV, &logger).unwrap();
	let default_metadata = DefaultMetadata::new();
	let route = get_route(&origin_node.node.get_our_node_id(), net_graph_msg_handler, &expected_route.last().unwrap().node.get_our_node_id(), None, &Vec::new(), recv_value, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
	assert_eq!(route.paths.len(), 1);
	assert_eq!(route.paths[0].len(), expected_route.len());
	for (node, hop) in expected_route.iter().zip(route.paths[0].iter()) {
Expand All@@ -966,7 +967,8 @@ pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route:
pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) {
	let logger = test_utils::TestLogger::new();
	let net_graph_msg_handler = &origin_node.net_graph_msg_handler;
	let route = get_route(&origin_node.node.get_our_node_id(), net_graph_msg_handler, &expected_route.last().unwrap().node.get_our_node_id(), None, &Vec::new(), recv_value, TEST_FINAL_CLTV, &logger).unwrap();
	let default_metadata = DefaultMetadata::new();
	let route = get_route(&origin_node.node.get_our_node_id(), net_graph_msg_handler, &expected_route.last().unwrap().node.get_our_node_id(), None, &Vec::new(), recv_value, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
	assert_eq!(route.paths.len(), 1);
	assert_eq!(route.paths[0].len(), expected_route.len());
	for (node, hop) in expected_route.iter().zip(route.paths[0].iter()) {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add default implementation for tracking metadata#636

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

sourabhmarathe
wants to merge
16
commits into

from

 Closed


Add default implementation for tracking metadata
#636
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


16 commits


Select commit
Hold shift + click to select a range
e76ac4e

Add default implementation for tracking metadata


sourabhmarathe Jun 7, 2020
42f7d56

Track failed portion of MPP, not entire MPP


sourabhmarathe Jun 8, 2020
a424c63

Remove failed route tracking methods


sourabhmarathe Jun 8, 2020
51c8d1b

Remove functions that would never be called


sourabhmarathe Jun 8, 2020
1a1dc96

Return u64::MAX if chan is on failed list


sourabhmarathe Jun 8, 2020
4664e99

Change output of get_channel_fee_penalty


sourabhmarathe Jun 12, 2020
37c6de6

Add failed_route()


sourabhmarathe Jun 12, 2020
4397c0e

Add RoutingFeePenalty param to get_route


sourabhmarathe Jun 12, 2020
84b7f6b

Add fee penalty to htlc minimum in get_route()


sourabhmarathe Jun 14, 2020
33deb1f

Do not add route to failed list on success


sourabhmarathe Jun 17, 2020
5e229fc

Move penalty fee check to correct place in code


sourabhmarathe Jun 17, 2020
6beca99

Address ariard review


sourabhmarathe Jun 24, 2020
9e7e2f6

Add constructor for DefaultMetadata


sourabhmarathe Jun 24, 2020
7529726

Add DefaultMetadata param to get_route calls


sourabhmarathe Jun 24, 2020
8dd338c

Use checked_add when calculating new_fee in get_route()


sourabhmarathe Jun 25, 2020
bb5c725

Remove channel from failed channels on success


sourabhmarathe Jun 25, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


64 changes: 43 additions & 21 deletions
lightning/src/ln/chanmon_update_fail_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ use ln::features::InitFeatures;
use ln::msgs;
use ln::msgs::{ChannelMessageHandler, ErrorAction, RoutingMessageHandler};
use routing::router::get_route;
use routing::network_graph::DefaultMetadata;
use util::events::{Event, EventsProvider, MessageSendEvent, MessageSendEventsProvider};
use util::errors::APIError;

Expand All@@ -34,7 +35,8 @@ fn test_simple_monitor_permanent_update_fail() {

	*nodes[0].chan_monitor.update_ret.lock().unwrap() = Err(ChannelMonitorUpdateErr::PermanentFailure);
	let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
	let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
	let default_metadata = DefaultMetadata::new();
	let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
	unwrap_send_err!(nodes[0].node.send_payment(&route, payment_hash_1, &None), true, APIError::ChannelUnavailable {..}, {});
	check_added_monitors!(nodes[0], 2);

Expand DownExpand Up@@ -71,7 +73,8 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {

	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 unwrap_send_err!(nodes[0].node.send_payment(&route, payment_hash_1, &None), false, APIError::MonitorUpdateFailed, {});
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -118,7 +121,8 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
	{
 *nodes[0].chan_monitor.update_ret.lock().unwrap() = Err(ChannelMonitorUpdateErr::TemporaryFailure);
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 unwrap_send_err!(nodes[0].node.send_payment(&route, payment_hash_2, &None), false, APIError::MonitorUpdateFailed, {});
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -184,7 +188,8 @@ fn do_test_monitor_temporary_update_fail(disconnect_count: usize) {
	{
 *nodes[0].chan_monitor.update_ret.lock().unwrap() = Err(ChannelMonitorUpdateErr::TemporaryFailure);
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 unwrap_send_err!(nodes[0].node.send_payment(&route, payment_hash_2, &None), false, APIError::MonitorUpdateFailed, {});
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -515,7 +520,8 @@ fn test_monitor_update_fail_cs() {
	let (payment_preimage, our_payment_hash) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, our_payment_hash, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -604,7 +610,8 @@ fn test_monitor_update_fail_no_rebroadcast() {
	let (payment_preimage_1, our_payment_hash) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, our_payment_hash, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -655,7 +662,8 @@ fn test_monitor_update_raa_while_paused() {
	let (payment_preimage_1, our_payment_hash_1) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, our_payment_hash_1, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand All@@ -664,7 +672,8 @@ fn test_monitor_update_raa_while_paused() {
	let (payment_preimage_2, our_payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[1].net_graph_msg_handler;
 let route = get_route(&nodes[1].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[1].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[1].node.send_payment(&route, our_payment_hash_2, &None).unwrap();
 check_added_monitors!(nodes[1], 1);
	}
Expand DownExpand Up@@ -756,7 +765,8 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
	let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[2].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[2].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand All@@ -783,7 +793,8 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
	let (_, payment_hash_3) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[2].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[2].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_3, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -832,7 +843,8 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
 // Try to route another payment backwards from 2 to make sure 1 holds off on responding
 let (payment_preimage_4, payment_hash_4) = get_payment_preimage_hash!(nodes[0]);
 let net_graph_msg_handler = &nodes[2].net_graph_msg_handler;
 let route = get_route(&nodes[2].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[2].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[2].node.send_payment(&route, payment_hash_4, &None).unwrap();
 check_added_monitors!(nodes[2], 1);

Expand DownExpand Up@@ -1086,7 +1098,8 @@ fn raa_no_response_awaiting_raa_state() {
	// generation during RAA while in monitor-update-failed state.
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_1, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
 nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
Expand DownExpand Up@@ -1140,7 +1153,8 @@ fn raa_no_response_awaiting_raa_state() {
	// commitment transaction states) whereas here we can explicitly check for it.
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_3, &None).unwrap();
 check_added_monitors!(nodes[0], 0);
 assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
Expand DownExpand Up@@ -1232,7 +1246,8 @@ fn claim_while_disconnected_monitor_update_fail() {
	let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -1328,7 +1343,8 @@ fn monitor_failed_no_reestablish_response() {
	let (payment_preimage_1, payment_hash_1) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_1, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -1402,7 +1418,8 @@ fn first_message_on_recv_ordering() {
	let (payment_preimage_1, payment_hash_1) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_1, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand All@@ -1427,7 +1444,8 @@ fn first_message_on_recv_ordering() {
	let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -1507,7 +1525,8 @@ fn test_monitor_update_fail_claim() {
	let (_, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[2].net_graph_msg_handler;
 let route = get_route(&nodes[2].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[2].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[2].node.send_payment(&route, payment_hash_2, &None).unwrap();
 check_added_monitors!(nodes[2], 1);
	}
Expand DownExpand Up@@ -1592,7 +1611,8 @@ fn test_monitor_update_on_pending_forwards() {
	let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[2].net_graph_msg_handler;
 let route = get_route(&nodes[2].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[2].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[2].node.send_payment(&route, payment_hash_2, &None).unwrap();
 check_added_monitors!(nodes[2], 1);
	}
Expand DownExpand Up@@ -1655,7 +1675,8 @@ fn monitor_update_claim_fail_no_response() {
	let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -1820,7 +1841,8 @@ fn test_path_paused_mpp() {

	let (payment_preimage, payment_hash) = get_payment_preimage_hash!(&nodes[0]);
	let payment_secret = PaymentSecret([0xdb; 32]);
	let mut route = get_route(&nodes[0].node.get_our_node_id(), &nodes[0].net_graph_msg_handler, &nodes[3].node.get_our_node_id(), None, &[], 100000, TEST_FINAL_CLTV, &logger).unwrap();
	let default_metadata = DefaultMetadata::new();
	let mut route = get_route(&nodes[0].node.get_our_node_id(), &nodes[0].net_graph_msg_handler, &nodes[3].node.get_our_node_id(), None, &[], 100000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();

	// Set us up to take multiple routes, one 0 -> 1 -> 3 and one 0 -> 2 -> 3:
	let path = route.paths[0].clone();
Expand Down

8 changes: 5 additions & 3 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ use chain::transaction::OutPoint;
use ln::channelmanager::{ChannelManager, ChannelManagerReadArgs, RAACommitmentOrder, PaymentPreimage, PaymentHash, PaymentSecret, PaymentSendFailure};
use ln::channelmonitor::{ChannelMonitor, ManyChannelMonitor};
use routing::router::{Route, get_route};
use routing::network_graph::{NetGraphMsgHandler, NetworkGraph};
use routing::network_graph::{NetGraphMsgHandler, NetworkGraph, DefaultMetadata};
use ln::features::InitFeatures;
use ln::msgs;
use ln::msgs::{ChannelMessageHandler,RoutingMessageHandler};
Expand DownExpand Up@@ -953,7 +953,8 @@ pub const TEST_FINAL_CLTV: u32 = 32;
pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) -> (PaymentPreimage, PaymentHash) {
	let net_graph_msg_handler = &origin_node.net_graph_msg_handler;
	let logger = test_utils::TestLogger::new();
	let route = get_route(&origin_node.node.get_our_node_id(), net_graph_msg_handler, &expected_route.last().unwrap().node.get_our_node_id(), None, &Vec::new(), recv_value, TEST_FINAL_CLTV, &logger).unwrap();
	let default_metadata = DefaultMetadata::new();
	let route = get_route(&origin_node.node.get_our_node_id(), net_graph_msg_handler, &expected_route.last().unwrap().node.get_our_node_id(), None, &Vec::new(), recv_value, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
	assert_eq!(route.paths.len(), 1);
	assert_eq!(route.paths[0].len(), expected_route.len());
	for (node, hop) in expected_route.iter().zip(route.paths[0].iter()) {
Expand All@@ -966,7 +967,8 @@ pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route:
pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) {
	let logger = test_utils::TestLogger::new();
	let net_graph_msg_handler = &origin_node.net_graph_msg_handler;
	let route = get_route(&origin_node.node.get_our_node_id(), net_graph_msg_handler, &expected_route.last().unwrap().node.get_our_node_id(), None, &Vec::new(), recv_value, TEST_FINAL_CLTV, &logger).unwrap();
	let default_metadata = DefaultMetadata::new();
	let route = get_route(&origin_node.node.get_our_node_id(), net_graph_msg_handler, &expected_route.last().unwrap().node.get_our_node_id(), None, &Vec::new(), recv_value, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
	assert_eq!(route.paths.len(), 1);
	assert_eq!(route.paths[0].len(), expected_route.len());
	for (node, hop) in expected_route.iter().zip(route.paths[0].iter()) {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add default implementation for tracking metadata#636

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

sourabhmarathe
wants to merge
16
commits into

from

 Closed


Add default implementation for tracking metadata
#636
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


16 commits


Select commit
Hold shift + click to select a range
e76ac4e

Add default implementation for tracking metadata


sourabhmarathe Jun 7, 2020
42f7d56

Track failed portion of MPP, not entire MPP


sourabhmarathe Jun 8, 2020
a424c63

Remove failed route tracking methods


sourabhmarathe Jun 8, 2020
51c8d1b

Remove functions that would never be called


sourabhmarathe Jun 8, 2020
1a1dc96

Return u64::MAX if chan is on failed list


sourabhmarathe Jun 8, 2020
4664e99

Change output of get_channel_fee_penalty


sourabhmarathe Jun 12, 2020
37c6de6

Add failed_route()


sourabhmarathe Jun 12, 2020
4397c0e

Add RoutingFeePenalty param to get_route


sourabhmarathe Jun 12, 2020
84b7f6b

Add fee penalty to htlc minimum in get_route()


sourabhmarathe Jun 14, 2020
33deb1f

Do not add route to failed list on success


sourabhmarathe Jun 17, 2020
5e229fc

Move penalty fee check to correct place in code


sourabhmarathe Jun 17, 2020
6beca99

Address ariard review


sourabhmarathe Jun 24, 2020
9e7e2f6

Add constructor for DefaultMetadata


sourabhmarathe Jun 24, 2020
7529726

Add DefaultMetadata param to get_route calls


sourabhmarathe Jun 24, 2020
8dd338c

Use checked_add when calculating new_fee in get_route()


sourabhmarathe Jun 25, 2020
bb5c725

Remove channel from failed channels on success


sourabhmarathe Jun 25, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


64 changes: 43 additions & 21 deletions
lightning/src/ln/chanmon_update_fail_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ use ln::features::InitFeatures;
use ln::msgs;
use ln::msgs::{ChannelMessageHandler, ErrorAction, RoutingMessageHandler};
use routing::router::get_route;
use routing::network_graph::DefaultMetadata;
use util::events::{Event, EventsProvider, MessageSendEvent, MessageSendEventsProvider};
use util::errors::APIError;

Expand All@@ -34,7 +35,8 @@ fn test_simple_monitor_permanent_update_fail() {

	*nodes[0].chan_monitor.update_ret.lock().unwrap() = Err(ChannelMonitorUpdateErr::PermanentFailure);
	let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
	let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
	let default_metadata = DefaultMetadata::new();
	let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
	unwrap_send_err!(nodes[0].node.send_payment(&route, payment_hash_1, &None), true, APIError::ChannelUnavailable {..}, {});
	check_added_monitors!(nodes[0], 2);

Expand DownExpand Up@@ -71,7 +73,8 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {

	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 unwrap_send_err!(nodes[0].node.send_payment(&route, payment_hash_1, &None), false, APIError::MonitorUpdateFailed, {});
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -118,7 +121,8 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
	{
 *nodes[0].chan_monitor.update_ret.lock().unwrap() = Err(ChannelMonitorUpdateErr::TemporaryFailure);
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 unwrap_send_err!(nodes[0].node.send_payment(&route, payment_hash_2, &None), false, APIError::MonitorUpdateFailed, {});
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -184,7 +188,8 @@ fn do_test_monitor_temporary_update_fail(disconnect_count: usize) {
	{
 *nodes[0].chan_monitor.update_ret.lock().unwrap() = Err(ChannelMonitorUpdateErr::TemporaryFailure);
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 unwrap_send_err!(nodes[0].node.send_payment(&route, payment_hash_2, &None), false, APIError::MonitorUpdateFailed, {});
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -515,7 +520,8 @@ fn test_monitor_update_fail_cs() {
	let (payment_preimage, our_payment_hash) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, our_payment_hash, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -604,7 +610,8 @@ fn test_monitor_update_fail_no_rebroadcast() {
	let (payment_preimage_1, our_payment_hash) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, our_payment_hash, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -655,7 +662,8 @@ fn test_monitor_update_raa_while_paused() {
	let (payment_preimage_1, our_payment_hash_1) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, our_payment_hash_1, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand All@@ -664,7 +672,8 @@ fn test_monitor_update_raa_while_paused() {
	let (payment_preimage_2, our_payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[1].net_graph_msg_handler;
 let route = get_route(&nodes[1].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[1].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[1].node.send_payment(&route, our_payment_hash_2, &None).unwrap();
 check_added_monitors!(nodes[1], 1);
	}
Expand DownExpand Up@@ -756,7 +765,8 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
	let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[2].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[2].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand All@@ -783,7 +793,8 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
	let (_, payment_hash_3) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[2].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[2].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_3, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -832,7 +843,8 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
 // Try to route another payment backwards from 2 to make sure 1 holds off on responding
 let (payment_preimage_4, payment_hash_4) = get_payment_preimage_hash!(nodes[0]);
 let net_graph_msg_handler = &nodes[2].net_graph_msg_handler;
 let route = get_route(&nodes[2].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[2].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[2].node.send_payment(&route, payment_hash_4, &None).unwrap();
 check_added_monitors!(nodes[2], 1);

Expand DownExpand Up@@ -1086,7 +1098,8 @@ fn raa_no_response_awaiting_raa_state() {
	// generation during RAA while in monitor-update-failed state.
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_1, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
 nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
Expand DownExpand Up@@ -1140,7 +1153,8 @@ fn raa_no_response_awaiting_raa_state() {
	// commitment transaction states) whereas here we can explicitly check for it.
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_3, &None).unwrap();
 check_added_monitors!(nodes[0], 0);
 assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
Expand DownExpand Up@@ -1232,7 +1246,8 @@ fn claim_while_disconnected_monitor_update_fail() {
	let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -1328,7 +1343,8 @@ fn monitor_failed_no_reestablish_response() {
	let (payment_preimage_1, payment_hash_1) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_1, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -1402,7 +1418,8 @@ fn first_message_on_recv_ordering() {
	let (payment_preimage_1, payment_hash_1) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_1, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand All@@ -1427,7 +1444,8 @@ fn first_message_on_recv_ordering() {
	let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -1507,7 +1525,8 @@ fn test_monitor_update_fail_claim() {
	let (_, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[2].net_graph_msg_handler;
 let route = get_route(&nodes[2].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[2].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[2].node.send_payment(&route, payment_hash_2, &None).unwrap();
 check_added_monitors!(nodes[2], 1);
	}
Expand DownExpand Up@@ -1592,7 +1611,8 @@ fn test_monitor_update_on_pending_forwards() {
	let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[2].net_graph_msg_handler;
 let route = get_route(&nodes[2].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[2].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[2].node.send_payment(&route, payment_hash_2, &None).unwrap();
 check_added_monitors!(nodes[2], 1);
	}
Expand DownExpand Up@@ -1655,7 +1675,8 @@ fn monitor_update_claim_fail_no_response() {
	let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -1820,7 +1841,8 @@ fn test_path_paused_mpp() {

	let (payment_preimage, payment_hash) = get_payment_preimage_hash!(&nodes[0]);
	let payment_secret = PaymentSecret([0xdb; 32]);
	let mut route = get_route(&nodes[0].node.get_our_node_id(), &nodes[0].net_graph_msg_handler, &nodes[3].node.get_our_node_id(), None, &[], 100000, TEST_FINAL_CLTV, &logger).unwrap();
	let default_metadata = DefaultMetadata::new();
	let mut route = get_route(&nodes[0].node.get_our_node_id(), &nodes[0].net_graph_msg_handler, &nodes[3].node.get_our_node_id(), None, &[], 100000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();

	// Set us up to take multiple routes, one 0 -> 1 -> 3 and one 0 -> 2 -> 3:
	let path = route.paths[0].clone();
Expand Down

8 changes: 5 additions & 3 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ use chain::transaction::OutPoint;
use ln::channelmanager::{ChannelManager, ChannelManagerReadArgs, RAACommitmentOrder, PaymentPreimage, PaymentHash, PaymentSecret, PaymentSendFailure};
use ln::channelmonitor::{ChannelMonitor, ManyChannelMonitor};
use routing::router::{Route, get_route};
use routing::network_graph::{NetGraphMsgHandler, NetworkGraph};
use routing::network_graph::{NetGraphMsgHandler, NetworkGraph, DefaultMetadata};
use ln::features::InitFeatures;
use ln::msgs;
use ln::msgs::{ChannelMessageHandler,RoutingMessageHandler};
Expand DownExpand Up@@ -953,7 +953,8 @@ pub const TEST_FINAL_CLTV: u32 = 32;
pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) -> (PaymentPreimage, PaymentHash) {
	let net_graph_msg_handler = &origin_node.net_graph_msg_handler;
	let logger = test_utils::TestLogger::new();
	let route = get_route(&origin_node.node.get_our_node_id(), net_graph_msg_handler, &expected_route.last().unwrap().node.get_our_node_id(), None, &Vec::new(), recv_value, TEST_FINAL_CLTV, &logger).unwrap();
	let default_metadata = DefaultMetadata::new();
	let route = get_route(&origin_node.node.get_our_node_id(), net_graph_msg_handler, &expected_route.last().unwrap().node.get_our_node_id(), None, &Vec::new(), recv_value, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
	assert_eq!(route.paths.len(), 1);
	assert_eq!(route.paths[0].len(), expected_route.len());
	for (node, hop) in expected_route.iter().zip(route.paths[0].iter()) {
Expand All@@ -966,7 +967,8 @@ pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route:
pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) {
	let logger = test_utils::TestLogger::new();
	let net_graph_msg_handler = &origin_node.net_graph_msg_handler;
	let route = get_route(&origin_node.node.get_our_node_id(), net_graph_msg_handler, &expected_route.last().unwrap().node.get_our_node_id(), None, &Vec::new(), recv_value, TEST_FINAL_CLTV, &logger).unwrap();
	let default_metadata = DefaultMetadata::new();
	let route = get_route(&origin_node.node.get_our_node_id(), net_graph_msg_handler, &expected_route.last().unwrap().node.get_our_node_id(), None, &Vec::new(), recv_value, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
	assert_eq!(route.paths.len(), 1);
	assert_eq!(route.paths[0].len(), expected_route.len());
	for (node, hop) in expected_route.iter().zip(route.paths[0].iter()) {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Add default implementation for tracking metadata#636

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

sourabhmarathe
wants to merge
16
commits into

from

 Closed


Add default implementation for tracking metadata
#636
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


16 commits


Select commit
Hold shift + click to select a range
e76ac4e

Add default implementation for tracking metadata


sourabhmarathe Jun 7, 2020
42f7d56

Track failed portion of MPP, not entire MPP


sourabhmarathe Jun 8, 2020
a424c63

Remove failed route tracking methods


sourabhmarathe Jun 8, 2020
51c8d1b

Remove functions that would never be called


sourabhmarathe Jun 8, 2020
1a1dc96

Return u64::MAX if chan is on failed list


sourabhmarathe Jun 8, 2020
4664e99

Change output of get_channel_fee_penalty


sourabhmarathe Jun 12, 2020
37c6de6

Add failed_route()


sourabhmarathe Jun 12, 2020
4397c0e

Add RoutingFeePenalty param to get_route


sourabhmarathe Jun 12, 2020
84b7f6b

Add fee penalty to htlc minimum in get_route()


sourabhmarathe Jun 14, 2020
33deb1f

Do not add route to failed list on success


sourabhmarathe Jun 17, 2020
5e229fc

Move penalty fee check to correct place in code


sourabhmarathe Jun 17, 2020
6beca99

Address ariard review


sourabhmarathe Jun 24, 2020
9e7e2f6

Add constructor for DefaultMetadata


sourabhmarathe Jun 24, 2020
7529726

Add DefaultMetadata param to get_route calls


sourabhmarathe Jun 24, 2020
8dd338c

Use checked_add when calculating new_fee in get_route()


sourabhmarathe Jun 25, 2020
bb5c725

Remove channel from failed channels on success


sourabhmarathe Jun 25, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


64 changes: 43 additions & 21 deletions
lightning/src/ln/chanmon_update_fail_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ use ln::features::InitFeatures;
use ln::msgs;
use ln::msgs::{ChannelMessageHandler, ErrorAction, RoutingMessageHandler};
use routing::router::get_route;
use routing::network_graph::DefaultMetadata;
use util::events::{Event, EventsProvider, MessageSendEvent, MessageSendEventsProvider};
use util::errors::APIError;

Expand All@@ -34,7 +35,8 @@ fn test_simple_monitor_permanent_update_fail() {

	*nodes[0].chan_monitor.update_ret.lock().unwrap() = Err(ChannelMonitorUpdateErr::PermanentFailure);
	let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
	let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
	let default_metadata = DefaultMetadata::new();
	let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
	unwrap_send_err!(nodes[0].node.send_payment(&route, payment_hash_1, &None), true, APIError::ChannelUnavailable {..}, {});
	check_added_monitors!(nodes[0], 2);

Expand DownExpand Up@@ -71,7 +73,8 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {

	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 unwrap_send_err!(nodes[0].node.send_payment(&route, payment_hash_1, &None), false, APIError::MonitorUpdateFailed, {});
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -118,7 +121,8 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
	{
 *nodes[0].chan_monitor.update_ret.lock().unwrap() = Err(ChannelMonitorUpdateErr::TemporaryFailure);
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 unwrap_send_err!(nodes[0].node.send_payment(&route, payment_hash_2, &None), false, APIError::MonitorUpdateFailed, {});
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -184,7 +188,8 @@ fn do_test_monitor_temporary_update_fail(disconnect_count: usize) {
	{
 *nodes[0].chan_monitor.update_ret.lock().unwrap() = Err(ChannelMonitorUpdateErr::TemporaryFailure);
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 unwrap_send_err!(nodes[0].node.send_payment(&route, payment_hash_2, &None), false, APIError::MonitorUpdateFailed, {});
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -515,7 +520,8 @@ fn test_monitor_update_fail_cs() {
	let (payment_preimage, our_payment_hash) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, our_payment_hash, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -604,7 +610,8 @@ fn test_monitor_update_fail_no_rebroadcast() {
	let (payment_preimage_1, our_payment_hash) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, our_payment_hash, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -655,7 +662,8 @@ fn test_monitor_update_raa_while_paused() {
	let (payment_preimage_1, our_payment_hash_1) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, our_payment_hash_1, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand All@@ -664,7 +672,8 @@ fn test_monitor_update_raa_while_paused() {
	let (payment_preimage_2, our_payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[1].net_graph_msg_handler;
 let route = get_route(&nodes[1].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[1].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[1].node.send_payment(&route, our_payment_hash_2, &None).unwrap();
 check_added_monitors!(nodes[1], 1);
	}
Expand DownExpand Up@@ -756,7 +765,8 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
	let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[2].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[2].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand All@@ -783,7 +793,8 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
	let (_, payment_hash_3) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[2].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[2].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_3, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -832,7 +843,8 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
 // Try to route another payment backwards from 2 to make sure 1 holds off on responding
 let (payment_preimage_4, payment_hash_4) = get_payment_preimage_hash!(nodes[0]);
 let net_graph_msg_handler = &nodes[2].net_graph_msg_handler;
 let route = get_route(&nodes[2].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[2].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[2].node.send_payment(&route, payment_hash_4, &None).unwrap();
 check_added_monitors!(nodes[2], 1);

Expand DownExpand Up@@ -1086,7 +1098,8 @@ fn raa_no_response_awaiting_raa_state() {
	// generation during RAA while in monitor-update-failed state.
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_1, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
 nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
Expand DownExpand Up@@ -1140,7 +1153,8 @@ fn raa_no_response_awaiting_raa_state() {
	// commitment transaction states) whereas here we can explicitly check for it.
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_3, &None).unwrap();
 check_added_monitors!(nodes[0], 0);
 assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
Expand DownExpand Up@@ -1232,7 +1246,8 @@ fn claim_while_disconnected_monitor_update_fail() {
	let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -1328,7 +1343,8 @@ fn monitor_failed_no_reestablish_response() {
	let (payment_preimage_1, payment_hash_1) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_1, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -1402,7 +1418,8 @@ fn first_message_on_recv_ordering() {
	let (payment_preimage_1, payment_hash_1) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_1, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand All@@ -1427,7 +1444,8 @@ fn first_message_on_recv_ordering() {
	let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -1507,7 +1525,8 @@ fn test_monitor_update_fail_claim() {
	let (_, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[2].net_graph_msg_handler;
 let route = get_route(&nodes[2].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[2].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[2].node.send_payment(&route, payment_hash_2, &None).unwrap();
 check_added_monitors!(nodes[2], 1);
	}
Expand DownExpand Up@@ -1592,7 +1611,8 @@ fn test_monitor_update_on_pending_forwards() {
	let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[2].net_graph_msg_handler;
 let route = get_route(&nodes[2].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[2].node.get_our_node_id(), net_graph_msg_handler, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[2].node.send_payment(&route, payment_hash_2, &None).unwrap();
 check_added_monitors!(nodes[2], 1);
	}
Expand DownExpand Up@@ -1655,7 +1675,8 @@ fn monitor_update_claim_fail_no_response() {
	let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
	{
 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 let default_metadata = DefaultMetadata::new();
 let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
 nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
 check_added_monitors!(nodes[0], 1);
	}
Expand DownExpand Up@@ -1820,7 +1841,8 @@ fn test_path_paused_mpp() {

	let (payment_preimage, payment_hash) = get_payment_preimage_hash!(&nodes[0]);
	let payment_secret = PaymentSecret([0xdb; 32]);
	let mut route = get_route(&nodes[0].node.get_our_node_id(), &nodes[0].net_graph_msg_handler, &nodes[3].node.get_our_node_id(), None, &[], 100000, TEST_FINAL_CLTV, &logger).unwrap();
	let default_metadata = DefaultMetadata::new();
	let mut route = get_route(&nodes[0].node.get_our_node_id(), &nodes[0].net_graph_msg_handler, &nodes[3].node.get_our_node_id(), None, &[], 100000, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();

	// Set us up to take multiple routes, one 0 -> 1 -> 3 and one 0 -> 2 -> 3:
	let path = route.paths[0].clone();
Expand Down

8 changes: 5 additions & 3 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ use chain::transaction::OutPoint;
use ln::channelmanager::{ChannelManager, ChannelManagerReadArgs, RAACommitmentOrder, PaymentPreimage, PaymentHash, PaymentSecret, PaymentSendFailure};
use ln::channelmonitor::{ChannelMonitor, ManyChannelMonitor};
use routing::router::{Route, get_route};
use routing::network_graph::{NetGraphMsgHandler, NetworkGraph};
use routing::network_graph::{NetGraphMsgHandler, NetworkGraph, DefaultMetadata};
use ln::features::InitFeatures;
use ln::msgs;
use ln::msgs::{ChannelMessageHandler,RoutingMessageHandler};
Expand DownExpand Up@@ -953,7 +953,8 @@ pub const TEST_FINAL_CLTV: u32 = 32;
pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) -> (PaymentPreimage, PaymentHash) {
	let net_graph_msg_handler = &origin_node.net_graph_msg_handler;
	let logger = test_utils::TestLogger::new();
	let route = get_route(&origin_node.node.get_our_node_id(), net_graph_msg_handler, &expected_route.last().unwrap().node.get_our_node_id(), None, &Vec::new(), recv_value, TEST_FINAL_CLTV, &logger).unwrap();
	let default_metadata = DefaultMetadata::new();
	let route = get_route(&origin_node.node.get_our_node_id(), net_graph_msg_handler, &expected_route.last().unwrap().node.get_our_node_id(), None, &Vec::new(), recv_value, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
	assert_eq!(route.paths.len(), 1);
	assert_eq!(route.paths[0].len(), expected_route.len());
	for (node, hop) in expected_route.iter().zip(route.paths[0].iter()) {
Expand All@@ -966,7 +967,8 @@ pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route:
pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) {
	let logger = test_utils::TestLogger::new();
	let net_graph_msg_handler = &origin_node.net_graph_msg_handler;
	let route = get_route(&origin_node.node.get_our_node_id(), net_graph_msg_handler, &expected_route.last().unwrap().node.get_our_node_id(), None, &Vec::new(), recv_value, TEST_FINAL_CLTV, &logger).unwrap();
	let default_metadata = DefaultMetadata::new();
	let route = get_route(&origin_node.node.get_our_node_id(), net_graph_msg_handler, &expected_route.last().unwrap().node.get_our_node_id(), None, &Vec::new(), recv_value, TEST_FINAL_CLTV, &logger, default_metadata).unwrap();
	assert_eq!(route.paths.len(), 1);
	assert_eq!(route.paths[0].len(), expected_route.len());
	for (node, hop) in expected_route.iter().zip(route.paths[0].iter()) {
Expand Down
Loading