Closed
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
9073b8d
first commit
Sharmalm Feb 4, 2023
02dddb4
second commit
Sharmalm Feb 4, 2023
0312c2b
original
Sharmalm Feb 5, 2023
3cdb8ed
first logging
Sharmalm Feb 5, 2023
b6ac4ec
Merge remote-tracking branch 'origin/main'
Sharmalm Feb 5, 2023
cfe611a
fifth commit
Sharmalm Feb 5, 2023
5bd7708
third commit
Sharmalm Feb 5, 2023
87eef3f
fourth commit
Sharmalm Feb 9, 2023
bb6c7f6
Merge branch 'lightningdevkit:main' into main
Sharmalm Feb 9, 2023
aef2aa6
Merge branch 'lightningdevkit:main' into main
Sharmalm Feb 11, 2023
4a2c289
sixth commit
Sharmalm Feb 11, 2023
a8781ca
seventh commit
Sharmalm Feb 11, 2023
0e5e8a6
eight commit
Sharmalm Feb 14, 2023
3240053
Merge branch 'lightningdevkit:main' into main
Sharmalm Feb 14, 2023
b913098
Merge branch 'lightningdevkit:main' into main
Sharmalm Feb 15, 2023
8d2a85d
ninth
Sharmalm Feb 15, 2023
fe93ed8
Merge branch 'lightningdevkit:main' into main
Sharmalm Feb 20, 2023
6da0e06
access hashmap
Sharmalm Feb 20, 2023
78dbb77
Merge remote-tracking branch 'origin/main'
Sharmalm Feb 20, 2023
0be98f5
Merge branch 'lightningdevkit:main' into main
Sharmalm Feb 24, 2023
c830123
Merge branch 'lightningdevkit:main' into main
Sharmalm Mar 1, 2023
9bc34a1
improving hashmap conditions
Sharmalm Mar 1, 2023
1969bb7
Merge remote-tracking branch 'refs/remotes/origin/main'
Sharmalm Mar 1, 2023
7febd5b
Merge branch 'lightningdevkit:main' into main
Sharmalm Mar 4, 2023
4364e18
correction
Sharmalm Mar 4, 2023
34d21dc
Merge branch 'lightningdevkit:main' into main
Sharmalm Mar 16, 2023
592f615
test function
Sharmalm Mar 16, 2023
c633d31
Merge remote-tracking branch 'refs/remotes/origin/main'
Sharmalm Mar 16, 2023
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
80 changes: 79 additions & 1 deletion lightning/src/routing/router.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -1296,6 +1296,25 @@ where L::Target: Logger {
// around again with a higher amount.
if !contributes_sufficient_value || exceeds_max_path_length ||
exceeds_cltv_delta_limit || payment_failed_on_this_channel {

let mut is_first_hop = true;
for (key , _channel) in &first_hop_targets {

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You don't need to loop here, you can just do first_hop_targets.get(&$dest_node_id) with an if let Some... or match. That should also let you drop the is_first_hop variable.

if key == &$dest_node_id {
if is_first_hop && !contributes_sufficient_value {
log_trace!(logger, "First Hop {} is excluded due to insufficient value", short_channel_id);

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can drop the blank lines here, and note that some lines have whitespace at the end, which would be nice to remove. Finally, note that some lines are indented by spaces followed by tabs, which should be replaced by all tabs. All of these issues will be highlighted by doing git show or git diff-tree -U3 locally, depending on your terminal config.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks

} if is_first_hop && exceeds_max_path_length {
log_trace!(logger, "First Hop {} is excluded due to candidate hop excluded max path length", short_channel_id);

} if is_first_hop && exceeds_cltv_delta_limit {
log_trace!(logger, "First Hop {} is excluded beacause it exceed the maximum total cltv expiry limit" , short_channel_id);

} if is_first_hop && payment_failed_on_this_channel {
log_trace!(logger, "First Hop {} is excluded beacause it was failed previously" , short_channel_id);
}
is_first_hop = false;
} // commit

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does // commit mean?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, it means nothing. I write // commit in the line where I update the code.

}
// Path isn't useful, ignore it and move on.
} else if may_overpay_to_meet_path_minimum_msat {
hit_minimum_limit = true;
Expand DownExpand Up@@ -3813,7 +3832,66 @@ mod tests {
assert_eq!(total_amount_paid_msat, 50_000);
}
}


#[test]
fn test_my_logging_function() { // commit
let (secp_ctx, network_graph, gossip_sync, _, logger) = build_graph();
let (our_privkey, our_id, privkeys, nodes) = get_nodes(&secp_ctx);
let scorer = ln_test_utils::TestScorer::with_penalty(0);
let keys_manager = ln_test_utils::TestKeysInterface::new(&[0u8; 32], Network::Testnet);
let random_seed_bytes = keys_manager.get_secure_random_bytes();
let payment_params = PaymentParameters::from_node_id(nodes[2], 42);
let logger = crate::util::test_utils::TestLogger::new();

update_channel(&gossip_sync, &secp_ctx, &our_privkey, UnsignedChannelUpdate {
chain_hash: genesis_block(Network::Testnet).header.block_hash(),
short_channel_id: 1,
timestamp: 2,
flags: 0,
cltv_expiry_delta: 0,
htlc_minimum_msat: 0,
htlc_maximum_msat: 100_000,
fee_base_msat: 1_000_000,
fee_proportional_millionths: 0,
excess_data: Vec::new()
});
update_channel(&gossip_sync, &secp_ctx, &privkeys[0], UnsignedChannelUpdate {
chain_hash: genesis_block(Network::Testnet).header.block_hash(),
short_channel_id: 3,
timestamp: 2,
flags: 0,
cltv_expiry_delta: 0,
htlc_minimum_msat: 0,
htlc_maximum_msat: 50_000,
fee_base_msat: 0,
fee_proportional_millionths: 0,
excess_data: Vec::new()
});

// we can make four test for different condition or all condition in diffrent tests.
let is_first_hop = true;
let contributes_sufficient_value = false ; // for contributes_suffiecient value , understand where this value came from. what is contribute_sufficent value.

let exceeds_max_path_length = false;
let exceeds_cltv_delta_limit = false;
let payment_failed_on_this_channel = false;

// For this test to run I want short_channel_id , dest_node_id .
let route = get_route(&our_id, &payment_params, &network_graph.read_only(), None, 49_000, 42, &logger, &scorer, &random_seed_bytes).unwrap();

// Retrieve the log message from TestLogger
let lines = logger.lines.lock().unwrap();
let mut log_output = String::new();
for ((module, file), line) in &*lines {

@TheBlueMattTheBlueMattMar 20, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You don't have to iterate over the lines here, you can just do logger.assert_log_contains("routing:;router", "First Hop 3 is excluded due to insufficient value", 1);

log_output.push_str(&format!("{} [{}] {}: {}\n", line, module, line, file));
}
// Check for expected messages in the log output
assert!(log_output.contains("First Hop 3 is excluded due to insufficient value")); //
// assert_log_contains(log_ouptuts , 1);
}



#[test]
fn simple_mpp_route_test() {
let (secp_ctx, network_graph, gossip_sync, _, logger) = build_graph();
Expand Down
, '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
Closed
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
9073b8d
first commit
Sharmalm Feb 4, 2023
02dddb4
second commit
Sharmalm Feb 4, 2023
0312c2b
original
Sharmalm Feb 5, 2023
3cdb8ed
first logging
Sharmalm Feb 5, 2023
b6ac4ec
Merge remote-tracking branch 'origin/main'
Sharmalm Feb 5, 2023
cfe611a
fifth commit
Sharmalm Feb 5, 2023
5bd7708
third commit
Sharmalm Feb 5, 2023
87eef3f
fourth commit
Sharmalm Feb 9, 2023
bb6c7f6
Merge branch 'lightningdevkit:main' into main
Sharmalm Feb 9, 2023
aef2aa6
Merge branch 'lightningdevkit:main' into main
Sharmalm Feb 11, 2023
4a2c289
sixth commit
Sharmalm Feb 11, 2023
a8781ca
seventh commit
Sharmalm Feb 11, 2023
0e5e8a6
eight commit
Sharmalm Feb 14, 2023
3240053
Merge branch 'lightningdevkit:main' into main
Sharmalm Feb 14, 2023
b913098
Merge branch 'lightningdevkit:main' into main
Sharmalm Feb 15, 2023
8d2a85d
ninth
Sharmalm Feb 15, 2023
fe93ed8
Merge branch 'lightningdevkit:main' into main
Sharmalm Feb 20, 2023
6da0e06
access hashmap
Sharmalm Feb 20, 2023
78dbb77
Merge remote-tracking branch 'origin/main'
Sharmalm Feb 20, 2023
0be98f5
Merge branch 'lightningdevkit:main' into main
Sharmalm Feb 24, 2023
c830123
Merge branch 'lightningdevkit:main' into main
Sharmalm Mar 1, 2023
9bc34a1
improving hashmap conditions
Sharmalm Mar 1, 2023
1969bb7
Merge remote-tracking branch 'refs/remotes/origin/main'
Sharmalm Mar 1, 2023
7febd5b
Merge branch 'lightningdevkit:main' into main
Sharmalm Mar 4, 2023
4364e18
correction
Sharmalm Mar 4, 2023
34d21dc
Merge branch 'lightningdevkit:main' into main
Sharmalm Mar 16, 2023
592f615
test function
Sharmalm Mar 16, 2023
c633d31
Merge remote-tracking branch 'refs/remotes/origin/main'
Sharmalm Mar 16, 2023
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
80 changes: 79 additions & 1 deletion lightning/src/routing/router.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -1296,6 +1296,25 @@ where L::Target: Logger {
// around again with a higher amount.
if !contributes_sufficient_value || exceeds_max_path_length ||
exceeds_cltv_delta_limit || payment_failed_on_this_channel {

let mut is_first_hop = true;
for (key , _channel) in &first_hop_targets {

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You don't need to loop here, you can just do first_hop_targets.get(&$dest_node_id) with an if let Some... or match. That should also let you drop the is_first_hop variable.

if key == &$dest_node_id {
if is_first_hop && !contributes_sufficient_value {
log_trace!(logger, "First Hop {} is excluded due to insufficient value", short_channel_id);

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can drop the blank lines here, and note that some lines have whitespace at the end, which would be nice to remove. Finally, note that some lines are indented by spaces followed by tabs, which should be replaced by all tabs. All of these issues will be highlighted by doing git show or git diff-tree -U3 locally, depending on your terminal config.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks

} if is_first_hop && exceeds_max_path_length {
log_trace!(logger, "First Hop {} is excluded due to candidate hop excluded max path length", short_channel_id);

} if is_first_hop && exceeds_cltv_delta_limit {
log_trace!(logger, "First Hop {} is excluded beacause it exceed the maximum total cltv expiry limit" , short_channel_id);

} if is_first_hop && payment_failed_on_this_channel {
log_trace!(logger, "First Hop {} is excluded beacause it was failed previously" , short_channel_id);
}
is_first_hop = false;
} // commit

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does // commit mean?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, it means nothing. I write // commit in the line where I update the code.

}
// Path isn't useful, ignore it and move on.
} else if may_overpay_to_meet_path_minimum_msat {
hit_minimum_limit = true;
Expand DownExpand Up@@ -3813,7 +3832,66 @@ mod tests {
assert_eq!(total_amount_paid_msat, 50_000);
}
}


#[test]
fn test_my_logging_function() { // commit
let (secp_ctx, network_graph, gossip_sync, _, logger) = build_graph();
let (our_privkey, our_id, privkeys, nodes) = get_nodes(&secp_ctx);
let scorer = ln_test_utils::TestScorer::with_penalty(0);
let keys_manager = ln_test_utils::TestKeysInterface::new(&[0u8; 32], Network::Testnet);
let random_seed_bytes = keys_manager.get_secure_random_bytes();
let payment_params = PaymentParameters::from_node_id(nodes[2], 42);
let logger = crate::util::test_utils::TestLogger::new();

update_channel(&gossip_sync, &secp_ctx, &our_privkey, UnsignedChannelUpdate {
chain_hash: genesis_block(Network::Testnet).header.block_hash(),
short_channel_id: 1,
timestamp: 2,
flags: 0,
cltv_expiry_delta: 0,
htlc_minimum_msat: 0,
htlc_maximum_msat: 100_000,
fee_base_msat: 1_000_000,
fee_proportional_millionths: 0,
excess_data: Vec::new()
});
update_channel(&gossip_sync, &secp_ctx, &privkeys[0], UnsignedChannelUpdate {
chain_hash: genesis_block(Network::Testnet).header.block_hash(),
short_channel_id: 3,
timestamp: 2,
flags: 0,
cltv_expiry_delta: 0,
htlc_minimum_msat: 0,
htlc_maximum_msat: 50_000,
fee_base_msat: 0,
fee_proportional_millionths: 0,
excess_data: Vec::new()
});

// we can make four test for different condition or all condition in diffrent tests.
let is_first_hop = true;
let contributes_sufficient_value = false ; // for contributes_suffiecient value , understand where this value came from. what is contribute_sufficent value.

let exceeds_max_path_length = false;
let exceeds_cltv_delta_limit = false;
let payment_failed_on_this_channel = false;

// For this test to run I want short_channel_id , dest_node_id .
let route = get_route(&our_id, &payment_params, &network_graph.read_only(), None, 49_000, 42, &logger, &scorer, &random_seed_bytes).unwrap();

// Retrieve the log message from TestLogger
let lines = logger.lines.lock().unwrap();
let mut log_output = String::new();
for ((module, file), line) in &*lines {

@TheBlueMattTheBlueMattMar 20, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You don't have to iterate over the lines here, you can just do logger.assert_log_contains("routing:;router", "First Hop 3 is excluded due to insufficient value", 1);

log_output.push_str(&format!("{} [{}] {}: {}\n", line, module, line, file));
}
// Check for expected messages in the log output
assert!(log_output.contains("First Hop 3 is excluded due to insufficient value")); //
// assert_log_contains(log_ouptuts , 1);
}



#[test]
fn simple_mpp_route_test() {
let (secp_ctx, network_graph, gossip_sync, _, logger) = build_graph();
Expand Down
, '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
Closed
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
9073b8d
first commit
Sharmalm Feb 4, 2023
02dddb4
second commit
Sharmalm Feb 4, 2023
0312c2b
original
Sharmalm Feb 5, 2023
3cdb8ed
first logging
Sharmalm Feb 5, 2023
b6ac4ec
Merge remote-tracking branch 'origin/main'
Sharmalm Feb 5, 2023
cfe611a
fifth commit
Sharmalm Feb 5, 2023
5bd7708
third commit
Sharmalm Feb 5, 2023
87eef3f
fourth commit
Sharmalm Feb 9, 2023
bb6c7f6
Merge branch 'lightningdevkit:main' into main
Sharmalm Feb 9, 2023
aef2aa6
Merge branch 'lightningdevkit:main' into main
Sharmalm Feb 11, 2023
4a2c289
sixth commit
Sharmalm Feb 11, 2023
a8781ca
seventh commit
Sharmalm Feb 11, 2023
0e5e8a6
eight commit
Sharmalm Feb 14, 2023
3240053
Merge branch 'lightningdevkit:main' into main
Sharmalm Feb 14, 2023
b913098
Merge branch 'lightningdevkit:main' into main
Sharmalm Feb 15, 2023
8d2a85d
ninth
Sharmalm Feb 15, 2023
fe93ed8
Merge branch 'lightningdevkit:main' into main
Sharmalm Feb 20, 2023
6da0e06
access hashmap
Sharmalm Feb 20, 2023
78dbb77
Merge remote-tracking branch 'origin/main'
Sharmalm Feb 20, 2023
0be98f5
Merge branch 'lightningdevkit:main' into main
Sharmalm Feb 24, 2023
c830123
Merge branch 'lightningdevkit:main' into main
Sharmalm Mar 1, 2023
9bc34a1
improving hashmap conditions
Sharmalm Mar 1, 2023
1969bb7
Merge remote-tracking branch 'refs/remotes/origin/main'
Sharmalm Mar 1, 2023
7febd5b
Merge branch 'lightningdevkit:main' into main
Sharmalm Mar 4, 2023
4364e18
correction
Sharmalm Mar 4, 2023
34d21dc
Merge branch 'lightningdevkit:main' into main
Sharmalm Mar 16, 2023
592f615
test function
Sharmalm Mar 16, 2023
c633d31
Merge remote-tracking branch 'refs/remotes/origin/main'
Sharmalm Mar 16, 2023
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
80 changes: 79 additions & 1 deletion lightning/src/routing/router.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -1296,6 +1296,25 @@ where L::Target: Logger {
// around again with a higher amount.
if !contributes_sufficient_value || exceeds_max_path_length ||
exceeds_cltv_delta_limit || payment_failed_on_this_channel {

let mut is_first_hop = true;
for (key , _channel) in &first_hop_targets {

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You don't need to loop here, you can just do first_hop_targets.get(&$dest_node_id) with an if let Some... or match. That should also let you drop the is_first_hop variable.

if key == &$dest_node_id {
if is_first_hop && !contributes_sufficient_value {
log_trace!(logger, "First Hop {} is excluded due to insufficient value", short_channel_id);

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can drop the blank lines here, and note that some lines have whitespace at the end, which would be nice to remove. Finally, note that some lines are indented by spaces followed by tabs, which should be replaced by all tabs. All of these issues will be highlighted by doing git show or git diff-tree -U3 locally, depending on your terminal config.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks

} if is_first_hop && exceeds_max_path_length {
log_trace!(logger, "First Hop {} is excluded due to candidate hop excluded max path length", short_channel_id);

} if is_first_hop && exceeds_cltv_delta_limit {
log_trace!(logger, "First Hop {} is excluded beacause it exceed the maximum total cltv expiry limit" , short_channel_id);

} if is_first_hop && payment_failed_on_this_channel {
log_trace!(logger, "First Hop {} is excluded beacause it was failed previously" , short_channel_id);
}
is_first_hop = false;
} // commit

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does // commit mean?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, it means nothing. I write // commit in the line where I update the code.

}
// Path isn't useful, ignore it and move on.
} else if may_overpay_to_meet_path_minimum_msat {
hit_minimum_limit = true;
Expand DownExpand Up@@ -3813,7 +3832,66 @@ mod tests {
assert_eq!(total_amount_paid_msat, 50_000);
}
}


#[test]
fn test_my_logging_function() { // commit
let (secp_ctx, network_graph, gossip_sync, _, logger) = build_graph();
let (our_privkey, our_id, privkeys, nodes) = get_nodes(&secp_ctx);
let scorer = ln_test_utils::TestScorer::with_penalty(0);
let keys_manager = ln_test_utils::TestKeysInterface::new(&[0u8; 32], Network::Testnet);
let random_seed_bytes = keys_manager.get_secure_random_bytes();
let payment_params = PaymentParameters::from_node_id(nodes[2], 42);
let logger = crate::util::test_utils::TestLogger::new();

update_channel(&gossip_sync, &secp_ctx, &our_privkey, UnsignedChannelUpdate {
chain_hash: genesis_block(Network::Testnet).header.block_hash(),
short_channel_id: 1,
timestamp: 2,
flags: 0,
cltv_expiry_delta: 0,
htlc_minimum_msat: 0,
htlc_maximum_msat: 100_000,
fee_base_msat: 1_000_000,
fee_proportional_millionths: 0,
excess_data: Vec::new()
});
update_channel(&gossip_sync, &secp_ctx, &privkeys[0], UnsignedChannelUpdate {
chain_hash: genesis_block(Network::Testnet).header.block_hash(),
short_channel_id: 3,
timestamp: 2,
flags: 0,
cltv_expiry_delta: 0,
htlc_minimum_msat: 0,
htlc_maximum_msat: 50_000,
fee_base_msat: 0,
fee_proportional_millionths: 0,
excess_data: Vec::new()
});

// we can make four test for different condition or all condition in diffrent tests.
let is_first_hop = true;
let contributes_sufficient_value = false ; // for contributes_suffiecient value , understand where this value came from. what is contribute_sufficent value.

let exceeds_max_path_length = false;
let exceeds_cltv_delta_limit = false;
let payment_failed_on_this_channel = false;

// For this test to run I want short_channel_id , dest_node_id .
let route = get_route(&our_id, &payment_params, &network_graph.read_only(), None, 49_000, 42, &logger, &scorer, &random_seed_bytes).unwrap();

// Retrieve the log message from TestLogger
let lines = logger.lines.lock().unwrap();
let mut log_output = String::new();
for ((module, file), line) in &*lines {

@TheBlueMattTheBlueMattMar 20, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You don't have to iterate over the lines here, you can just do logger.assert_log_contains("routing:;router", "First Hop 3 is excluded due to insufficient value", 1);

log_output.push_str(&format!("{} [{}] {}: {}\n", line, module, line, file));
}
// Check for expected messages in the log output
assert!(log_output.contains("First Hop 3 is excluded due to insufficient value")); //
// assert_log_contains(log_ouptuts , 1);
}



#[test]
fn simple_mpp_route_test() {
let (secp_ctx, network_graph, gossip_sync, _, logger) = build_graph();
Expand Down
, '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
Closed
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
9073b8d
first commit
Sharmalm Feb 4, 2023
02dddb4
second commit
Sharmalm Feb 4, 2023
0312c2b
original
Sharmalm Feb 5, 2023
3cdb8ed
first logging
Sharmalm Feb 5, 2023
b6ac4ec
Merge remote-tracking branch 'origin/main'
Sharmalm Feb 5, 2023
cfe611a
fifth commit
Sharmalm Feb 5, 2023
5bd7708
third commit
Sharmalm Feb 5, 2023
87eef3f
fourth commit
Sharmalm Feb 9, 2023
bb6c7f6
Merge branch 'lightningdevkit:main' into main
Sharmalm Feb 9, 2023
aef2aa6
Merge branch 'lightningdevkit:main' into main
Sharmalm Feb 11, 2023
4a2c289
sixth commit
Sharmalm Feb 11, 2023
a8781ca
seventh commit
Sharmalm Feb 11, 2023
0e5e8a6
eight commit
Sharmalm Feb 14, 2023
3240053
Merge branch 'lightningdevkit:main' into main
Sharmalm Feb 14, 2023
b913098
Merge branch 'lightningdevkit:main' into main
Sharmalm Feb 15, 2023
8d2a85d
ninth
Sharmalm Feb 15, 2023
fe93ed8
Merge branch 'lightningdevkit:main' into main
Sharmalm Feb 20, 2023
6da0e06
access hashmap
Sharmalm Feb 20, 2023
78dbb77
Merge remote-tracking branch 'origin/main'
Sharmalm Feb 20, 2023
0be98f5
Merge branch 'lightningdevkit:main' into main
Sharmalm Feb 24, 2023
c830123
Merge branch 'lightningdevkit:main' into main
Sharmalm Mar 1, 2023
9bc34a1
improving hashmap conditions
Sharmalm Mar 1, 2023
1969bb7
Merge remote-tracking branch 'refs/remotes/origin/main'
Sharmalm Mar 1, 2023
7febd5b
Merge branch 'lightningdevkit:main' into main
Sharmalm Mar 4, 2023
4364e18
correction
Sharmalm Mar 4, 2023
34d21dc
Merge branch 'lightningdevkit:main' into main
Sharmalm Mar 16, 2023
592f615
test function
Sharmalm Mar 16, 2023
c633d31
Merge remote-tracking branch 'refs/remotes/origin/main'
Sharmalm Mar 16, 2023
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
80 changes: 79 additions & 1 deletion lightning/src/routing/router.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -1296,6 +1296,25 @@ where L::Target: Logger {
// around again with a higher amount.
if !contributes_sufficient_value || exceeds_max_path_length ||
exceeds_cltv_delta_limit || payment_failed_on_this_channel {

let mut is_first_hop = true;
for (key , _channel) in &first_hop_targets {

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You don't need to loop here, you can just do first_hop_targets.get(&$dest_node_id) with an if let Some... or match. That should also let you drop the is_first_hop variable.

if key == &$dest_node_id {
if is_first_hop && !contributes_sufficient_value {
log_trace!(logger, "First Hop {} is excluded due to insufficient value", short_channel_id);

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can drop the blank lines here, and note that some lines have whitespace at the end, which would be nice to remove. Finally, note that some lines are indented by spaces followed by tabs, which should be replaced by all tabs. All of these issues will be highlighted by doing git show or git diff-tree -U3 locally, depending on your terminal config.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks

} if is_first_hop && exceeds_max_path_length {
log_trace!(logger, "First Hop {} is excluded due to candidate hop excluded max path length", short_channel_id);

} if is_first_hop && exceeds_cltv_delta_limit {
log_trace!(logger, "First Hop {} is excluded beacause it exceed the maximum total cltv expiry limit" , short_channel_id);

} if is_first_hop && payment_failed_on_this_channel {
log_trace!(logger, "First Hop {} is excluded beacause it was failed previously" , short_channel_id);
}
is_first_hop = false;
} // commit

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does // commit mean?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, it means nothing. I write // commit in the line where I update the code.

}
// Path isn't useful, ignore it and move on.
} else if may_overpay_to_meet_path_minimum_msat {
hit_minimum_limit = true;
Expand DownExpand Up@@ -3813,7 +3832,66 @@ mod tests {
assert_eq!(total_amount_paid_msat, 50_000);
}
}


#[test]
fn test_my_logging_function() { // commit
let (secp_ctx, network_graph, gossip_sync, _, logger) = build_graph();
let (our_privkey, our_id, privkeys, nodes) = get_nodes(&secp_ctx);
let scorer = ln_test_utils::TestScorer::with_penalty(0);
let keys_manager = ln_test_utils::TestKeysInterface::new(&[0u8; 32], Network::Testnet);
let random_seed_bytes = keys_manager.get_secure_random_bytes();
let payment_params = PaymentParameters::from_node_id(nodes[2], 42);
let logger = crate::util::test_utils::TestLogger::new();

update_channel(&gossip_sync, &secp_ctx, &our_privkey, UnsignedChannelUpdate {
chain_hash: genesis_block(Network::Testnet).header.block_hash(),
short_channel_id: 1,
timestamp: 2,
flags: 0,
cltv_expiry_delta: 0,
htlc_minimum_msat: 0,
htlc_maximum_msat: 100_000,
fee_base_msat: 1_000_000,
fee_proportional_millionths: 0,
excess_data: Vec::new()
});
update_channel(&gossip_sync, &secp_ctx, &privkeys[0], UnsignedChannelUpdate {
chain_hash: genesis_block(Network::Testnet).header.block_hash(),
short_channel_id: 3,
timestamp: 2,
flags: 0,
cltv_expiry_delta: 0,
htlc_minimum_msat: 0,
htlc_maximum_msat: 50_000,
fee_base_msat: 0,
fee_proportional_millionths: 0,
excess_data: Vec::new()
});

// we can make four test for different condition or all condition in diffrent tests.
let is_first_hop = true;
let contributes_sufficient_value = false ; // for contributes_suffiecient value , understand where this value came from. what is contribute_sufficent value.

let exceeds_max_path_length = false;
let exceeds_cltv_delta_limit = false;
let payment_failed_on_this_channel = false;

// For this test to run I want short_channel_id , dest_node_id .
let route = get_route(&our_id, &payment_params, &network_graph.read_only(), None, 49_000, 42, &logger, &scorer, &random_seed_bytes).unwrap();

// Retrieve the log message from TestLogger
let lines = logger.lines.lock().unwrap();
let mut log_output = String::new();
for ((module, file), line) in &*lines {

@TheBlueMattTheBlueMattMar 20, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You don't have to iterate over the lines here, you can just do logger.assert_log_contains("routing:;router", "First Hop 3 is excluded due to insufficient value", 1);

log_output.push_str(&format!("{} [{}] {}: {}\n", line, module, line, file));
}
// Check for expected messages in the log output
assert!(log_output.contains("First Hop 3 is excluded due to insufficient value")); //
// assert_log_contains(log_ouptuts , 1);
}



#[test]
fn simple_mpp_route_test() {
let (secp_ctx, network_graph, gossip_sync, _, logger) = build_graph();
Expand Down
, '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
Closed
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
9073b8d
first commit
Sharmalm Feb 4, 2023
02dddb4
second commit
Sharmalm Feb 4, 2023
0312c2b
original
Sharmalm Feb 5, 2023
3cdb8ed
first logging
Sharmalm Feb 5, 2023
b6ac4ec
Merge remote-tracking branch 'origin/main'
Sharmalm Feb 5, 2023
cfe611a
fifth commit
Sharmalm Feb 5, 2023
5bd7708
third commit
Sharmalm Feb 5, 2023
87eef3f
fourth commit
Sharmalm Feb 9, 2023
bb6c7f6
Merge branch 'lightningdevkit:main' into main
Sharmalm Feb 9, 2023
aef2aa6
Merge branch 'lightningdevkit:main' into main
Sharmalm Feb 11, 2023
4a2c289
sixth commit
Sharmalm Feb 11, 2023
a8781ca
seventh commit
Sharmalm Feb 11, 2023
0e5e8a6
eight commit
Sharmalm Feb 14, 2023
3240053
Merge branch 'lightningdevkit:main' into main
Sharmalm Feb 14, 2023
b913098
Merge branch 'lightningdevkit:main' into main
Sharmalm Feb 15, 2023
8d2a85d
ninth
Sharmalm Feb 15, 2023
fe93ed8
Merge branch 'lightningdevkit:main' into main
Sharmalm Feb 20, 2023
6da0e06
access hashmap
Sharmalm Feb 20, 2023
78dbb77
Merge remote-tracking branch 'origin/main'
Sharmalm Feb 20, 2023
0be98f5
Merge branch 'lightningdevkit:main' into main
Sharmalm Feb 24, 2023
c830123
Merge branch 'lightningdevkit:main' into main
Sharmalm Mar 1, 2023
9bc34a1
improving hashmap conditions
Sharmalm Mar 1, 2023
1969bb7
Merge remote-tracking branch 'refs/remotes/origin/main'
Sharmalm Mar 1, 2023
7febd5b
Merge branch 'lightningdevkit:main' into main
Sharmalm Mar 4, 2023
4364e18
correction
Sharmalm Mar 4, 2023
34d21dc
Merge branch 'lightningdevkit:main' into main
Sharmalm Mar 16, 2023
592f615
test function
Sharmalm Mar 16, 2023
c633d31
Merge remote-tracking branch 'refs/remotes/origin/main'
Sharmalm Mar 16, 2023
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
80 changes: 79 additions & 1 deletion lightning/src/routing/router.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -1296,6 +1296,25 @@ where L::Target: Logger {
// around again with a higher amount.
if !contributes_sufficient_value || exceeds_max_path_length ||
exceeds_cltv_delta_limit || payment_failed_on_this_channel {

let mut is_first_hop = true;
for (key , _channel) in &first_hop_targets {

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You don't need to loop here, you can just do first_hop_targets.get(&$dest_node_id) with an if let Some... or match. That should also let you drop the is_first_hop variable.

if key == &$dest_node_id {
if is_first_hop && !contributes_sufficient_value {
log_trace!(logger, "First Hop {} is excluded due to insufficient value", short_channel_id);

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can drop the blank lines here, and note that some lines have whitespace at the end, which would be nice to remove. Finally, note that some lines are indented by spaces followed by tabs, which should be replaced by all tabs. All of these issues will be highlighted by doing git show or git diff-tree -U3 locally, depending on your terminal config.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks

} if is_first_hop && exceeds_max_path_length {
log_trace!(logger, "First Hop {} is excluded due to candidate hop excluded max path length", short_channel_id);

} if is_first_hop && exceeds_cltv_delta_limit {
log_trace!(logger, "First Hop {} is excluded beacause it exceed the maximum total cltv expiry limit" , short_channel_id);

} if is_first_hop && payment_failed_on_this_channel {
log_trace!(logger, "First Hop {} is excluded beacause it was failed previously" , short_channel_id);
}
is_first_hop = false;
} // commit

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does // commit mean?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, it means nothing. I write // commit in the line where I update the code.

}
// Path isn't useful, ignore it and move on.
} else if may_overpay_to_meet_path_minimum_msat {
hit_minimum_limit = true;
Expand DownExpand Up@@ -3813,7 +3832,66 @@ mod tests {
assert_eq!(total_amount_paid_msat, 50_000);
}
}


#[test]
fn test_my_logging_function() { // commit
let (secp_ctx, network_graph, gossip_sync, _, logger) = build_graph();
let (our_privkey, our_id, privkeys, nodes) = get_nodes(&secp_ctx);
let scorer = ln_test_utils::TestScorer::with_penalty(0);
let keys_manager = ln_test_utils::TestKeysInterface::new(&[0u8; 32], Network::Testnet);
let random_seed_bytes = keys_manager.get_secure_random_bytes();
let payment_params = PaymentParameters::from_node_id(nodes[2], 42);
let logger = crate::util::test_utils::TestLogger::new();

update_channel(&gossip_sync, &secp_ctx, &our_privkey, UnsignedChannelUpdate {
chain_hash: genesis_block(Network::Testnet).header.block_hash(),
short_channel_id: 1,
timestamp: 2,
flags: 0,
cltv_expiry_delta: 0,
htlc_minimum_msat: 0,
htlc_maximum_msat: 100_000,
fee_base_msat: 1_000_000,
fee_proportional_millionths: 0,
excess_data: Vec::new()
});
update_channel(&gossip_sync, &secp_ctx, &privkeys[0], UnsignedChannelUpdate {
chain_hash: genesis_block(Network::Testnet).header.block_hash(),
short_channel_id: 3,
timestamp: 2,
flags: 0,
cltv_expiry_delta: 0,
htlc_minimum_msat: 0,
htlc_maximum_msat: 50_000,
fee_base_msat: 0,
fee_proportional_millionths: 0,
excess_data: Vec::new()
});

// we can make four test for different condition or all condition in diffrent tests.
let is_first_hop = true;
let contributes_sufficient_value = false ; // for contributes_suffiecient value , understand where this value came from. what is contribute_sufficent value.

let exceeds_max_path_length = false;
let exceeds_cltv_delta_limit = false;
let payment_failed_on_this_channel = false;

// For this test to run I want short_channel_id , dest_node_id .
let route = get_route(&our_id, &payment_params, &network_graph.read_only(), None, 49_000, 42, &logger, &scorer, &random_seed_bytes).unwrap();

// Retrieve the log message from TestLogger
let lines = logger.lines.lock().unwrap();
let mut log_output = String::new();
for ((module, file), line) in &*lines {

@TheBlueMattTheBlueMattMar 20, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You don't have to iterate over the lines here, you can just do logger.assert_log_contains("routing:;router", "First Hop 3 is excluded due to insufficient value", 1);

log_output.push_str(&format!("{} [{}] {}: {}\n", line, module, line, file));
}
// Check for expected messages in the log output
assert!(log_output.contains("First Hop 3 is excluded due to insufficient value")); //
// assert_log_contains(log_ouptuts , 1);
}



#[test]
fn simple_mpp_route_test() {
let (secp_ctx, network_graph, gossip_sync, _, logger) = build_graph();
Expand Down
, '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
Closed
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
9073b8d
first commit
Sharmalm Feb 4, 2023
02dddb4
second commit
Sharmalm Feb 4, 2023
0312c2b
original
Sharmalm Feb 5, 2023
3cdb8ed
first logging
Sharmalm Feb 5, 2023
b6ac4ec
Merge remote-tracking branch 'origin/main'
Sharmalm Feb 5, 2023
cfe611a
fifth commit
Sharmalm Feb 5, 2023
5bd7708
third commit
Sharmalm Feb 5, 2023
87eef3f
fourth commit
Sharmalm Feb 9, 2023
bb6c7f6
Merge branch 'lightningdevkit:main' into main
Sharmalm Feb 9, 2023
aef2aa6
Merge branch 'lightningdevkit:main' into main
Sharmalm Feb 11, 2023
4a2c289
sixth commit
Sharmalm Feb 11, 2023
a8781ca
seventh commit
Sharmalm Feb 11, 2023
0e5e8a6
eight commit
Sharmalm Feb 14, 2023
3240053
Merge branch 'lightningdevkit:main' into main
Sharmalm Feb 14, 2023
b913098
Merge branch 'lightningdevkit:main' into main
Sharmalm Feb 15, 2023
8d2a85d
ninth
Sharmalm Feb 15, 2023
fe93ed8
Merge branch 'lightningdevkit:main' into main
Sharmalm Feb 20, 2023
6da0e06
access hashmap
Sharmalm Feb 20, 2023
78dbb77
Merge remote-tracking branch 'origin/main'
Sharmalm Feb 20, 2023
0be98f5
Merge branch 'lightningdevkit:main' into main
Sharmalm Feb 24, 2023
c830123
Merge branch 'lightningdevkit:main' into main
Sharmalm Mar 1, 2023
9bc34a1
improving hashmap conditions
Sharmalm Mar 1, 2023
1969bb7
Merge remote-tracking branch 'refs/remotes/origin/main'
Sharmalm Mar 1, 2023
7febd5b
Merge branch 'lightningdevkit:main' into main
Sharmalm Mar 4, 2023
4364e18
correction
Sharmalm Mar 4, 2023
34d21dc
Merge branch 'lightningdevkit:main' into main
Sharmalm Mar 16, 2023
592f615
test function
Sharmalm Mar 16, 2023
c633d31
Merge remote-tracking branch 'refs/remotes/origin/main'
Sharmalm Mar 16, 2023
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
80 changes: 79 additions & 1 deletion lightning/src/routing/router.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -1296,6 +1296,25 @@ where L::Target: Logger {
// around again with a higher amount.
if !contributes_sufficient_value || exceeds_max_path_length ||
exceeds_cltv_delta_limit || payment_failed_on_this_channel {

let mut is_first_hop = true;
for (key , _channel) in &first_hop_targets {

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You don't need to loop here, you can just do first_hop_targets.get(&$dest_node_id) with an if let Some... or match. That should also let you drop the is_first_hop variable.

if key == &$dest_node_id {
if is_first_hop && !contributes_sufficient_value {
log_trace!(logger, "First Hop {} is excluded due to insufficient value", short_channel_id);

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can drop the blank lines here, and note that some lines have whitespace at the end, which would be nice to remove. Finally, note that some lines are indented by spaces followed by tabs, which should be replaced by all tabs. All of these issues will be highlighted by doing git show or git diff-tree -U3 locally, depending on your terminal config.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks

} if is_first_hop && exceeds_max_path_length {
log_trace!(logger, "First Hop {} is excluded due to candidate hop excluded max path length", short_channel_id);

} if is_first_hop && exceeds_cltv_delta_limit {
log_trace!(logger, "First Hop {} is excluded beacause it exceed the maximum total cltv expiry limit" , short_channel_id);

} if is_first_hop && payment_failed_on_this_channel {
log_trace!(logger, "First Hop {} is excluded beacause it was failed previously" , short_channel_id);
}
is_first_hop = false;
} // commit

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does // commit mean?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, it means nothing. I write // commit in the line where I update the code.

}
// Path isn't useful, ignore it and move on.
} else if may_overpay_to_meet_path_minimum_msat {
hit_minimum_limit = true;
Expand DownExpand Up@@ -3813,7 +3832,66 @@ mod tests {
assert_eq!(total_amount_paid_msat, 50_000);
}
}


#[test]
fn test_my_logging_function() { // commit
let (secp_ctx, network_graph, gossip_sync, _, logger) = build_graph();
let (our_privkey, our_id, privkeys, nodes) = get_nodes(&secp_ctx);
let scorer = ln_test_utils::TestScorer::with_penalty(0);
let keys_manager = ln_test_utils::TestKeysInterface::new(&[0u8; 32], Network::Testnet);
let random_seed_bytes = keys_manager.get_secure_random_bytes();
let payment_params = PaymentParameters::from_node_id(nodes[2], 42);
let logger = crate::util::test_utils::TestLogger::new();

update_channel(&gossip_sync, &secp_ctx, &our_privkey, UnsignedChannelUpdate {
chain_hash: genesis_block(Network::Testnet).header.block_hash(),
short_channel_id: 1,
timestamp: 2,
flags: 0,
cltv_expiry_delta: 0,
htlc_minimum_msat: 0,
htlc_maximum_msat: 100_000,
fee_base_msat: 1_000_000,
fee_proportional_millionths: 0,
excess_data: Vec::new()
});
update_channel(&gossip_sync, &secp_ctx, &privkeys[0], UnsignedChannelUpdate {
chain_hash: genesis_block(Network::Testnet).header.block_hash(),
short_channel_id: 3,
timestamp: 2,
flags: 0,
cltv_expiry_delta: 0,
htlc_minimum_msat: 0,
htlc_maximum_msat: 50_000,
fee_base_msat: 0,
fee_proportional_millionths: 0,
excess_data: Vec::new()
});

// we can make four test for different condition or all condition in diffrent tests.
let is_first_hop = true;
let contributes_sufficient_value = false ; // for contributes_suffiecient value , understand where this value came from. what is contribute_sufficent value.

let exceeds_max_path_length = false;
let exceeds_cltv_delta_limit = false;
let payment_failed_on_this_channel = false;

// For this test to run I want short_channel_id , dest_node_id .
let route = get_route(&our_id, &payment_params, &network_graph.read_only(), None, 49_000, 42, &logger, &scorer, &random_seed_bytes).unwrap();

// Retrieve the log message from TestLogger
let lines = logger.lines.lock().unwrap();
let mut log_output = String::new();
for ((module, file), line) in &*lines {

@TheBlueMattTheBlueMattMar 20, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You don't have to iterate over the lines here, you can just do logger.assert_log_contains("routing:;router", "First Hop 3 is excluded due to insufficient value", 1);

log_output.push_str(&format!("{} [{}] {}: {}\n", line, module, line, file));
}
// Check for expected messages in the log output
assert!(log_output.contains("First Hop 3 is excluded due to insufficient value")); //
// assert_log_contains(log_ouptuts , 1);
}



#[test]
fn simple_mpp_route_test() {
let (secp_ctx, network_graph, gossip_sync, _, logger) = build_graph();
Expand Down
, '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
Closed
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
9073b8d
first commit
Sharmalm Feb 4, 2023
02dddb4
second commit
Sharmalm Feb 4, 2023
0312c2b
original
Sharmalm Feb 5, 2023
3cdb8ed
first logging
Sharmalm Feb 5, 2023
b6ac4ec
Merge remote-tracking branch 'origin/main'
Sharmalm Feb 5, 2023
cfe611a
fifth commit
Sharmalm Feb 5, 2023
5bd7708
third commit
Sharmalm Feb 5, 2023
87eef3f
fourth commit
Sharmalm Feb 9, 2023
bb6c7f6
Merge branch 'lightningdevkit:main' into main
Sharmalm Feb 9, 2023
aef2aa6
Merge branch 'lightningdevkit:main' into main
Sharmalm Feb 11, 2023
4a2c289
sixth commit
Sharmalm Feb 11, 2023
a8781ca
seventh commit
Sharmalm Feb 11, 2023
0e5e8a6
eight commit
Sharmalm Feb 14, 2023
3240053
Merge branch 'lightningdevkit:main' into main
Sharmalm Feb 14, 2023
b913098
Merge branch 'lightningdevkit:main' into main
Sharmalm Feb 15, 2023
8d2a85d
ninth
Sharmalm Feb 15, 2023
fe93ed8
Merge branch 'lightningdevkit:main' into main
Sharmalm Feb 20, 2023
6da0e06
access hashmap
Sharmalm Feb 20, 2023
78dbb77
Merge remote-tracking branch 'origin/main'
Sharmalm Feb 20, 2023
0be98f5
Merge branch 'lightningdevkit:main' into main
Sharmalm Feb 24, 2023
c830123
Merge branch 'lightningdevkit:main' into main
Sharmalm Mar 1, 2023
9bc34a1
improving hashmap conditions
Sharmalm Mar 1, 2023
1969bb7
Merge remote-tracking branch 'refs/remotes/origin/main'
Sharmalm Mar 1, 2023
7febd5b
Merge branch 'lightningdevkit:main' into main
Sharmalm Mar 4, 2023
4364e18
correction
Sharmalm Mar 4, 2023
34d21dc
Merge branch 'lightningdevkit:main' into main
Sharmalm Mar 16, 2023
592f615
test function
Sharmalm Mar 16, 2023
c633d31
Merge remote-tracking branch 'refs/remotes/origin/main'
Sharmalm Mar 16, 2023
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
80 changes: 79 additions & 1 deletion lightning/src/routing/router.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -1296,6 +1296,25 @@ where L::Target: Logger {
// around again with a higher amount.
if !contributes_sufficient_value || exceeds_max_path_length ||
exceeds_cltv_delta_limit || payment_failed_on_this_channel {

let mut is_first_hop = true;
for (key , _channel) in &first_hop_targets {

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You don't need to loop here, you can just do first_hop_targets.get(&$dest_node_id) with an if let Some... or match. That should also let you drop the is_first_hop variable.

if key == &$dest_node_id {
if is_first_hop && !contributes_sufficient_value {
log_trace!(logger, "First Hop {} is excluded due to insufficient value", short_channel_id);

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can drop the blank lines here, and note that some lines have whitespace at the end, which would be nice to remove. Finally, note that some lines are indented by spaces followed by tabs, which should be replaced by all tabs. All of these issues will be highlighted by doing git show or git diff-tree -U3 locally, depending on your terminal config.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks

} if is_first_hop && exceeds_max_path_length {
log_trace!(logger, "First Hop {} is excluded due to candidate hop excluded max path length", short_channel_id);

} if is_first_hop && exceeds_cltv_delta_limit {
log_trace!(logger, "First Hop {} is excluded beacause it exceed the maximum total cltv expiry limit" , short_channel_id);

} if is_first_hop && payment_failed_on_this_channel {
log_trace!(logger, "First Hop {} is excluded beacause it was failed previously" , short_channel_id);
}
is_first_hop = false;
} // commit

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does // commit mean?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, it means nothing. I write // commit in the line where I update the code.

}
// Path isn't useful, ignore it and move on.
} else if may_overpay_to_meet_path_minimum_msat {
hit_minimum_limit = true;
Expand DownExpand Up@@ -3813,7 +3832,66 @@ mod tests {
assert_eq!(total_amount_paid_msat, 50_000);
}
}


#[test]
fn test_my_logging_function() { // commit
let (secp_ctx, network_graph, gossip_sync, _, logger) = build_graph();
let (our_privkey, our_id, privkeys, nodes) = get_nodes(&secp_ctx);
let scorer = ln_test_utils::TestScorer::with_penalty(0);
let keys_manager = ln_test_utils::TestKeysInterface::new(&[0u8; 32], Network::Testnet);
let random_seed_bytes = keys_manager.get_secure_random_bytes();
let payment_params = PaymentParameters::from_node_id(nodes[2], 42);
let logger = crate::util::test_utils::TestLogger::new();

update_channel(&gossip_sync, &secp_ctx, &our_privkey, UnsignedChannelUpdate {
chain_hash: genesis_block(Network::Testnet).header.block_hash(),
short_channel_id: 1,
timestamp: 2,
flags: 0,
cltv_expiry_delta: 0,
htlc_minimum_msat: 0,
htlc_maximum_msat: 100_000,
fee_base_msat: 1_000_000,
fee_proportional_millionths: 0,
excess_data: Vec::new()
});
update_channel(&gossip_sync, &secp_ctx, &privkeys[0], UnsignedChannelUpdate {
chain_hash: genesis_block(Network::Testnet).header.block_hash(),
short_channel_id: 3,
timestamp: 2,
flags: 0,
cltv_expiry_delta: 0,
htlc_minimum_msat: 0,
htlc_maximum_msat: 50_000,
fee_base_msat: 0,
fee_proportional_millionths: 0,
excess_data: Vec::new()
});

// we can make four test for different condition or all condition in diffrent tests.
let is_first_hop = true;
let contributes_sufficient_value = false ; // for contributes_suffiecient value , understand where this value came from. what is contribute_sufficent value.

let exceeds_max_path_length = false;
let exceeds_cltv_delta_limit = false;
let payment_failed_on_this_channel = false;

// For this test to run I want short_channel_id , dest_node_id .
let route = get_route(&our_id, &payment_params, &network_graph.read_only(), None, 49_000, 42, &logger, &scorer, &random_seed_bytes).unwrap();

// Retrieve the log message from TestLogger
let lines = logger.lines.lock().unwrap();
let mut log_output = String::new();
for ((module, file), line) in &*lines {

@TheBlueMattTheBlueMattMar 20, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You don't have to iterate over the lines here, you can just do logger.assert_log_contains("routing:;router", "First Hop 3 is excluded due to insufficient value", 1);

log_output.push_str(&format!("{} [{}] {}: {}\n", line, module, line, file));
}
// Check for expected messages in the log output
assert!(log_output.contains("First Hop 3 is excluded due to insufficient value")); //
// assert_log_contains(log_ouptuts , 1);
}



#[test]
fn simple_mpp_route_test() {
let (secp_ctx, network_graph, gossip_sync, _, logger) = build_graph();
Expand Down
, '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
Closed
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
9073b8d
first commit
Sharmalm Feb 4, 2023
02dddb4
second commit
Sharmalm Feb 4, 2023
0312c2b
original
Sharmalm Feb 5, 2023
3cdb8ed
first logging
Sharmalm Feb 5, 2023
b6ac4ec
Merge remote-tracking branch 'origin/main'
Sharmalm Feb 5, 2023
cfe611a
fifth commit
Sharmalm Feb 5, 2023
5bd7708
third commit
Sharmalm Feb 5, 2023
87eef3f
fourth commit
Sharmalm Feb 9, 2023
bb6c7f6
Merge branch 'lightningdevkit:main' into main
Sharmalm Feb 9, 2023
aef2aa6
Merge branch 'lightningdevkit:main' into main
Sharmalm Feb 11, 2023
4a2c289
sixth commit
Sharmalm Feb 11, 2023
a8781ca
seventh commit
Sharmalm Feb 11, 2023
0e5e8a6
eight commit
Sharmalm Feb 14, 2023
3240053
Merge branch 'lightningdevkit:main' into main
Sharmalm Feb 14, 2023
b913098
Merge branch 'lightningdevkit:main' into main
Sharmalm Feb 15, 2023
8d2a85d
ninth
Sharmalm Feb 15, 2023
fe93ed8
Merge branch 'lightningdevkit:main' into main
Sharmalm Feb 20, 2023
6da0e06
access hashmap
Sharmalm Feb 20, 2023
78dbb77
Merge remote-tracking branch 'origin/main'
Sharmalm Feb 20, 2023
0be98f5
Merge branch 'lightningdevkit:main' into main
Sharmalm Feb 24, 2023
c830123
Merge branch 'lightningdevkit:main' into main
Sharmalm Mar 1, 2023
9bc34a1
improving hashmap conditions
Sharmalm Mar 1, 2023
1969bb7
Merge remote-tracking branch 'refs/remotes/origin/main'
Sharmalm Mar 1, 2023
7febd5b
Merge branch 'lightningdevkit:main' into main
Sharmalm Mar 4, 2023
4364e18
correction
Sharmalm Mar 4, 2023
34d21dc
Merge branch 'lightningdevkit:main' into main
Sharmalm Mar 16, 2023
592f615
test function
Sharmalm Mar 16, 2023
c633d31
Merge remote-tracking branch 'refs/remotes/origin/main'
Sharmalm Mar 16, 2023
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
80 changes: 79 additions & 1 deletion lightning/src/routing/router.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -1296,6 +1296,25 @@ where L::Target: Logger {
// around again with a higher amount.
if !contributes_sufficient_value || exceeds_max_path_length ||
exceeds_cltv_delta_limit || payment_failed_on_this_channel {

let mut is_first_hop = true;
for (key , _channel) in &first_hop_targets {

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You don't need to loop here, you can just do first_hop_targets.get(&$dest_node_id) with an if let Some... or match. That should also let you drop the is_first_hop variable.

if key == &$dest_node_id {
if is_first_hop && !contributes_sufficient_value {
log_trace!(logger, "First Hop {} is excluded due to insufficient value", short_channel_id);

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can drop the blank lines here, and note that some lines have whitespace at the end, which would be nice to remove. Finally, note that some lines are indented by spaces followed by tabs, which should be replaced by all tabs. All of these issues will be highlighted by doing git show or git diff-tree -U3 locally, depending on your terminal config.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks

} if is_first_hop && exceeds_max_path_length {
log_trace!(logger, "First Hop {} is excluded due to candidate hop excluded max path length", short_channel_id);

} if is_first_hop && exceeds_cltv_delta_limit {
log_trace!(logger, "First Hop {} is excluded beacause it exceed the maximum total cltv expiry limit" , short_channel_id);

} if is_first_hop && payment_failed_on_this_channel {
log_trace!(logger, "First Hop {} is excluded beacause it was failed previously" , short_channel_id);
}
is_first_hop = false;
} // commit

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does // commit mean?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, it means nothing. I write // commit in the line where I update the code.

}
// Path isn't useful, ignore it and move on.
} else if may_overpay_to_meet_path_minimum_msat {
hit_minimum_limit = true;
Expand DownExpand Up@@ -3813,7 +3832,66 @@ mod tests {
assert_eq!(total_amount_paid_msat, 50_000);
}
}


#[test]
fn test_my_logging_function() { // commit
let (secp_ctx, network_graph, gossip_sync, _, logger) = build_graph();
let (our_privkey, our_id, privkeys, nodes) = get_nodes(&secp_ctx);
let scorer = ln_test_utils::TestScorer::with_penalty(0);
let keys_manager = ln_test_utils::TestKeysInterface::new(&[0u8; 32], Network::Testnet);
let random_seed_bytes = keys_manager.get_secure_random_bytes();
let payment_params = PaymentParameters::from_node_id(nodes[2], 42);
let logger = crate::util::test_utils::TestLogger::new();

update_channel(&gossip_sync, &secp_ctx, &our_privkey, UnsignedChannelUpdate {
chain_hash: genesis_block(Network::Testnet).header.block_hash(),
short_channel_id: 1,
timestamp: 2,
flags: 0,
cltv_expiry_delta: 0,
htlc_minimum_msat: 0,
htlc_maximum_msat: 100_000,
fee_base_msat: 1_000_000,
fee_proportional_millionths: 0,
excess_data: Vec::new()
});
update_channel(&gossip_sync, &secp_ctx, &privkeys[0], UnsignedChannelUpdate {
chain_hash: genesis_block(Network::Testnet).header.block_hash(),
short_channel_id: 3,
timestamp: 2,
flags: 0,
cltv_expiry_delta: 0,
htlc_minimum_msat: 0,
htlc_maximum_msat: 50_000,
fee_base_msat: 0,
fee_proportional_millionths: 0,
excess_data: Vec::new()
});

// we can make four test for different condition or all condition in diffrent tests.
let is_first_hop = true;
let contributes_sufficient_value = false ; // for contributes_suffiecient value , understand where this value came from. what is contribute_sufficent value.

let exceeds_max_path_length = false;
let exceeds_cltv_delta_limit = false;
let payment_failed_on_this_channel = false;

// For this test to run I want short_channel_id , dest_node_id .
let route = get_route(&our_id, &payment_params, &network_graph.read_only(), None, 49_000, 42, &logger, &scorer, &random_seed_bytes).unwrap();

// Retrieve the log message from TestLogger
let lines = logger.lines.lock().unwrap();
let mut log_output = String::new();
for ((module, file), line) in &*lines {

@TheBlueMattTheBlueMattMar 20, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You don't have to iterate over the lines here, you can just do logger.assert_log_contains("routing:;router", "First Hop 3 is excluded due to insufficient value", 1);

log_output.push_str(&format!("{} [{}] {}: {}\n", line, module, line, file));
}
// Check for expected messages in the log output
assert!(log_output.contains("First Hop 3 is excluded due to insufficient value")); //
// assert_log_contains(log_ouptuts , 1);
}



#[test]
fn simple_mpp_route_test() {
let (secp_ctx, network_graph, gossip_sync, _, logger) = build_graph();
Expand Down