Skip to content

Fix and test in-flight HTLC scoring in between retries #2020

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

Merged
TheBlueMatt merged 3 commits into from
Feb 15, 2023
Merged

Fix and test in-flight HTLC scoring in between retries #2020

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa4b429
test_utils: parameterize TestRouter by TestScorer
valentinewallace Feb 7, 2023
825ea9d
Fix computing in-flight HTLCs in between retries + test
valentinewallace Feb 7, 2023
2b2965f
Remove unnecessary scoring methods from Router trait
valentinewallace Feb 9, 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
4 changes: 0 additions & 4 deletions fuzz/src/chanmon_consistency.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -97,10 +97,6 @@ impl Router for FuzzRouter {
action: msgs::ErrorAction::IgnoreError
})
}
fn notify_payment_path_failed(&self, _path: &[&RouteHop], _short_channel_id: u64) {}
fn notify_payment_path_successful(&self, _path: &[&RouteHop]) {}
fn notify_payment_probe_successful(&self, _path: &[&RouteHop]) {}
fn notify_payment_probe_failed(&self, _path: &[&RouteHop], _short_channel_id: u64) {}
}

pub struct TestBroadcaster {}
Expand Down
4 changes: 0 additions & 4 deletions fuzz/src/full_stack.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -140,10 +140,6 @@ impl Router for FuzzRouter {
action: msgs::ErrorAction::IgnoreError
})
}
fn notify_payment_path_failed(&self, _path: &[&RouteHop], _short_channel_id: u64) {}
fn notify_payment_path_successful(&self, _path: &[&RouteHop]) {}
fn notify_payment_probe_successful(&self, _path: &[&RouteHop]) {}
fn notify_payment_probe_failed(&self, _path: &[&RouteHop], _short_channel_id: u64) {}
}

struct TestBroadcaster {
Expand Down
4 changes: 2 additions & 2 deletions lightning-invoice/src/utils.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -691,7 +691,7 @@ mod test {
let first_hops = nodes[0].node.list_usable_channels();
let network_graph = &node_cfgs[0].network_graph;
let logger = test_utils::TestLogger::new();
let scorer = test_utils::TestScorer::with_penalty(0);
let scorer = test_utils::TestScorer::new();
let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
let route = find_route(
&nodes[0].node.get_our_node_id(), &route_params, &network_graph,
Expand DownExpand Up@@ -1055,7 +1055,7 @@ mod test {
let first_hops = nodes[0].node.list_usable_channels();
let network_graph = &node_cfgs[0].network_graph;
let logger = test_utils::TestLogger::new();
let scorer = test_utils::TestScorer::with_penalty(0);
let scorer = test_utils::TestScorer::new();
let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
let route = find_route(
&nodes[0].node.get_our_node_id(), &params, &network_graph,
Expand Down
15 changes: 8 additions & 7 deletions lightning/src/ln/channelmanager.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2546,7 +2546,7 @@ where
let best_block_height = self.best_block.read().unwrap().height();
self.pending_outbound_payments
.send_payment(payment_hash, payment_secret, payment_id, retry_strategy, route_params,
&self.router, self.list_usable_channels(), self.compute_inflight_htlcs(),
&self.router, self.list_usable_channels(), || self.compute_inflight_htlcs(),
&self.entropy_source, &self.node_signer, best_block_height, &self.logger,
|path, payment_params, payment_hash, payment_secret, total_value, cur_height, payment_id, keysend_preimage, session_priv|
self.send_payment_along_path(path, payment_params, payment_hash, payment_secret, total_value, cur_height, payment_id, keysend_preimage, session_priv))
Expand DownExpand Up@@ -2646,7 +2646,7 @@ where
let best_block_height = self.best_block.read().unwrap().height();
self.pending_outbound_payments.send_spontaneous_payment(payment_preimage, payment_id,
retry_strategy, route_params, &self.router, self.list_usable_channels(),
self.compute_inflight_htlcs(), &self.entropy_source, &self.node_signer, best_block_height,
|| self.compute_inflight_htlcs(), &self.entropy_source, &self.node_signer, best_block_height,
&self.logger,
|path, payment_params, payment_hash, payment_secret, total_value, cur_height, payment_id, keysend_preimage, session_priv|
self.send_payment_along_path(path, payment_params, payment_hash, payment_secret, total_value, cur_height, payment_id, keysend_preimage, session_priv))
Expand DownExpand Up@@ -7966,7 +7966,7 @@ mod tests {
let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
create_announced_chan_between_nodes(&nodes, 0, 1);
let scorer = test_utils::TestScorer::with_penalty(0);
let scorer = test_utils::TestScorer::new();
let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();

// To start (1), send a regular payment but don't claim it.
Expand DownExpand Up@@ -8074,7 +8074,7 @@ mod tests {
};
let network_graph = nodes[0].network_graph.clone();
let first_hops = nodes[0].node.list_usable_channels();
let scorer = test_utils::TestScorer::with_penalty(0);
let scorer = test_utils::TestScorer::new();
let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
let route = find_route(
&payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
Expand DownExpand Up@@ -8119,7 +8119,7 @@ mod tests {
};
let network_graph = nodes[0].network_graph.clone();
let first_hops = nodes[0].node.list_usable_channels();
let scorer = test_utils::TestScorer::with_penalty(0);
let scorer = test_utils::TestScorer::new();
let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
let route = find_route(
&payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
Expand DownExpand Up@@ -8589,7 +8589,8 @@ pub mod bench {
let tx_broadcaster = test_utils::TestBroadcaster{txn_broadcasted: Mutex::new(Vec::new()), blocks: Arc::new(Mutex::new(Vec::new()))};
let fee_estimator = test_utils::TestFeeEstimator { sat_per_kw: Mutex::new(253) };
let logger_a = test_utils::TestLogger::with_id("node a".to_owned());
let router = test_utils::TestRouter::new(Arc::new(NetworkGraph::new(genesis_hash, &logger_a)));
let scorer = Mutex::new(test_utils::TestScorer::new());
let router = test_utils::TestRouter::new(Arc::new(NetworkGraph::new(genesis_hash, &logger_a)), &scorer);

let mut config: UserConfig = Default::default();
config.channel_handshake_config.minimum_depth = 1;
Expand DownExpand Up@@ -8680,7 +8681,7 @@ pub mod bench {
let usable_channels = $node_a.list_usable_channels();
let payment_params = PaymentParameters::from_node_id($node_b.get_our_node_id(), TEST_FINAL_CLTV)
.with_features($node_b.invoice_features());
let scorer = test_utils::TestScorer::with_penalty(0);
let scorer = test_utils::TestScorer::new();
let seed = [3u8; 32];
let keys_manager = KeysManager::new(&seed, 42, 42);
let random_seed_bytes = keys_manager.get_secure_random_bytes();
Expand Down
13 changes: 8 additions & 5 deletions lightning/src/ln/functional_test_utils.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -305,6 +305,7 @@ pub struct TestChanMonCfg {
pub persister: test_utils::TestPersister,
pub logger: test_utils::TestLogger,
pub keys_manager: test_utils::TestKeysInterface,
pub scorer: Mutex<test_utils::TestScorer>,
}

pub struct NodeCfg<'a> {
Expand DownExpand Up@@ -427,6 +428,7 @@ impl<'a, 'b, 'c> Drop for Node<'a, 'b, 'c> {
channel_monitors.insert(monitor.get_funding_txo().0, monitor);
}

let scorer = Mutex::new(test_utils::TestScorer::new());
let mut w = test_utils::TestVecWriter(Vec::new());
self.node.write(&mut w).unwrap();
<(BlockHash, ChannelManager<&test_utils::TestChainMonitor, &test_utils::TestBroadcaster, &test_utils::TestKeysInterface, &test_utils::TestKeysInterface, &test_utils::TestKeysInterface, &test_utils::TestFeeEstimator, &test_utils::TestRouter, &test_utils::TestLogger>)>::read(&mut io::Cursor::new(w.0), ChannelManagerReadArgs {
Expand All@@ -435,7 +437,7 @@ impl<'a, 'b, 'c> Drop for Node<'a, 'b, 'c> {
node_signer: self.keys_manager,
signer_provider: self.keys_manager,
fee_estimator: &test_utils::TestFeeEstimator { sat_per_kw: Mutex::new(253) },
router: &test_utils::TestRouter::new(Arc::new(network_graph)),
router: &test_utils::TestRouter::new(Arc::new(network_graph), &scorer),
chain_monitor: self.chain_monitor,
tx_broadcaster: &broadcaster,
logger: &self.logger,
Expand DownExpand Up@@ -1570,7 +1572,7 @@ macro_rules! get_payment_preimage_hash {
macro_rules! get_route {
($send_node: expr, $payment_params: expr, $recv_value: expr, $cltv: expr) => {{
use $crate::chain::keysinterface::EntropySource;
let scorer = $crate::util::test_utils::TestScorer::with_penalty(0);
let scorer = $crate::util::test_utils::TestScorer::new();
let keys_manager = $crate::util::test_utils::TestKeysInterface::new(&[0u8; 32], bitcoin::network::constants::Network::Testnet);
let random_seed_bytes = keys_manager.get_secure_random_bytes();
$crate::routing::router::get_route(
Expand DownExpand Up@@ -2124,7 +2126,7 @@ pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_rou
let payment_params = PaymentParameters::from_node_id(expected_route.last().unwrap().node.get_our_node_id(), TEST_FINAL_CLTV)
.with_features(expected_route.last().unwrap().node.invoice_features());
let network_graph = origin_node.network_graph.read_only();
let scorer = test_utils::TestScorer::with_penalty(0);
let scorer = test_utils::TestScorer::new();
let seed = [0u8; 32];
let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
let random_seed_bytes = keys_manager.get_secure_random_bytes();
Expand DownExpand Up@@ -2289,8 +2291,9 @@ pub fn create_chanmon_cfgs(node_count: usize) -> Vec<TestChanMonCfg> {
let persister = test_utils::TestPersister::new();
let seed = [i as u8; 32];
let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
let scorer = Mutex::new(test_utils::TestScorer::new());

chan_mon_cfgs.push(TestChanMonCfg { tx_broadcaster, fee_estimator, chain_source, logger, persister, keys_manager });
chan_mon_cfgs.push(TestChanMonCfg { tx_broadcaster, fee_estimator, chain_source, logger, persister, keys_manager, scorer });
}

chan_mon_cfgs
Expand All@@ -2308,7 +2311,7 @@ pub fn create_node_cfgs<'a>(node_count: usize, chanmon_cfgs: &'a Vec<TestChanMon
logger: &chanmon_cfgs[i].logger,
tx_broadcaster: &chanmon_cfgs[i].tx_broadcaster,
fee_estimator: &chanmon_cfgs[i].fee_estimator,
router: test_utils::TestRouter::new(network_graph.clone()),
router: test_utils::TestRouter::new(network_graph.clone(), &chanmon_cfgs[i].scorer),
chain_monitor,
keys_manager: &chanmon_cfgs[i].keys_manager,
node_seed: seed,
Expand Down
11 changes: 6 additions & 5 deletions lightning/src/ln/functional_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5257,7 +5257,8 @@ fn test_key_derivation_params() {
let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
let chain_monitor = test_utils::TestChainMonitor::new(Some(&chanmon_cfgs[0].chain_source), &chanmon_cfgs[0].tx_broadcaster, &chanmon_cfgs[0].logger, &chanmon_cfgs[0].fee_estimator, &chanmon_cfgs[0].persister, &keys_manager);
let network_graph = Arc::new(NetworkGraph::new(chanmon_cfgs[0].chain_source.genesis_hash, &chanmon_cfgs[0].logger));
let router = test_utils::TestRouter::new(network_graph.clone());
let scorer = Mutex::new(test_utils::TestScorer::new());
let router = test_utils::TestRouter::new(network_graph.clone(), &scorer);
let node = NodeCfg { chain_source: &chanmon_cfgs[0].chain_source, logger: &chanmon_cfgs[0].logger, tx_broadcaster: &chanmon_cfgs[0].tx_broadcaster, fee_estimator: &chanmon_cfgs[0].fee_estimator, router, chain_monitor, keys_manager: &keys_manager, network_graph, node_seed: seed, override_init_features: alloc::rc::Rc::new(core::cell::RefCell::new(None)) };
let mut node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
node_cfgs.remove(0);
Expand DownExpand Up@@ -6925,7 +6926,7 @@ fn test_check_htlc_underpaying() {
// Create some initial channels
create_announced_chan_between_nodes(&nodes, 0, 1);

let scorer = test_utils::TestScorer::with_penalty(0);
let scorer = test_utils::TestScorer::new();
let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV).with_features(nodes[1].node.invoice_features());
let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None, 10_000, TEST_FINAL_CLTV, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
Expand DownExpand Up@@ -7175,7 +7176,7 @@ fn test_bump_penalty_txn_on_revoked_htlcs() {
let chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1000000, 59000000);
// Lock HTLC in both directions (using a slightly lower CLTV delay to provide timely RBF bumps)
let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), 50).with_features(nodes[1].node.invoice_features());
let scorer = test_utils::TestScorer::with_penalty(0);
let scorer = test_utils::TestScorer::new();
let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None,
3_000_000, 50, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
Expand DownExpand Up@@ -9186,7 +9187,7 @@ fn test_keysend_payments_to_public_node() {
final_value_msat: 10000,
final_cltv_expiry_delta: 40,
};
let scorer = test_utils::TestScorer::with_penalty(0);
let scorer = test_utils::TestScorer::new();
let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
let route = find_route(&payer_pubkey, &route_params, &network_graph, None, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();

Expand DownExpand Up@@ -9221,7 +9222,7 @@ fn test_keysend_payments_to_private_node() {
};
let network_graph = nodes[0].network_graph.clone();
let first_hops = nodes[0].node.list_usable_channels();
let scorer = test_utils::TestScorer::with_penalty(0);
let scorer = test_utils::TestScorer::new();
let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
let route = find_route(
&payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
Expand Down
2 changes: 1 addition & 1 deletion lightning/src/ln/onion_route_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -928,7 +928,7 @@ macro_rules! get_phantom_route {
htlc_maximum_msat: None,
}
])]);
let scorer = test_utils::TestScorer::with_penalty(0);
let scorer = test_utils::TestScorer::new();
let network_graph = $nodes[0].network_graph.read_only();
(get_route(
&$nodes[0].node.get_our_node_id(), &payment_params, &network_graph,
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Fix and test in-flight HTLC scoring in between retries by valentinewallace · Pull Request #2020 · lightningdevkit/rust-lightning · GitHub
Skip to content
Fix and test in-flight HTLC scoring in between retries #2020

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

 Merged

TheBlueMatt
merged 3 commits into

from

Feb 15, 2023
 Merged


Fix and test in-flight HTLC scoring in between retries #2020
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
aa4b429

test_utils: parameterize TestRouter by TestScorer


valentinewallace Feb 7, 2023
825ea9d

Fix computing in-flight HTLCs in between retries + test


valentinewallace Feb 7, 2023
2b2965f

Remove unnecessary scoring methods from Router trait


valentinewallace Feb 9, 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


4 changes: 0 additions & 4 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -97,10 +97,6 @@ impl Router for FuzzRouter {
 action: msgs::ErrorAction::IgnoreError
 })
	}
	fn notify_payment_path_failed(&self, _path: &[&RouteHop], _short_channel_id: u64) {}
	fn notify_payment_path_successful(&self, _path: &[&RouteHop]) {}
	fn notify_payment_probe_successful(&self, _path: &[&RouteHop]) {}
	fn notify_payment_probe_failed(&self, _path: &[&RouteHop], _short_channel_id: u64) {}
}

pub struct TestBroadcaster {}
Expand Down

4 changes: 0 additions & 4 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -140,10 +140,6 @@ impl Router for FuzzRouter {
 action: msgs::ErrorAction::IgnoreError
 })
	}
	fn notify_payment_path_failed(&self, _path: &[&RouteHop], _short_channel_id: u64) {}
	fn notify_payment_path_successful(&self, _path: &[&RouteHop]) {}
	fn notify_payment_probe_successful(&self, _path: &[&RouteHop]) {}
	fn notify_payment_probe_failed(&self, _path: &[&RouteHop], _short_channel_id: u64) {}
}

struct TestBroadcaster {
Expand Down

4 changes: 2 additions & 2 deletions
lightning-invoice/src/utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -691,7 +691,7 @@ mod test {
 let first_hops = nodes[0].node.list_usable_channels();
 let network_graph = &node_cfgs[0].network_graph;
 let logger = test_utils::TestLogger::new();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let scorer = test_utils::TestScorer::new();
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &route_params, &network_graph,
Expand DownExpand Up@@ -1055,7 +1055,7 @@ mod test {
 let first_hops = nodes[0].node.list_usable_channels();
 let network_graph = &node_cfgs[0].network_graph;
 let logger = test_utils::TestLogger::new();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let scorer = test_utils::TestScorer::new();
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &params, &network_graph,
Expand Down

15 changes: 8 additions & 7 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2546,7 +2546,7 @@ where
 let best_block_height = self.best_block.read().unwrap().height();
 self.pending_outbound_payments
 .send_payment(payment_hash, payment_secret, payment_id, retry_strategy, route_params,
 &self.router, self.list_usable_channels(), self.compute_inflight_htlcs(),
 &self.router, self.list_usable_channels(), || self.compute_inflight_htlcs(),
 &self.entropy_source, &self.node_signer, best_block_height, &self.logger,
 |path, payment_params, payment_hash, payment_secret, total_value, cur_height, payment_id, keysend_preimage, session_priv|
 self.send_payment_along_path(path, payment_params, payment_hash, payment_secret, total_value, cur_height, payment_id, keysend_preimage, session_priv))
Expand DownExpand Up@@ -2646,7 +2646,7 @@ where
 let best_block_height = self.best_block.read().unwrap().height();
 self.pending_outbound_payments.send_spontaneous_payment(payment_preimage, payment_id,
 retry_strategy, route_params, &self.router, self.list_usable_channels(),
 self.compute_inflight_htlcs(), &self.entropy_source, &self.node_signer, best_block_height,
|| self.compute_inflight_htlcs(), &self.entropy_source, &self.node_signer, best_block_height,
 &self.logger,
 |path, payment_params, payment_hash, payment_secret, total_value, cur_height, payment_id, keysend_preimage, session_priv|
 self.send_payment_along_path(path, payment_params, payment_hash, payment_secret, total_value, cur_height, payment_id, keysend_preimage, session_priv))
Expand DownExpand Up@@ -7966,7 +7966,7 @@ mod tests {
 let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
 let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
 create_announced_chan_between_nodes(&nodes, 0, 1);
 let scorer = test_utils::TestScorer::with_penalty(0);
 let scorer = test_utils::TestScorer::new();
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();

 // To start (1), send a regular payment but don't claim it.
Expand DownExpand Up@@ -8074,7 +8074,7 @@ mod tests {
 };
 let network_graph = nodes[0].network_graph.clone();
 let first_hops = nodes[0].node.list_usable_channels();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let scorer = test_utils::TestScorer::new();
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
Expand DownExpand Up@@ -8119,7 +8119,7 @@ mod tests {
 };
 let network_graph = nodes[0].network_graph.clone();
 let first_hops = nodes[0].node.list_usable_channels();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let scorer = test_utils::TestScorer::new();
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
Expand DownExpand Up@@ -8589,7 +8589,8 @@ pub mod bench {
 let tx_broadcaster = test_utils::TestBroadcaster{txn_broadcasted: Mutex::new(Vec::new()), blocks: Arc::new(Mutex::new(Vec::new()))};
 let fee_estimator = test_utils::TestFeeEstimator { sat_per_kw: Mutex::new(253) };
 let logger_a = test_utils::TestLogger::with_id("node a".to_owned());
 let router = test_utils::TestRouter::new(Arc::new(NetworkGraph::new(genesis_hash, &logger_a)));
 let scorer = Mutex::new(test_utils::TestScorer::new());
 let router = test_utils::TestRouter::new(Arc::new(NetworkGraph::new(genesis_hash, &logger_a)), &scorer);

 let mut config: UserConfig = Default::default();
 config.channel_handshake_config.minimum_depth = 1;
Expand DownExpand Up@@ -8680,7 +8681,7 @@ pub mod bench {
 let usable_channels = $node_a.list_usable_channels();
 let payment_params = PaymentParameters::from_node_id($node_b.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features($node_b.invoice_features());
 let scorer = test_utils::TestScorer::with_penalty(0);
 let scorer = test_utils::TestScorer::new();
 let seed = [3u8; 32];
 let keys_manager = KeysManager::new(&seed, 42, 42);
 let random_seed_bytes = keys_manager.get_secure_random_bytes();
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -305,6 +305,7 @@ pub struct TestChanMonCfg {
	pub persister: test_utils::TestPersister,
	pub logger: test_utils::TestLogger,
	pub keys_manager: test_utils::TestKeysInterface,
	pub scorer: Mutex<test_utils::TestScorer>,
}

pub struct NodeCfg<'a> {
Expand DownExpand Up@@ -427,6 +428,7 @@ impl<'a, 'b, 'c> Drop for Node<'a, 'b, 'c> {
 channel_monitors.insert(monitor.get_funding_txo().0, monitor);
 }

 let scorer = Mutex::new(test_utils::TestScorer::new());
 let mut w = test_utils::TestVecWriter(Vec::new());
 self.node.write(&mut w).unwrap();
 <(BlockHash, ChannelManager<&test_utils::TestChainMonitor, &test_utils::TestBroadcaster, &test_utils::TestKeysInterface, &test_utils::TestKeysInterface, &test_utils::TestKeysInterface, &test_utils::TestFeeEstimator, &test_utils::TestRouter, &test_utils::TestLogger>)>::read(&mut io::Cursor::new(w.0), ChannelManagerReadArgs {
Expand All@@ -435,7 +437,7 @@ impl<'a, 'b, 'c> Drop for Node<'a, 'b, 'c> {
 node_signer: self.keys_manager,
 signer_provider: self.keys_manager,
 fee_estimator: &test_utils::TestFeeEstimator { sat_per_kw: Mutex::new(253) },
 router: &test_utils::TestRouter::new(Arc::new(network_graph)),
 router: &test_utils::TestRouter::new(Arc::new(network_graph), &scorer),
 chain_monitor: self.chain_monitor,
 tx_broadcaster: &broadcaster,
 logger: &self.logger,
Expand DownExpand Up@@ -1570,7 +1572,7 @@ macro_rules! get_payment_preimage_hash {
macro_rules! get_route {
	($send_node: expr, $payment_params: expr, $recv_value: expr, $cltv: expr) => {{
 use $crate::chain::keysinterface::EntropySource;
 let scorer = $crate::util::test_utils::TestScorer::with_penalty(0);
 let scorer = $crate::util::test_utils::TestScorer::new();
 let keys_manager = $crate::util::test_utils::TestKeysInterface::new(&[0u8; 32], bitcoin::network::constants::Network::Testnet);
 let random_seed_bytes = keys_manager.get_secure_random_bytes();
 $crate::routing::router::get_route(
Expand DownExpand Up@@ -2124,7 +2126,7 @@ pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_rou
	let payment_params = PaymentParameters::from_node_id(expected_route.last().unwrap().node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(expected_route.last().unwrap().node.invoice_features());
	let network_graph = origin_node.network_graph.read_only();
	let scorer = test_utils::TestScorer::with_penalty(0);
	let scorer = test_utils::TestScorer::new();
	let seed = [0u8; 32];
	let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
	let random_seed_bytes = keys_manager.get_secure_random_bytes();
Expand DownExpand Up@@ -2289,8 +2291,9 @@ pub fn create_chanmon_cfgs(node_count: usize) -> Vec<TestChanMonCfg> {
 let persister = test_utils::TestPersister::new();
 let seed = [i as u8; 32];
 let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
 let scorer = Mutex::new(test_utils::TestScorer::new());

 chan_mon_cfgs.push(TestChanMonCfg { tx_broadcaster, fee_estimator, chain_source, logger, persister, keys_manager });
 chan_mon_cfgs.push(TestChanMonCfg { tx_broadcaster, fee_estimator, chain_source, logger, persister, keys_manager, scorer });
	}

	chan_mon_cfgs
Expand All@@ -2308,7 +2311,7 @@ pub fn create_node_cfgs<'a>(node_count: usize, chanmon_cfgs: &'a Vec<TestChanMon
 logger: &chanmon_cfgs[i].logger,
 tx_broadcaster: &chanmon_cfgs[i].tx_broadcaster,
 fee_estimator: &chanmon_cfgs[i].fee_estimator,
 router: test_utils::TestRouter::new(network_graph.clone()),
 router: test_utils::TestRouter::new(network_graph.clone(), &chanmon_cfgs[i].scorer),
 chain_monitor,
 keys_manager: &chanmon_cfgs[i].keys_manager,
 node_seed: seed,
Expand Down

11 changes: 6 additions & 5 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5257,7 +5257,8 @@ fn test_key_derivation_params() {
	let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
	let chain_monitor = test_utils::TestChainMonitor::new(Some(&chanmon_cfgs[0].chain_source), &chanmon_cfgs[0].tx_broadcaster, &chanmon_cfgs[0].logger, &chanmon_cfgs[0].fee_estimator, &chanmon_cfgs[0].persister, &keys_manager);
	let network_graph = Arc::new(NetworkGraph::new(chanmon_cfgs[0].chain_source.genesis_hash, &chanmon_cfgs[0].logger));
	let router = test_utils::TestRouter::new(network_graph.clone());
	let scorer = Mutex::new(test_utils::TestScorer::new());
	let router = test_utils::TestRouter::new(network_graph.clone(), &scorer);
	let node = NodeCfg { chain_source: &chanmon_cfgs[0].chain_source, logger: &chanmon_cfgs[0].logger, tx_broadcaster: &chanmon_cfgs[0].tx_broadcaster, fee_estimator: &chanmon_cfgs[0].fee_estimator, router, chain_monitor, keys_manager: &keys_manager, network_graph, node_seed: seed, override_init_features: alloc::rc::Rc::new(core::cell::RefCell::new(None)) };
	let mut node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
	node_cfgs.remove(0);
Expand DownExpand Up@@ -6925,7 +6926,7 @@ fn test_check_htlc_underpaying() {
	// Create some initial channels
	create_announced_chan_between_nodes(&nodes, 0, 1);

	let scorer = test_utils::TestScorer::with_penalty(0);
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV).with_features(nodes[1].node.invoice_features());
	let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None, 10_000, TEST_FINAL_CLTV, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
Expand DownExpand Up@@ -7175,7 +7176,7 @@ fn test_bump_penalty_txn_on_revoked_htlcs() {
	let chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1000000, 59000000);
	// Lock HTLC in both directions (using a slightly lower CLTV delay to provide timely RBF bumps)
	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), 50).with_features(nodes[1].node.invoice_features());
	let scorer = test_utils::TestScorer::with_penalty(0);
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None,
 3_000_000, 50, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
Expand DownExpand Up@@ -9186,7 +9187,7 @@ fn test_keysend_payments_to_public_node() {
 final_value_msat: 10000,
 final_cltv_expiry_delta: 40,
	};
	let scorer = test_utils::TestScorer::with_penalty(0);
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let route = find_route(&payer_pubkey, &route_params, &network_graph, None, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();

Expand DownExpand Up@@ -9221,7 +9222,7 @@ fn test_keysend_payments_to_private_node() {
	};
	let network_graph = nodes[0].network_graph.clone();
	let first_hops = nodes[0].node.list_usable_channels();
	let scorer = test_utils::TestScorer::with_penalty(0);
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let route = find_route(
 &payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/onion_route_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -928,7 +928,7 @@ macro_rules! get_phantom_route {
 htlc_maximum_msat: None,
 }
 ])]);
 let scorer = test_utils::TestScorer::with_penalty(0);
 let scorer = test_utils::TestScorer::new();
 let network_graph = $nodes[0].network_graph.read_only();
 (get_route(
 &$nodes[0].node.get_our_node_id(), &payment_params, &network_graph,
Expand Down
Loading

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

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

 Merged

TheBlueMatt
merged 3 commits into

from

Feb 15, 2023
 Merged


Fix and test in-flight HTLC scoring in between retries #2020
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
aa4b429

test_utils: parameterize TestRouter by TestScorer


valentinewallace Feb 7, 2023
825ea9d

Fix computing in-flight HTLCs in between retries + test


valentinewallace Feb 7, 2023
2b2965f

Remove unnecessary scoring methods from Router trait


valentinewallace Feb 9, 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


4 changes: 0 additions & 4 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -97,10 +97,6 @@ impl Router for FuzzRouter {
 action: msgs::ErrorAction::IgnoreError
 })
	}
	fn notify_payment_path_failed(&self, _path: &[&RouteHop], _short_channel_id: u64) {}
	fn notify_payment_path_successful(&self, _path: &[&RouteHop]) {}
	fn notify_payment_probe_successful(&self, _path: &[&RouteHop]) {}
	fn notify_payment_probe_failed(&self, _path: &[&RouteHop], _short_channel_id: u64) {}
}

pub struct TestBroadcaster {}
Expand Down

4 changes: 0 additions & 4 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -140,10 +140,6 @@ impl Router for FuzzRouter {
 action: msgs::ErrorAction::IgnoreError
 })
	}
	fn notify_payment_path_failed(&self, _path: &[&RouteHop], _short_channel_id: u64) {}
	fn notify_payment_path_successful(&self, _path: &[&RouteHop]) {}
	fn notify_payment_probe_successful(&self, _path: &[&RouteHop]) {}
	fn notify_payment_probe_failed(&self, _path: &[&RouteHop], _short_channel_id: u64) {}
}

struct TestBroadcaster {
Expand Down

4 changes: 2 additions & 2 deletions
lightning-invoice/src/utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -691,7 +691,7 @@ mod test {
 let first_hops = nodes[0].node.list_usable_channels();
 let network_graph = &node_cfgs[0].network_graph;
 let logger = test_utils::TestLogger::new();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let scorer = test_utils::TestScorer::new();
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &route_params, &network_graph,
Expand DownExpand Up@@ -1055,7 +1055,7 @@ mod test {
 let first_hops = nodes[0].node.list_usable_channels();
 let network_graph = &node_cfgs[0].network_graph;
 let logger = test_utils::TestLogger::new();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let scorer = test_utils::TestScorer::new();
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &params, &network_graph,
Expand Down

15 changes: 8 additions & 7 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2546,7 +2546,7 @@ where
 let best_block_height = self.best_block.read().unwrap().height();
 self.pending_outbound_payments
 .send_payment(payment_hash, payment_secret, payment_id, retry_strategy, route_params,
 &self.router, self.list_usable_channels(), self.compute_inflight_htlcs(),
 &self.router, self.list_usable_channels(), || self.compute_inflight_htlcs(),
 &self.entropy_source, &self.node_signer, best_block_height, &self.logger,
 |path, payment_params, payment_hash, payment_secret, total_value, cur_height, payment_id, keysend_preimage, session_priv|
 self.send_payment_along_path(path, payment_params, payment_hash, payment_secret, total_value, cur_height, payment_id, keysend_preimage, session_priv))
Expand DownExpand Up@@ -2646,7 +2646,7 @@ where
 let best_block_height = self.best_block.read().unwrap().height();
 self.pending_outbound_payments.send_spontaneous_payment(payment_preimage, payment_id,
 retry_strategy, route_params, &self.router, self.list_usable_channels(),
 self.compute_inflight_htlcs(), &self.entropy_source, &self.node_signer, best_block_height,
|| self.compute_inflight_htlcs(), &self.entropy_source, &self.node_signer, best_block_height,
 &self.logger,
 |path, payment_params, payment_hash, payment_secret, total_value, cur_height, payment_id, keysend_preimage, session_priv|
 self.send_payment_along_path(path, payment_params, payment_hash, payment_secret, total_value, cur_height, payment_id, keysend_preimage, session_priv))
Expand DownExpand Up@@ -7966,7 +7966,7 @@ mod tests {
 let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
 let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
 create_announced_chan_between_nodes(&nodes, 0, 1);
 let scorer = test_utils::TestScorer::with_penalty(0);
 let scorer = test_utils::TestScorer::new();
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();

 // To start (1), send a regular payment but don't claim it.
Expand DownExpand Up@@ -8074,7 +8074,7 @@ mod tests {
 };
 let network_graph = nodes[0].network_graph.clone();
 let first_hops = nodes[0].node.list_usable_channels();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let scorer = test_utils::TestScorer::new();
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
Expand DownExpand Up@@ -8119,7 +8119,7 @@ mod tests {
 };
 let network_graph = nodes[0].network_graph.clone();
 let first_hops = nodes[0].node.list_usable_channels();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let scorer = test_utils::TestScorer::new();
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
Expand DownExpand Up@@ -8589,7 +8589,8 @@ pub mod bench {
 let tx_broadcaster = test_utils::TestBroadcaster{txn_broadcasted: Mutex::new(Vec::new()), blocks: Arc::new(Mutex::new(Vec::new()))};
 let fee_estimator = test_utils::TestFeeEstimator { sat_per_kw: Mutex::new(253) };
 let logger_a = test_utils::TestLogger::with_id("node a".to_owned());
 let router = test_utils::TestRouter::new(Arc::new(NetworkGraph::new(genesis_hash, &logger_a)));
 let scorer = Mutex::new(test_utils::TestScorer::new());
 let router = test_utils::TestRouter::new(Arc::new(NetworkGraph::new(genesis_hash, &logger_a)), &scorer);

 let mut config: UserConfig = Default::default();
 config.channel_handshake_config.minimum_depth = 1;
Expand DownExpand Up@@ -8680,7 +8681,7 @@ pub mod bench {
 let usable_channels = $node_a.list_usable_channels();
 let payment_params = PaymentParameters::from_node_id($node_b.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features($node_b.invoice_features());
 let scorer = test_utils::TestScorer::with_penalty(0);
 let scorer = test_utils::TestScorer::new();
 let seed = [3u8; 32];
 let keys_manager = KeysManager::new(&seed, 42, 42);
 let random_seed_bytes = keys_manager.get_secure_random_bytes();
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -305,6 +305,7 @@ pub struct TestChanMonCfg {
	pub persister: test_utils::TestPersister,
	pub logger: test_utils::TestLogger,
	pub keys_manager: test_utils::TestKeysInterface,
	pub scorer: Mutex<test_utils::TestScorer>,
}

pub struct NodeCfg<'a> {
Expand DownExpand Up@@ -427,6 +428,7 @@ impl<'a, 'b, 'c> Drop for Node<'a, 'b, 'c> {
 channel_monitors.insert(monitor.get_funding_txo().0, monitor);
 }

 let scorer = Mutex::new(test_utils::TestScorer::new());
 let mut w = test_utils::TestVecWriter(Vec::new());
 self.node.write(&mut w).unwrap();
 <(BlockHash, ChannelManager<&test_utils::TestChainMonitor, &test_utils::TestBroadcaster, &test_utils::TestKeysInterface, &test_utils::TestKeysInterface, &test_utils::TestKeysInterface, &test_utils::TestFeeEstimator, &test_utils::TestRouter, &test_utils::TestLogger>)>::read(&mut io::Cursor::new(w.0), ChannelManagerReadArgs {
Expand All@@ -435,7 +437,7 @@ impl<'a, 'b, 'c> Drop for Node<'a, 'b, 'c> {
 node_signer: self.keys_manager,
 signer_provider: self.keys_manager,
 fee_estimator: &test_utils::TestFeeEstimator { sat_per_kw: Mutex::new(253) },
 router: &test_utils::TestRouter::new(Arc::new(network_graph)),
 router: &test_utils::TestRouter::new(Arc::new(network_graph), &scorer),
 chain_monitor: self.chain_monitor,
 tx_broadcaster: &broadcaster,
 logger: &self.logger,
Expand DownExpand Up@@ -1570,7 +1572,7 @@ macro_rules! get_payment_preimage_hash {
macro_rules! get_route {
	($send_node: expr, $payment_params: expr, $recv_value: expr, $cltv: expr) => {{
 use $crate::chain::keysinterface::EntropySource;
 let scorer = $crate::util::test_utils::TestScorer::with_penalty(0);
 let scorer = $crate::util::test_utils::TestScorer::new();
 let keys_manager = $crate::util::test_utils::TestKeysInterface::new(&[0u8; 32], bitcoin::network::constants::Network::Testnet);
 let random_seed_bytes = keys_manager.get_secure_random_bytes();
 $crate::routing::router::get_route(
Expand DownExpand Up@@ -2124,7 +2126,7 @@ pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_rou
	let payment_params = PaymentParameters::from_node_id(expected_route.last().unwrap().node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(expected_route.last().unwrap().node.invoice_features());
	let network_graph = origin_node.network_graph.read_only();
	let scorer = test_utils::TestScorer::with_penalty(0);
	let scorer = test_utils::TestScorer::new();
	let seed = [0u8; 32];
	let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
	let random_seed_bytes = keys_manager.get_secure_random_bytes();
Expand DownExpand Up@@ -2289,8 +2291,9 @@ pub fn create_chanmon_cfgs(node_count: usize) -> Vec<TestChanMonCfg> {
 let persister = test_utils::TestPersister::new();
 let seed = [i as u8; 32];
 let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
 let scorer = Mutex::new(test_utils::TestScorer::new());

 chan_mon_cfgs.push(TestChanMonCfg { tx_broadcaster, fee_estimator, chain_source, logger, persister, keys_manager });
 chan_mon_cfgs.push(TestChanMonCfg { tx_broadcaster, fee_estimator, chain_source, logger, persister, keys_manager, scorer });
	}

	chan_mon_cfgs
Expand All@@ -2308,7 +2311,7 @@ pub fn create_node_cfgs<'a>(node_count: usize, chanmon_cfgs: &'a Vec<TestChanMon
 logger: &chanmon_cfgs[i].logger,
 tx_broadcaster: &chanmon_cfgs[i].tx_broadcaster,
 fee_estimator: &chanmon_cfgs[i].fee_estimator,
 router: test_utils::TestRouter::new(network_graph.clone()),
 router: test_utils::TestRouter::new(network_graph.clone(), &chanmon_cfgs[i].scorer),
 chain_monitor,
 keys_manager: &chanmon_cfgs[i].keys_manager,
 node_seed: seed,
Expand Down

11 changes: 6 additions & 5 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5257,7 +5257,8 @@ fn test_key_derivation_params() {
	let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
	let chain_monitor = test_utils::TestChainMonitor::new(Some(&chanmon_cfgs[0].chain_source), &chanmon_cfgs[0].tx_broadcaster, &chanmon_cfgs[0].logger, &chanmon_cfgs[0].fee_estimator, &chanmon_cfgs[0].persister, &keys_manager);
	let network_graph = Arc::new(NetworkGraph::new(chanmon_cfgs[0].chain_source.genesis_hash, &chanmon_cfgs[0].logger));
	let router = test_utils::TestRouter::new(network_graph.clone());
	let scorer = Mutex::new(test_utils::TestScorer::new());
	let router = test_utils::TestRouter::new(network_graph.clone(), &scorer);
	let node = NodeCfg { chain_source: &chanmon_cfgs[0].chain_source, logger: &chanmon_cfgs[0].logger, tx_broadcaster: &chanmon_cfgs[0].tx_broadcaster, fee_estimator: &chanmon_cfgs[0].fee_estimator, router, chain_monitor, keys_manager: &keys_manager, network_graph, node_seed: seed, override_init_features: alloc::rc::Rc::new(core::cell::RefCell::new(None)) };
	let mut node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
	node_cfgs.remove(0);
Expand DownExpand Up@@ -6925,7 +6926,7 @@ fn test_check_htlc_underpaying() {
	// Create some initial channels
	create_announced_chan_between_nodes(&nodes, 0, 1);

	let scorer = test_utils::TestScorer::with_penalty(0);
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV).with_features(nodes[1].node.invoice_features());
	let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None, 10_000, TEST_FINAL_CLTV, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
Expand DownExpand Up@@ -7175,7 +7176,7 @@ fn test_bump_penalty_txn_on_revoked_htlcs() {
	let chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1000000, 59000000);
	// Lock HTLC in both directions (using a slightly lower CLTV delay to provide timely RBF bumps)
	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), 50).with_features(nodes[1].node.invoice_features());
	let scorer = test_utils::TestScorer::with_penalty(0);
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None,
 3_000_000, 50, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
Expand DownExpand Up@@ -9186,7 +9187,7 @@ fn test_keysend_payments_to_public_node() {
 final_value_msat: 10000,
 final_cltv_expiry_delta: 40,
	};
	let scorer = test_utils::TestScorer::with_penalty(0);
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let route = find_route(&payer_pubkey, &route_params, &network_graph, None, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();

Expand DownExpand Up@@ -9221,7 +9222,7 @@ fn test_keysend_payments_to_private_node() {
	};
	let network_graph = nodes[0].network_graph.clone();
	let first_hops = nodes[0].node.list_usable_channels();
	let scorer = test_utils::TestScorer::with_penalty(0);
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let route = find_route(
 &payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/onion_route_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -928,7 +928,7 @@ macro_rules! get_phantom_route {
 htlc_maximum_msat: None,
 }
 ])]);
 let scorer = test_utils::TestScorer::with_penalty(0);
 let scorer = test_utils::TestScorer::new();
 let network_graph = $nodes[0].network_graph.read_only();
 (get_route(
 &$nodes[0].node.get_our_node_id(), &payment_params, &network_graph,
Expand Down
Loading

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

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

 Merged

TheBlueMatt
merged 3 commits into

from

Feb 15, 2023
 Merged


Fix and test in-flight HTLC scoring in between retries #2020
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
aa4b429

test_utils: parameterize TestRouter by TestScorer


valentinewallace Feb 7, 2023
825ea9d

Fix computing in-flight HTLCs in between retries + test


valentinewallace Feb 7, 2023
2b2965f

Remove unnecessary scoring methods from Router trait


valentinewallace Feb 9, 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


4 changes: 0 additions & 4 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -97,10 +97,6 @@ impl Router for FuzzRouter {
 action: msgs::ErrorAction::IgnoreError
 })
	}
	fn notify_payment_path_failed(&self, _path: &[&RouteHop], _short_channel_id: u64) {}
	fn notify_payment_path_successful(&self, _path: &[&RouteHop]) {}
	fn notify_payment_probe_successful(&self, _path: &[&RouteHop]) {}
	fn notify_payment_probe_failed(&self, _path: &[&RouteHop], _short_channel_id: u64) {}
}

pub struct TestBroadcaster {}
Expand Down

4 changes: 0 additions & 4 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -140,10 +140,6 @@ impl Router for FuzzRouter {
 action: msgs::ErrorAction::IgnoreError
 })
	}
	fn notify_payment_path_failed(&self, _path: &[&RouteHop], _short_channel_id: u64) {}
	fn notify_payment_path_successful(&self, _path: &[&RouteHop]) {}
	fn notify_payment_probe_successful(&self, _path: &[&RouteHop]) {}
	fn notify_payment_probe_failed(&self, _path: &[&RouteHop], _short_channel_id: u64) {}
}

struct TestBroadcaster {
Expand Down

4 changes: 2 additions & 2 deletions
lightning-invoice/src/utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -691,7 +691,7 @@ mod test {
 let first_hops = nodes[0].node.list_usable_channels();
 let network_graph = &node_cfgs[0].network_graph;
 let logger = test_utils::TestLogger::new();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let scorer = test_utils::TestScorer::new();
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &route_params, &network_graph,
Expand DownExpand Up@@ -1055,7 +1055,7 @@ mod test {
 let first_hops = nodes[0].node.list_usable_channels();
 let network_graph = &node_cfgs[0].network_graph;
 let logger = test_utils::TestLogger::new();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let scorer = test_utils::TestScorer::new();
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &params, &network_graph,
Expand Down

15 changes: 8 additions & 7 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2546,7 +2546,7 @@ where
 let best_block_height = self.best_block.read().unwrap().height();
 self.pending_outbound_payments
 .send_payment(payment_hash, payment_secret, payment_id, retry_strategy, route_params,
 &self.router, self.list_usable_channels(), self.compute_inflight_htlcs(),
 &self.router, self.list_usable_channels(), || self.compute_inflight_htlcs(),
 &self.entropy_source, &self.node_signer, best_block_height, &self.logger,
 |path, payment_params, payment_hash, payment_secret, total_value, cur_height, payment_id, keysend_preimage, session_priv|
 self.send_payment_along_path(path, payment_params, payment_hash, payment_secret, total_value, cur_height, payment_id, keysend_preimage, session_priv))
Expand DownExpand Up@@ -2646,7 +2646,7 @@ where
 let best_block_height = self.best_block.read().unwrap().height();
 self.pending_outbound_payments.send_spontaneous_payment(payment_preimage, payment_id,
 retry_strategy, route_params, &self.router, self.list_usable_channels(),
 self.compute_inflight_htlcs(), &self.entropy_source, &self.node_signer, best_block_height,
|| self.compute_inflight_htlcs(), &self.entropy_source, &self.node_signer, best_block_height,
 &self.logger,
 |path, payment_params, payment_hash, payment_secret, total_value, cur_height, payment_id, keysend_preimage, session_priv|
 self.send_payment_along_path(path, payment_params, payment_hash, payment_secret, total_value, cur_height, payment_id, keysend_preimage, session_priv))
Expand DownExpand Up@@ -7966,7 +7966,7 @@ mod tests {
 let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
 let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
 create_announced_chan_between_nodes(&nodes, 0, 1);
 let scorer = test_utils::TestScorer::with_penalty(0);
 let scorer = test_utils::TestScorer::new();
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();

 // To start (1), send a regular payment but don't claim it.
Expand DownExpand Up@@ -8074,7 +8074,7 @@ mod tests {
 };
 let network_graph = nodes[0].network_graph.clone();
 let first_hops = nodes[0].node.list_usable_channels();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let scorer = test_utils::TestScorer::new();
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
Expand DownExpand Up@@ -8119,7 +8119,7 @@ mod tests {
 };
 let network_graph = nodes[0].network_graph.clone();
 let first_hops = nodes[0].node.list_usable_channels();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let scorer = test_utils::TestScorer::new();
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
Expand DownExpand Up@@ -8589,7 +8589,8 @@ pub mod bench {
 let tx_broadcaster = test_utils::TestBroadcaster{txn_broadcasted: Mutex::new(Vec::new()), blocks: Arc::new(Mutex::new(Vec::new()))};
 let fee_estimator = test_utils::TestFeeEstimator { sat_per_kw: Mutex::new(253) };
 let logger_a = test_utils::TestLogger::with_id("node a".to_owned());
 let router = test_utils::TestRouter::new(Arc::new(NetworkGraph::new(genesis_hash, &logger_a)));
 let scorer = Mutex::new(test_utils::TestScorer::new());
 let router = test_utils::TestRouter::new(Arc::new(NetworkGraph::new(genesis_hash, &logger_a)), &scorer);

 let mut config: UserConfig = Default::default();
 config.channel_handshake_config.minimum_depth = 1;
Expand DownExpand Up@@ -8680,7 +8681,7 @@ pub mod bench {
 let usable_channels = $node_a.list_usable_channels();
 let payment_params = PaymentParameters::from_node_id($node_b.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features($node_b.invoice_features());
 let scorer = test_utils::TestScorer::with_penalty(0);
 let scorer = test_utils::TestScorer::new();
 let seed = [3u8; 32];
 let keys_manager = KeysManager::new(&seed, 42, 42);
 let random_seed_bytes = keys_manager.get_secure_random_bytes();
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -305,6 +305,7 @@ pub struct TestChanMonCfg {
	pub persister: test_utils::TestPersister,
	pub logger: test_utils::TestLogger,
	pub keys_manager: test_utils::TestKeysInterface,
	pub scorer: Mutex<test_utils::TestScorer>,
}

pub struct NodeCfg<'a> {
Expand DownExpand Up@@ -427,6 +428,7 @@ impl<'a, 'b, 'c> Drop for Node<'a, 'b, 'c> {
 channel_monitors.insert(monitor.get_funding_txo().0, monitor);
 }

 let scorer = Mutex::new(test_utils::TestScorer::new());
 let mut w = test_utils::TestVecWriter(Vec::new());
 self.node.write(&mut w).unwrap();
 <(BlockHash, ChannelManager<&test_utils::TestChainMonitor, &test_utils::TestBroadcaster, &test_utils::TestKeysInterface, &test_utils::TestKeysInterface, &test_utils::TestKeysInterface, &test_utils::TestFeeEstimator, &test_utils::TestRouter, &test_utils::TestLogger>)>::read(&mut io::Cursor::new(w.0), ChannelManagerReadArgs {
Expand All@@ -435,7 +437,7 @@ impl<'a, 'b, 'c> Drop for Node<'a, 'b, 'c> {
 node_signer: self.keys_manager,
 signer_provider: self.keys_manager,
 fee_estimator: &test_utils::TestFeeEstimator { sat_per_kw: Mutex::new(253) },
 router: &test_utils::TestRouter::new(Arc::new(network_graph)),
 router: &test_utils::TestRouter::new(Arc::new(network_graph), &scorer),
 chain_monitor: self.chain_monitor,
 tx_broadcaster: &broadcaster,
 logger: &self.logger,
Expand DownExpand Up@@ -1570,7 +1572,7 @@ macro_rules! get_payment_preimage_hash {
macro_rules! get_route {
	($send_node: expr, $payment_params: expr, $recv_value: expr, $cltv: expr) => {{
 use $crate::chain::keysinterface::EntropySource;
 let scorer = $crate::util::test_utils::TestScorer::with_penalty(0);
 let scorer = $crate::util::test_utils::TestScorer::new();
 let keys_manager = $crate::util::test_utils::TestKeysInterface::new(&[0u8; 32], bitcoin::network::constants::Network::Testnet);
 let random_seed_bytes = keys_manager.get_secure_random_bytes();
 $crate::routing::router::get_route(
Expand DownExpand Up@@ -2124,7 +2126,7 @@ pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_rou
	let payment_params = PaymentParameters::from_node_id(expected_route.last().unwrap().node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(expected_route.last().unwrap().node.invoice_features());
	let network_graph = origin_node.network_graph.read_only();
	let scorer = test_utils::TestScorer::with_penalty(0);
	let scorer = test_utils::TestScorer::new();
	let seed = [0u8; 32];
	let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
	let random_seed_bytes = keys_manager.get_secure_random_bytes();
Expand DownExpand Up@@ -2289,8 +2291,9 @@ pub fn create_chanmon_cfgs(node_count: usize) -> Vec<TestChanMonCfg> {
 let persister = test_utils::TestPersister::new();
 let seed = [i as u8; 32];
 let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
 let scorer = Mutex::new(test_utils::TestScorer::new());

 chan_mon_cfgs.push(TestChanMonCfg { tx_broadcaster, fee_estimator, chain_source, logger, persister, keys_manager });
 chan_mon_cfgs.push(TestChanMonCfg { tx_broadcaster, fee_estimator, chain_source, logger, persister, keys_manager, scorer });
	}

	chan_mon_cfgs
Expand All@@ -2308,7 +2311,7 @@ pub fn create_node_cfgs<'a>(node_count: usize, chanmon_cfgs: &'a Vec<TestChanMon
 logger: &chanmon_cfgs[i].logger,
 tx_broadcaster: &chanmon_cfgs[i].tx_broadcaster,
 fee_estimator: &chanmon_cfgs[i].fee_estimator,
 router: test_utils::TestRouter::new(network_graph.clone()),
 router: test_utils::TestRouter::new(network_graph.clone(), &chanmon_cfgs[i].scorer),
 chain_monitor,
 keys_manager: &chanmon_cfgs[i].keys_manager,
 node_seed: seed,
Expand Down

11 changes: 6 additions & 5 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5257,7 +5257,8 @@ fn test_key_derivation_params() {
	let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
	let chain_monitor = test_utils::TestChainMonitor::new(Some(&chanmon_cfgs[0].chain_source), &chanmon_cfgs[0].tx_broadcaster, &chanmon_cfgs[0].logger, &chanmon_cfgs[0].fee_estimator, &chanmon_cfgs[0].persister, &keys_manager);
	let network_graph = Arc::new(NetworkGraph::new(chanmon_cfgs[0].chain_source.genesis_hash, &chanmon_cfgs[0].logger));
	let router = test_utils::TestRouter::new(network_graph.clone());
	let scorer = Mutex::new(test_utils::TestScorer::new());
	let router = test_utils::TestRouter::new(network_graph.clone(), &scorer);
	let node = NodeCfg { chain_source: &chanmon_cfgs[0].chain_source, logger: &chanmon_cfgs[0].logger, tx_broadcaster: &chanmon_cfgs[0].tx_broadcaster, fee_estimator: &chanmon_cfgs[0].fee_estimator, router, chain_monitor, keys_manager: &keys_manager, network_graph, node_seed: seed, override_init_features: alloc::rc::Rc::new(core::cell::RefCell::new(None)) };
	let mut node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
	node_cfgs.remove(0);
Expand DownExpand Up@@ -6925,7 +6926,7 @@ fn test_check_htlc_underpaying() {
	// Create some initial channels
	create_announced_chan_between_nodes(&nodes, 0, 1);

	let scorer = test_utils::TestScorer::with_penalty(0);
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV).with_features(nodes[1].node.invoice_features());
	let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None, 10_000, TEST_FINAL_CLTV, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
Expand DownExpand Up@@ -7175,7 +7176,7 @@ fn test_bump_penalty_txn_on_revoked_htlcs() {
	let chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1000000, 59000000);
	// Lock HTLC in both directions (using a slightly lower CLTV delay to provide timely RBF bumps)
	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), 50).with_features(nodes[1].node.invoice_features());
	let scorer = test_utils::TestScorer::with_penalty(0);
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None,
 3_000_000, 50, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
Expand DownExpand Up@@ -9186,7 +9187,7 @@ fn test_keysend_payments_to_public_node() {
 final_value_msat: 10000,
 final_cltv_expiry_delta: 40,
	};
	let scorer = test_utils::TestScorer::with_penalty(0);
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let route = find_route(&payer_pubkey, &route_params, &network_graph, None, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();

Expand DownExpand Up@@ -9221,7 +9222,7 @@ fn test_keysend_payments_to_private_node() {
	};
	let network_graph = nodes[0].network_graph.clone();
	let first_hops = nodes[0].node.list_usable_channels();
	let scorer = test_utils::TestScorer::with_penalty(0);
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let route = find_route(
 &payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/onion_route_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -928,7 +928,7 @@ macro_rules! get_phantom_route {
 htlc_maximum_msat: None,
 }
 ])]);
 let scorer = test_utils::TestScorer::with_penalty(0);
 let scorer = test_utils::TestScorer::new();
 let network_graph = $nodes[0].network_graph.read_only();
 (get_route(
 &$nodes[0].node.get_our_node_id(), &payment_params, &network_graph,
Expand Down
Loading

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

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

 Merged

TheBlueMatt
merged 3 commits into

from

Feb 15, 2023
 Merged


Fix and test in-flight HTLC scoring in between retries #2020
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
aa4b429

test_utils: parameterize TestRouter by TestScorer


valentinewallace Feb 7, 2023
825ea9d

Fix computing in-flight HTLCs in between retries + test


valentinewallace Feb 7, 2023
2b2965f

Remove unnecessary scoring methods from Router trait


valentinewallace Feb 9, 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


4 changes: 0 additions & 4 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -97,10 +97,6 @@ impl Router for FuzzRouter {
 action: msgs::ErrorAction::IgnoreError
 })
	}
	fn notify_payment_path_failed(&self, _path: &[&RouteHop], _short_channel_id: u64) {}
	fn notify_payment_path_successful(&self, _path: &[&RouteHop]) {}
	fn notify_payment_probe_successful(&self, _path: &[&RouteHop]) {}
	fn notify_payment_probe_failed(&self, _path: &[&RouteHop], _short_channel_id: u64) {}
}

pub struct TestBroadcaster {}
Expand Down

4 changes: 0 additions & 4 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -140,10 +140,6 @@ impl Router for FuzzRouter {
 action: msgs::ErrorAction::IgnoreError
 })
	}
	fn notify_payment_path_failed(&self, _path: &[&RouteHop], _short_channel_id: u64) {}
	fn notify_payment_path_successful(&self, _path: &[&RouteHop]) {}
	fn notify_payment_probe_successful(&self, _path: &[&RouteHop]) {}
	fn notify_payment_probe_failed(&self, _path: &[&RouteHop], _short_channel_id: u64) {}
}

struct TestBroadcaster {
Expand Down

4 changes: 2 additions & 2 deletions
lightning-invoice/src/utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -691,7 +691,7 @@ mod test {
 let first_hops = nodes[0].node.list_usable_channels();
 let network_graph = &node_cfgs[0].network_graph;
 let logger = test_utils::TestLogger::new();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let scorer = test_utils::TestScorer::new();
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &route_params, &network_graph,
Expand DownExpand Up@@ -1055,7 +1055,7 @@ mod test {
 let first_hops = nodes[0].node.list_usable_channels();
 let network_graph = &node_cfgs[0].network_graph;
 let logger = test_utils::TestLogger::new();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let scorer = test_utils::TestScorer::new();
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &params, &network_graph,
Expand Down

15 changes: 8 additions & 7 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2546,7 +2546,7 @@ where
 let best_block_height = self.best_block.read().unwrap().height();
 self.pending_outbound_payments
 .send_payment(payment_hash, payment_secret, payment_id, retry_strategy, route_params,
 &self.router, self.list_usable_channels(), self.compute_inflight_htlcs(),
 &self.router, self.list_usable_channels(), || self.compute_inflight_htlcs(),
 &self.entropy_source, &self.node_signer, best_block_height, &self.logger,
 |path, payment_params, payment_hash, payment_secret, total_value, cur_height, payment_id, keysend_preimage, session_priv|
 self.send_payment_along_path(path, payment_params, payment_hash, payment_secret, total_value, cur_height, payment_id, keysend_preimage, session_priv))
Expand DownExpand Up@@ -2646,7 +2646,7 @@ where
 let best_block_height = self.best_block.read().unwrap().height();
 self.pending_outbound_payments.send_spontaneous_payment(payment_preimage, payment_id,
 retry_strategy, route_params, &self.router, self.list_usable_channels(),
 self.compute_inflight_htlcs(), &self.entropy_source, &self.node_signer, best_block_height,
|| self.compute_inflight_htlcs(), &self.entropy_source, &self.node_signer, best_block_height,
 &self.logger,
 |path, payment_params, payment_hash, payment_secret, total_value, cur_height, payment_id, keysend_preimage, session_priv|
 self.send_payment_along_path(path, payment_params, payment_hash, payment_secret, total_value, cur_height, payment_id, keysend_preimage, session_priv))
Expand DownExpand Up@@ -7966,7 +7966,7 @@ mod tests {
 let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
 let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
 create_announced_chan_between_nodes(&nodes, 0, 1);
 let scorer = test_utils::TestScorer::with_penalty(0);
 let scorer = test_utils::TestScorer::new();
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();

 // To start (1), send a regular payment but don't claim it.
Expand DownExpand Up@@ -8074,7 +8074,7 @@ mod tests {
 };
 let network_graph = nodes[0].network_graph.clone();
 let first_hops = nodes[0].node.list_usable_channels();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let scorer = test_utils::TestScorer::new();
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
Expand DownExpand Up@@ -8119,7 +8119,7 @@ mod tests {
 };
 let network_graph = nodes[0].network_graph.clone();
 let first_hops = nodes[0].node.list_usable_channels();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let scorer = test_utils::TestScorer::new();
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
Expand DownExpand Up@@ -8589,7 +8589,8 @@ pub mod bench {
 let tx_broadcaster = test_utils::TestBroadcaster{txn_broadcasted: Mutex::new(Vec::new()), blocks: Arc::new(Mutex::new(Vec::new()))};
 let fee_estimator = test_utils::TestFeeEstimator { sat_per_kw: Mutex::new(253) };
 let logger_a = test_utils::TestLogger::with_id("node a".to_owned());
 let router = test_utils::TestRouter::new(Arc::new(NetworkGraph::new(genesis_hash, &logger_a)));
 let scorer = Mutex::new(test_utils::TestScorer::new());
 let router = test_utils::TestRouter::new(Arc::new(NetworkGraph::new(genesis_hash, &logger_a)), &scorer);

 let mut config: UserConfig = Default::default();
 config.channel_handshake_config.minimum_depth = 1;
Expand DownExpand Up@@ -8680,7 +8681,7 @@ pub mod bench {
 let usable_channels = $node_a.list_usable_channels();
 let payment_params = PaymentParameters::from_node_id($node_b.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features($node_b.invoice_features());
 let scorer = test_utils::TestScorer::with_penalty(0);
 let scorer = test_utils::TestScorer::new();
 let seed = [3u8; 32];
 let keys_manager = KeysManager::new(&seed, 42, 42);
 let random_seed_bytes = keys_manager.get_secure_random_bytes();
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -305,6 +305,7 @@ pub struct TestChanMonCfg {
	pub persister: test_utils::TestPersister,
	pub logger: test_utils::TestLogger,
	pub keys_manager: test_utils::TestKeysInterface,
	pub scorer: Mutex<test_utils::TestScorer>,
}

pub struct NodeCfg<'a> {
Expand DownExpand Up@@ -427,6 +428,7 @@ impl<'a, 'b, 'c> Drop for Node<'a, 'b, 'c> {
 channel_monitors.insert(monitor.get_funding_txo().0, monitor);
 }

 let scorer = Mutex::new(test_utils::TestScorer::new());
 let mut w = test_utils::TestVecWriter(Vec::new());
 self.node.write(&mut w).unwrap();
 <(BlockHash, ChannelManager<&test_utils::TestChainMonitor, &test_utils::TestBroadcaster, &test_utils::TestKeysInterface, &test_utils::TestKeysInterface, &test_utils::TestKeysInterface, &test_utils::TestFeeEstimator, &test_utils::TestRouter, &test_utils::TestLogger>)>::read(&mut io::Cursor::new(w.0), ChannelManagerReadArgs {
Expand All@@ -435,7 +437,7 @@ impl<'a, 'b, 'c> Drop for Node<'a, 'b, 'c> {
 node_signer: self.keys_manager,
 signer_provider: self.keys_manager,
 fee_estimator: &test_utils::TestFeeEstimator { sat_per_kw: Mutex::new(253) },
 router: &test_utils::TestRouter::new(Arc::new(network_graph)),
 router: &test_utils::TestRouter::new(Arc::new(network_graph), &scorer),
 chain_monitor: self.chain_monitor,
 tx_broadcaster: &broadcaster,
 logger: &self.logger,
Expand DownExpand Up@@ -1570,7 +1572,7 @@ macro_rules! get_payment_preimage_hash {
macro_rules! get_route {
	($send_node: expr, $payment_params: expr, $recv_value: expr, $cltv: expr) => {{
 use $crate::chain::keysinterface::EntropySource;
 let scorer = $crate::util::test_utils::TestScorer::with_penalty(0);
 let scorer = $crate::util::test_utils::TestScorer::new();
 let keys_manager = $crate::util::test_utils::TestKeysInterface::new(&[0u8; 32], bitcoin::network::constants::Network::Testnet);
 let random_seed_bytes = keys_manager.get_secure_random_bytes();
 $crate::routing::router::get_route(
Expand DownExpand Up@@ -2124,7 +2126,7 @@ pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_rou
	let payment_params = PaymentParameters::from_node_id(expected_route.last().unwrap().node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(expected_route.last().unwrap().node.invoice_features());
	let network_graph = origin_node.network_graph.read_only();
	let scorer = test_utils::TestScorer::with_penalty(0);
	let scorer = test_utils::TestScorer::new();
	let seed = [0u8; 32];
	let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
	let random_seed_bytes = keys_manager.get_secure_random_bytes();
Expand DownExpand Up@@ -2289,8 +2291,9 @@ pub fn create_chanmon_cfgs(node_count: usize) -> Vec<TestChanMonCfg> {
 let persister = test_utils::TestPersister::new();
 let seed = [i as u8; 32];
 let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
 let scorer = Mutex::new(test_utils::TestScorer::new());

 chan_mon_cfgs.push(TestChanMonCfg { tx_broadcaster, fee_estimator, chain_source, logger, persister, keys_manager });
 chan_mon_cfgs.push(TestChanMonCfg { tx_broadcaster, fee_estimator, chain_source, logger, persister, keys_manager, scorer });
	}

	chan_mon_cfgs
Expand All@@ -2308,7 +2311,7 @@ pub fn create_node_cfgs<'a>(node_count: usize, chanmon_cfgs: &'a Vec<TestChanMon
 logger: &chanmon_cfgs[i].logger,
 tx_broadcaster: &chanmon_cfgs[i].tx_broadcaster,
 fee_estimator: &chanmon_cfgs[i].fee_estimator,
 router: test_utils::TestRouter::new(network_graph.clone()),
 router: test_utils::TestRouter::new(network_graph.clone(), &chanmon_cfgs[i].scorer),
 chain_monitor,
 keys_manager: &chanmon_cfgs[i].keys_manager,
 node_seed: seed,
Expand Down

11 changes: 6 additions & 5 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5257,7 +5257,8 @@ fn test_key_derivation_params() {
	let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
	let chain_monitor = test_utils::TestChainMonitor::new(Some(&chanmon_cfgs[0].chain_source), &chanmon_cfgs[0].tx_broadcaster, &chanmon_cfgs[0].logger, &chanmon_cfgs[0].fee_estimator, &chanmon_cfgs[0].persister, &keys_manager);
	let network_graph = Arc::new(NetworkGraph::new(chanmon_cfgs[0].chain_source.genesis_hash, &chanmon_cfgs[0].logger));
	let router = test_utils::TestRouter::new(network_graph.clone());
	let scorer = Mutex::new(test_utils::TestScorer::new());
	let router = test_utils::TestRouter::new(network_graph.clone(), &scorer);
	let node = NodeCfg { chain_source: &chanmon_cfgs[0].chain_source, logger: &chanmon_cfgs[0].logger, tx_broadcaster: &chanmon_cfgs[0].tx_broadcaster, fee_estimator: &chanmon_cfgs[0].fee_estimator, router, chain_monitor, keys_manager: &keys_manager, network_graph, node_seed: seed, override_init_features: alloc::rc::Rc::new(core::cell::RefCell::new(None)) };
	let mut node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
	node_cfgs.remove(0);
Expand DownExpand Up@@ -6925,7 +6926,7 @@ fn test_check_htlc_underpaying() {
	// Create some initial channels
	create_announced_chan_between_nodes(&nodes, 0, 1);

	let scorer = test_utils::TestScorer::with_penalty(0);
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV).with_features(nodes[1].node.invoice_features());
	let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None, 10_000, TEST_FINAL_CLTV, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
Expand DownExpand Up@@ -7175,7 +7176,7 @@ fn test_bump_penalty_txn_on_revoked_htlcs() {
	let chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1000000, 59000000);
	// Lock HTLC in both directions (using a slightly lower CLTV delay to provide timely RBF bumps)
	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), 50).with_features(nodes[1].node.invoice_features());
	let scorer = test_utils::TestScorer::with_penalty(0);
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None,
 3_000_000, 50, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
Expand DownExpand Up@@ -9186,7 +9187,7 @@ fn test_keysend_payments_to_public_node() {
 final_value_msat: 10000,
 final_cltv_expiry_delta: 40,
	};
	let scorer = test_utils::TestScorer::with_penalty(0);
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let route = find_route(&payer_pubkey, &route_params, &network_graph, None, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();

Expand DownExpand Up@@ -9221,7 +9222,7 @@ fn test_keysend_payments_to_private_node() {
	};
	let network_graph = nodes[0].network_graph.clone();
	let first_hops = nodes[0].node.list_usable_channels();
	let scorer = test_utils::TestScorer::with_penalty(0);
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let route = find_route(
 &payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/onion_route_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -928,7 +928,7 @@ macro_rules! get_phantom_route {
 htlc_maximum_msat: None,
 }
 ])]);
 let scorer = test_utils::TestScorer::with_penalty(0);
 let scorer = test_utils::TestScorer::new();
 let network_graph = $nodes[0].network_graph.read_only();
 (get_route(
 &$nodes[0].node.get_our_node_id(), &payment_params, &network_graph,
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Fix and test in-flight HTLC scoring in between retries by valentinewallace · Pull Request #2020 · lightningdevkit/rust-lightning · GitHub
Skip to content
Fix and test in-flight HTLC scoring in between retries #2020

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

 Merged

TheBlueMatt
merged 3 commits into

from

Feb 15, 2023
 Merged


Fix and test in-flight HTLC scoring in between retries #2020
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
aa4b429

test_utils: parameterize TestRouter by TestScorer


valentinewallace Feb 7, 2023
825ea9d

Fix computing in-flight HTLCs in between retries + test


valentinewallace Feb 7, 2023
2b2965f

Remove unnecessary scoring methods from Router trait


valentinewallace Feb 9, 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


4 changes: 0 additions & 4 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -97,10 +97,6 @@ impl Router for FuzzRouter {
 action: msgs::ErrorAction::IgnoreError
 })
	}
	fn notify_payment_path_failed(&self, _path: &[&RouteHop], _short_channel_id: u64) {}
	fn notify_payment_path_successful(&self, _path: &[&RouteHop]) {}
	fn notify_payment_probe_successful(&self, _path: &[&RouteHop]) {}
	fn notify_payment_probe_failed(&self, _path: &[&RouteHop], _short_channel_id: u64) {}
}

pub struct TestBroadcaster {}
Expand Down

4 changes: 0 additions & 4 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -140,10 +140,6 @@ impl Router for FuzzRouter {
 action: msgs::ErrorAction::IgnoreError
 })
	}
	fn notify_payment_path_failed(&self, _path: &[&RouteHop], _short_channel_id: u64) {}
	fn notify_payment_path_successful(&self, _path: &[&RouteHop]) {}
	fn notify_payment_probe_successful(&self, _path: &[&RouteHop]) {}
	fn notify_payment_probe_failed(&self, _path: &[&RouteHop], _short_channel_id: u64) {}
}

struct TestBroadcaster {
Expand Down

4 changes: 2 additions & 2 deletions
lightning-invoice/src/utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -691,7 +691,7 @@ mod test {
 let first_hops = nodes[0].node.list_usable_channels();
 let network_graph = &node_cfgs[0].network_graph;
 let logger = test_utils::TestLogger::new();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let scorer = test_utils::TestScorer::new();
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &route_params, &network_graph,
Expand DownExpand Up@@ -1055,7 +1055,7 @@ mod test {
 let first_hops = nodes[0].node.list_usable_channels();
 let network_graph = &node_cfgs[0].network_graph;
 let logger = test_utils::TestLogger::new();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let scorer = test_utils::TestScorer::new();
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &params, &network_graph,
Expand Down

15 changes: 8 additions & 7 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2546,7 +2546,7 @@ where
 let best_block_height = self.best_block.read().unwrap().height();
 self.pending_outbound_payments
 .send_payment(payment_hash, payment_secret, payment_id, retry_strategy, route_params,
 &self.router, self.list_usable_channels(), self.compute_inflight_htlcs(),
 &self.router, self.list_usable_channels(), || self.compute_inflight_htlcs(),
 &self.entropy_source, &self.node_signer, best_block_height, &self.logger,
 |path, payment_params, payment_hash, payment_secret, total_value, cur_height, payment_id, keysend_preimage, session_priv|
 self.send_payment_along_path(path, payment_params, payment_hash, payment_secret, total_value, cur_height, payment_id, keysend_preimage, session_priv))
Expand DownExpand Up@@ -2646,7 +2646,7 @@ where
 let best_block_height = self.best_block.read().unwrap().height();
 self.pending_outbound_payments.send_spontaneous_payment(payment_preimage, payment_id,
 retry_strategy, route_params, &self.router, self.list_usable_channels(),
 self.compute_inflight_htlcs(), &self.entropy_source, &self.node_signer, best_block_height,
|| self.compute_inflight_htlcs(), &self.entropy_source, &self.node_signer, best_block_height,
 &self.logger,
 |path, payment_params, payment_hash, payment_secret, total_value, cur_height, payment_id, keysend_preimage, session_priv|
 self.send_payment_along_path(path, payment_params, payment_hash, payment_secret, total_value, cur_height, payment_id, keysend_preimage, session_priv))
Expand DownExpand Up@@ -7966,7 +7966,7 @@ mod tests {
 let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
 let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
 create_announced_chan_between_nodes(&nodes, 0, 1);
 let scorer = test_utils::TestScorer::with_penalty(0);
 let scorer = test_utils::TestScorer::new();
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();

 // To start (1), send a regular payment but don't claim it.
Expand DownExpand Up@@ -8074,7 +8074,7 @@ mod tests {
 };
 let network_graph = nodes[0].network_graph.clone();
 let first_hops = nodes[0].node.list_usable_channels();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let scorer = test_utils::TestScorer::new();
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
Expand DownExpand Up@@ -8119,7 +8119,7 @@ mod tests {
 };
 let network_graph = nodes[0].network_graph.clone();
 let first_hops = nodes[0].node.list_usable_channels();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let scorer = test_utils::TestScorer::new();
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
Expand DownExpand Up@@ -8589,7 +8589,8 @@ pub mod bench {
 let tx_broadcaster = test_utils::TestBroadcaster{txn_broadcasted: Mutex::new(Vec::new()), blocks: Arc::new(Mutex::new(Vec::new()))};
 let fee_estimator = test_utils::TestFeeEstimator { sat_per_kw: Mutex::new(253) };
 let logger_a = test_utils::TestLogger::with_id("node a".to_owned());
 let router = test_utils::TestRouter::new(Arc::new(NetworkGraph::new(genesis_hash, &logger_a)));
 let scorer = Mutex::new(test_utils::TestScorer::new());
 let router = test_utils::TestRouter::new(Arc::new(NetworkGraph::new(genesis_hash, &logger_a)), &scorer);

 let mut config: UserConfig = Default::default();
 config.channel_handshake_config.minimum_depth = 1;
Expand DownExpand Up@@ -8680,7 +8681,7 @@ pub mod bench {
 let usable_channels = $node_a.list_usable_channels();
 let payment_params = PaymentParameters::from_node_id($node_b.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features($node_b.invoice_features());
 let scorer = test_utils::TestScorer::with_penalty(0);
 let scorer = test_utils::TestScorer::new();
 let seed = [3u8; 32];
 let keys_manager = KeysManager::new(&seed, 42, 42);
 let random_seed_bytes = keys_manager.get_secure_random_bytes();
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -305,6 +305,7 @@ pub struct TestChanMonCfg {
	pub persister: test_utils::TestPersister,
	pub logger: test_utils::TestLogger,
	pub keys_manager: test_utils::TestKeysInterface,
	pub scorer: Mutex<test_utils::TestScorer>,
}

pub struct NodeCfg<'a> {
Expand DownExpand Up@@ -427,6 +428,7 @@ impl<'a, 'b, 'c> Drop for Node<'a, 'b, 'c> {
 channel_monitors.insert(monitor.get_funding_txo().0, monitor);
 }

 let scorer = Mutex::new(test_utils::TestScorer::new());
 let mut w = test_utils::TestVecWriter(Vec::new());
 self.node.write(&mut w).unwrap();
 <(BlockHash, ChannelManager<&test_utils::TestChainMonitor, &test_utils::TestBroadcaster, &test_utils::TestKeysInterface, &test_utils::TestKeysInterface, &test_utils::TestKeysInterface, &test_utils::TestFeeEstimator, &test_utils::TestRouter, &test_utils::TestLogger>)>::read(&mut io::Cursor::new(w.0), ChannelManagerReadArgs {
Expand All@@ -435,7 +437,7 @@ impl<'a, 'b, 'c> Drop for Node<'a, 'b, 'c> {
 node_signer: self.keys_manager,
 signer_provider: self.keys_manager,
 fee_estimator: &test_utils::TestFeeEstimator { sat_per_kw: Mutex::new(253) },
 router: &test_utils::TestRouter::new(Arc::new(network_graph)),
 router: &test_utils::TestRouter::new(Arc::new(network_graph), &scorer),
 chain_monitor: self.chain_monitor,
 tx_broadcaster: &broadcaster,
 logger: &self.logger,
Expand DownExpand Up@@ -1570,7 +1572,7 @@ macro_rules! get_payment_preimage_hash {
macro_rules! get_route {
	($send_node: expr, $payment_params: expr, $recv_value: expr, $cltv: expr) => {{
 use $crate::chain::keysinterface::EntropySource;
 let scorer = $crate::util::test_utils::TestScorer::with_penalty(0);
 let scorer = $crate::util::test_utils::TestScorer::new();
 let keys_manager = $crate::util::test_utils::TestKeysInterface::new(&[0u8; 32], bitcoin::network::constants::Network::Testnet);
 let random_seed_bytes = keys_manager.get_secure_random_bytes();
 $crate::routing::router::get_route(
Expand DownExpand Up@@ -2124,7 +2126,7 @@ pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_rou
	let payment_params = PaymentParameters::from_node_id(expected_route.last().unwrap().node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(expected_route.last().unwrap().node.invoice_features());
	let network_graph = origin_node.network_graph.read_only();
	let scorer = test_utils::TestScorer::with_penalty(0);
	let scorer = test_utils::TestScorer::new();
	let seed = [0u8; 32];
	let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
	let random_seed_bytes = keys_manager.get_secure_random_bytes();
Expand DownExpand Up@@ -2289,8 +2291,9 @@ pub fn create_chanmon_cfgs(node_count: usize) -> Vec<TestChanMonCfg> {
 let persister = test_utils::TestPersister::new();
 let seed = [i as u8; 32];
 let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
 let scorer = Mutex::new(test_utils::TestScorer::new());

 chan_mon_cfgs.push(TestChanMonCfg { tx_broadcaster, fee_estimator, chain_source, logger, persister, keys_manager });
 chan_mon_cfgs.push(TestChanMonCfg { tx_broadcaster, fee_estimator, chain_source, logger, persister, keys_manager, scorer });
	}

	chan_mon_cfgs
Expand All@@ -2308,7 +2311,7 @@ pub fn create_node_cfgs<'a>(node_count: usize, chanmon_cfgs: &'a Vec<TestChanMon
 logger: &chanmon_cfgs[i].logger,
 tx_broadcaster: &chanmon_cfgs[i].tx_broadcaster,
 fee_estimator: &chanmon_cfgs[i].fee_estimator,
 router: test_utils::TestRouter::new(network_graph.clone()),
 router: test_utils::TestRouter::new(network_graph.clone(), &chanmon_cfgs[i].scorer),
 chain_monitor,
 keys_manager: &chanmon_cfgs[i].keys_manager,
 node_seed: seed,
Expand Down

11 changes: 6 additions & 5 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5257,7 +5257,8 @@ fn test_key_derivation_params() {
	let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
	let chain_monitor = test_utils::TestChainMonitor::new(Some(&chanmon_cfgs[0].chain_source), &chanmon_cfgs[0].tx_broadcaster, &chanmon_cfgs[0].logger, &chanmon_cfgs[0].fee_estimator, &chanmon_cfgs[0].persister, &keys_manager);
	let network_graph = Arc::new(NetworkGraph::new(chanmon_cfgs[0].chain_source.genesis_hash, &chanmon_cfgs[0].logger));
	let router = test_utils::TestRouter::new(network_graph.clone());
	let scorer = Mutex::new(test_utils::TestScorer::new());
	let router = test_utils::TestRouter::new(network_graph.clone(), &scorer);
	let node = NodeCfg { chain_source: &chanmon_cfgs[0].chain_source, logger: &chanmon_cfgs[0].logger, tx_broadcaster: &chanmon_cfgs[0].tx_broadcaster, fee_estimator: &chanmon_cfgs[0].fee_estimator, router, chain_monitor, keys_manager: &keys_manager, network_graph, node_seed: seed, override_init_features: alloc::rc::Rc::new(core::cell::RefCell::new(None)) };
	let mut node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
	node_cfgs.remove(0);
Expand DownExpand Up@@ -6925,7 +6926,7 @@ fn test_check_htlc_underpaying() {
	// Create some initial channels
	create_announced_chan_between_nodes(&nodes, 0, 1);

	let scorer = test_utils::TestScorer::with_penalty(0);
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV).with_features(nodes[1].node.invoice_features());
	let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None, 10_000, TEST_FINAL_CLTV, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
Expand DownExpand Up@@ -7175,7 +7176,7 @@ fn test_bump_penalty_txn_on_revoked_htlcs() {
	let chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1000000, 59000000);
	// Lock HTLC in both directions (using a slightly lower CLTV delay to provide timely RBF bumps)
	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), 50).with_features(nodes[1].node.invoice_features());
	let scorer = test_utils::TestScorer::with_penalty(0);
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None,
 3_000_000, 50, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
Expand DownExpand Up@@ -9186,7 +9187,7 @@ fn test_keysend_payments_to_public_node() {
 final_value_msat: 10000,
 final_cltv_expiry_delta: 40,
	};
	let scorer = test_utils::TestScorer::with_penalty(0);
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let route = find_route(&payer_pubkey, &route_params, &network_graph, None, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();

Expand DownExpand Up@@ -9221,7 +9222,7 @@ fn test_keysend_payments_to_private_node() {
	};
	let network_graph = nodes[0].network_graph.clone();
	let first_hops = nodes[0].node.list_usable_channels();
	let scorer = test_utils::TestScorer::with_penalty(0);
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let route = find_route(
 &payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/onion_route_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -928,7 +928,7 @@ macro_rules! get_phantom_route {
 htlc_maximum_msat: None,
 }
 ])]);
 let scorer = test_utils::TestScorer::with_penalty(0);
 let scorer = test_utils::TestScorer::new();
 let network_graph = $nodes[0].network_graph.read_only();
 (get_route(
 &$nodes[0].node.get_our_node_id(), &payment_params, &network_graph,
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Fix and test in-flight HTLC scoring in between retries by valentinewallace · Pull Request #2020 · lightningdevkit/rust-lightning · GitHub
Skip to content
Fix and test in-flight HTLC scoring in between retries #2020

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

 Merged

TheBlueMatt
merged 3 commits into

from

Feb 15, 2023
 Merged


Fix and test in-flight HTLC scoring in between retries #2020
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
aa4b429

test_utils: parameterize TestRouter by TestScorer


valentinewallace Feb 7, 2023
825ea9d

Fix computing in-flight HTLCs in between retries + test


valentinewallace Feb 7, 2023
2b2965f

Remove unnecessary scoring methods from Router trait


valentinewallace Feb 9, 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


4 changes: 0 additions & 4 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -97,10 +97,6 @@ impl Router for FuzzRouter {
 action: msgs::ErrorAction::IgnoreError
 })
	}
	fn notify_payment_path_failed(&self, _path: &[&RouteHop], _short_channel_id: u64) {}
	fn notify_payment_path_successful(&self, _path: &[&RouteHop]) {}
	fn notify_payment_probe_successful(&self, _path: &[&RouteHop]) {}
	fn notify_payment_probe_failed(&self, _path: &[&RouteHop], _short_channel_id: u64) {}
}

pub struct TestBroadcaster {}
Expand Down

4 changes: 0 additions & 4 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -140,10 +140,6 @@ impl Router for FuzzRouter {
 action: msgs::ErrorAction::IgnoreError
 })
	}
	fn notify_payment_path_failed(&self, _path: &[&RouteHop], _short_channel_id: u64) {}
	fn notify_payment_path_successful(&self, _path: &[&RouteHop]) {}
	fn notify_payment_probe_successful(&self, _path: &[&RouteHop]) {}
	fn notify_payment_probe_failed(&self, _path: &[&RouteHop], _short_channel_id: u64) {}
}

struct TestBroadcaster {
Expand Down

4 changes: 2 additions & 2 deletions
lightning-invoice/src/utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -691,7 +691,7 @@ mod test {
 let first_hops = nodes[0].node.list_usable_channels();
 let network_graph = &node_cfgs[0].network_graph;
 let logger = test_utils::TestLogger::new();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let scorer = test_utils::TestScorer::new();
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &route_params, &network_graph,
Expand DownExpand Up@@ -1055,7 +1055,7 @@ mod test {
 let first_hops = nodes[0].node.list_usable_channels();
 let network_graph = &node_cfgs[0].network_graph;
 let logger = test_utils::TestLogger::new();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let scorer = test_utils::TestScorer::new();
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &params, &network_graph,
Expand Down

15 changes: 8 additions & 7 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2546,7 +2546,7 @@ where
 let best_block_height = self.best_block.read().unwrap().height();
 self.pending_outbound_payments
 .send_payment(payment_hash, payment_secret, payment_id, retry_strategy, route_params,
 &self.router, self.list_usable_channels(), self.compute_inflight_htlcs(),
 &self.router, self.list_usable_channels(), || self.compute_inflight_htlcs(),
 &self.entropy_source, &self.node_signer, best_block_height, &self.logger,
 |path, payment_params, payment_hash, payment_secret, total_value, cur_height, payment_id, keysend_preimage, session_priv|
 self.send_payment_along_path(path, payment_params, payment_hash, payment_secret, total_value, cur_height, payment_id, keysend_preimage, session_priv))
Expand DownExpand Up@@ -2646,7 +2646,7 @@ where
 let best_block_height = self.best_block.read().unwrap().height();
 self.pending_outbound_payments.send_spontaneous_payment(payment_preimage, payment_id,
 retry_strategy, route_params, &self.router, self.list_usable_channels(),
 self.compute_inflight_htlcs(), &self.entropy_source, &self.node_signer, best_block_height,
|| self.compute_inflight_htlcs(), &self.entropy_source, &self.node_signer, best_block_height,
 &self.logger,
 |path, payment_params, payment_hash, payment_secret, total_value, cur_height, payment_id, keysend_preimage, session_priv|
 self.send_payment_along_path(path, payment_params, payment_hash, payment_secret, total_value, cur_height, payment_id, keysend_preimage, session_priv))
Expand DownExpand Up@@ -7966,7 +7966,7 @@ mod tests {
 let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
 let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
 create_announced_chan_between_nodes(&nodes, 0, 1);
 let scorer = test_utils::TestScorer::with_penalty(0);
 let scorer = test_utils::TestScorer::new();
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();

 // To start (1), send a regular payment but don't claim it.
Expand DownExpand Up@@ -8074,7 +8074,7 @@ mod tests {
 };
 let network_graph = nodes[0].network_graph.clone();
 let first_hops = nodes[0].node.list_usable_channels();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let scorer = test_utils::TestScorer::new();
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
Expand DownExpand Up@@ -8119,7 +8119,7 @@ mod tests {
 };
 let network_graph = nodes[0].network_graph.clone();
 let first_hops = nodes[0].node.list_usable_channels();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let scorer = test_utils::TestScorer::new();
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
Expand DownExpand Up@@ -8589,7 +8589,8 @@ pub mod bench {
 let tx_broadcaster = test_utils::TestBroadcaster{txn_broadcasted: Mutex::new(Vec::new()), blocks: Arc::new(Mutex::new(Vec::new()))};
 let fee_estimator = test_utils::TestFeeEstimator { sat_per_kw: Mutex::new(253) };
 let logger_a = test_utils::TestLogger::with_id("node a".to_owned());
 let router = test_utils::TestRouter::new(Arc::new(NetworkGraph::new(genesis_hash, &logger_a)));
 let scorer = Mutex::new(test_utils::TestScorer::new());
 let router = test_utils::TestRouter::new(Arc::new(NetworkGraph::new(genesis_hash, &logger_a)), &scorer);

 let mut config: UserConfig = Default::default();
 config.channel_handshake_config.minimum_depth = 1;
Expand DownExpand Up@@ -8680,7 +8681,7 @@ pub mod bench {
 let usable_channels = $node_a.list_usable_channels();
 let payment_params = PaymentParameters::from_node_id($node_b.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features($node_b.invoice_features());
 let scorer = test_utils::TestScorer::with_penalty(0);
 let scorer = test_utils::TestScorer::new();
 let seed = [3u8; 32];
 let keys_manager = KeysManager::new(&seed, 42, 42);
 let random_seed_bytes = keys_manager.get_secure_random_bytes();
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -305,6 +305,7 @@ pub struct TestChanMonCfg {
	pub persister: test_utils::TestPersister,
	pub logger: test_utils::TestLogger,
	pub keys_manager: test_utils::TestKeysInterface,
	pub scorer: Mutex<test_utils::TestScorer>,
}

pub struct NodeCfg<'a> {
Expand DownExpand Up@@ -427,6 +428,7 @@ impl<'a, 'b, 'c> Drop for Node<'a, 'b, 'c> {
 channel_monitors.insert(monitor.get_funding_txo().0, monitor);
 }

 let scorer = Mutex::new(test_utils::TestScorer::new());
 let mut w = test_utils::TestVecWriter(Vec::new());
 self.node.write(&mut w).unwrap();
 <(BlockHash, ChannelManager<&test_utils::TestChainMonitor, &test_utils::TestBroadcaster, &test_utils::TestKeysInterface, &test_utils::TestKeysInterface, &test_utils::TestKeysInterface, &test_utils::TestFeeEstimator, &test_utils::TestRouter, &test_utils::TestLogger>)>::read(&mut io::Cursor::new(w.0), ChannelManagerReadArgs {
Expand All@@ -435,7 +437,7 @@ impl<'a, 'b, 'c> Drop for Node<'a, 'b, 'c> {
 node_signer: self.keys_manager,
 signer_provider: self.keys_manager,
 fee_estimator: &test_utils::TestFeeEstimator { sat_per_kw: Mutex::new(253) },
 router: &test_utils::TestRouter::new(Arc::new(network_graph)),
 router: &test_utils::TestRouter::new(Arc::new(network_graph), &scorer),
 chain_monitor: self.chain_monitor,
 tx_broadcaster: &broadcaster,
 logger: &self.logger,
Expand DownExpand Up@@ -1570,7 +1572,7 @@ macro_rules! get_payment_preimage_hash {
macro_rules! get_route {
	($send_node: expr, $payment_params: expr, $recv_value: expr, $cltv: expr) => {{
 use $crate::chain::keysinterface::EntropySource;
 let scorer = $crate::util::test_utils::TestScorer::with_penalty(0);
 let scorer = $crate::util::test_utils::TestScorer::new();
 let keys_manager = $crate::util::test_utils::TestKeysInterface::new(&[0u8; 32], bitcoin::network::constants::Network::Testnet);
 let random_seed_bytes = keys_manager.get_secure_random_bytes();
 $crate::routing::router::get_route(
Expand DownExpand Up@@ -2124,7 +2126,7 @@ pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_rou
	let payment_params = PaymentParameters::from_node_id(expected_route.last().unwrap().node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(expected_route.last().unwrap().node.invoice_features());
	let network_graph = origin_node.network_graph.read_only();
	let scorer = test_utils::TestScorer::with_penalty(0);
	let scorer = test_utils::TestScorer::new();
	let seed = [0u8; 32];
	let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
	let random_seed_bytes = keys_manager.get_secure_random_bytes();
Expand DownExpand Up@@ -2289,8 +2291,9 @@ pub fn create_chanmon_cfgs(node_count: usize) -> Vec<TestChanMonCfg> {
 let persister = test_utils::TestPersister::new();
 let seed = [i as u8; 32];
 let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
 let scorer = Mutex::new(test_utils::TestScorer::new());

 chan_mon_cfgs.push(TestChanMonCfg { tx_broadcaster, fee_estimator, chain_source, logger, persister, keys_manager });
 chan_mon_cfgs.push(TestChanMonCfg { tx_broadcaster, fee_estimator, chain_source, logger, persister, keys_manager, scorer });
	}

	chan_mon_cfgs
Expand All@@ -2308,7 +2311,7 @@ pub fn create_node_cfgs<'a>(node_count: usize, chanmon_cfgs: &'a Vec<TestChanMon
 logger: &chanmon_cfgs[i].logger,
 tx_broadcaster: &chanmon_cfgs[i].tx_broadcaster,
 fee_estimator: &chanmon_cfgs[i].fee_estimator,
 router: test_utils::TestRouter::new(network_graph.clone()),
 router: test_utils::TestRouter::new(network_graph.clone(), &chanmon_cfgs[i].scorer),
 chain_monitor,
 keys_manager: &chanmon_cfgs[i].keys_manager,
 node_seed: seed,
Expand Down

11 changes: 6 additions & 5 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5257,7 +5257,8 @@ fn test_key_derivation_params() {
	let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
	let chain_monitor = test_utils::TestChainMonitor::new(Some(&chanmon_cfgs[0].chain_source), &chanmon_cfgs[0].tx_broadcaster, &chanmon_cfgs[0].logger, &chanmon_cfgs[0].fee_estimator, &chanmon_cfgs[0].persister, &keys_manager);
	let network_graph = Arc::new(NetworkGraph::new(chanmon_cfgs[0].chain_source.genesis_hash, &chanmon_cfgs[0].logger));
	let router = test_utils::TestRouter::new(network_graph.clone());
	let scorer = Mutex::new(test_utils::TestScorer::new());
	let router = test_utils::TestRouter::new(network_graph.clone(), &scorer);
	let node = NodeCfg { chain_source: &chanmon_cfgs[0].chain_source, logger: &chanmon_cfgs[0].logger, tx_broadcaster: &chanmon_cfgs[0].tx_broadcaster, fee_estimator: &chanmon_cfgs[0].fee_estimator, router, chain_monitor, keys_manager: &keys_manager, network_graph, node_seed: seed, override_init_features: alloc::rc::Rc::new(core::cell::RefCell::new(None)) };
	let mut node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
	node_cfgs.remove(0);
Expand DownExpand Up@@ -6925,7 +6926,7 @@ fn test_check_htlc_underpaying() {
	// Create some initial channels
	create_announced_chan_between_nodes(&nodes, 0, 1);

	let scorer = test_utils::TestScorer::with_penalty(0);
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV).with_features(nodes[1].node.invoice_features());
	let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None, 10_000, TEST_FINAL_CLTV, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
Expand DownExpand Up@@ -7175,7 +7176,7 @@ fn test_bump_penalty_txn_on_revoked_htlcs() {
	let chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1000000, 59000000);
	// Lock HTLC in both directions (using a slightly lower CLTV delay to provide timely RBF bumps)
	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), 50).with_features(nodes[1].node.invoice_features());
	let scorer = test_utils::TestScorer::with_penalty(0);
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None,
 3_000_000, 50, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
Expand DownExpand Up@@ -9186,7 +9187,7 @@ fn test_keysend_payments_to_public_node() {
 final_value_msat: 10000,
 final_cltv_expiry_delta: 40,
	};
	let scorer = test_utils::TestScorer::with_penalty(0);
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let route = find_route(&payer_pubkey, &route_params, &network_graph, None, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();

Expand DownExpand Up@@ -9221,7 +9222,7 @@ fn test_keysend_payments_to_private_node() {
	};
	let network_graph = nodes[0].network_graph.clone();
	let first_hops = nodes[0].node.list_usable_channels();
	let scorer = test_utils::TestScorer::with_penalty(0);
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let route = find_route(
 &payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/onion_route_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -928,7 +928,7 @@ macro_rules! get_phantom_route {
 htlc_maximum_msat: None,
 }
 ])]);
 let scorer = test_utils::TestScorer::with_penalty(0);
 let scorer = test_utils::TestScorer::new();
 let network_graph = $nodes[0].network_graph.read_only();
 (get_route(
 &$nodes[0].node.get_our_node_id(), &payment_params, &network_graph,
Expand Down
Loading

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

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

 Merged

TheBlueMatt
merged 3 commits into

from

Feb 15, 2023
 Merged


Fix and test in-flight HTLC scoring in between retries #2020
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
aa4b429

test_utils: parameterize TestRouter by TestScorer


valentinewallace Feb 7, 2023
825ea9d

Fix computing in-flight HTLCs in between retries + test


valentinewallace Feb 7, 2023
2b2965f

Remove unnecessary scoring methods from Router trait


valentinewallace Feb 9, 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


4 changes: 0 additions & 4 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -97,10 +97,6 @@ impl Router for FuzzRouter {
 action: msgs::ErrorAction::IgnoreError
 })
	}
	fn notify_payment_path_failed(&self, _path: &[&RouteHop], _short_channel_id: u64) {}
	fn notify_payment_path_successful(&self, _path: &[&RouteHop]) {}
	fn notify_payment_probe_successful(&self, _path: &[&RouteHop]) {}
	fn notify_payment_probe_failed(&self, _path: &[&RouteHop], _short_channel_id: u64) {}
}

pub struct TestBroadcaster {}
Expand Down

4 changes: 0 additions & 4 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -140,10 +140,6 @@ impl Router for FuzzRouter {
 action: msgs::ErrorAction::IgnoreError
 })
	}
	fn notify_payment_path_failed(&self, _path: &[&RouteHop], _short_channel_id: u64) {}
	fn notify_payment_path_successful(&self, _path: &[&RouteHop]) {}
	fn notify_payment_probe_successful(&self, _path: &[&RouteHop]) {}
	fn notify_payment_probe_failed(&self, _path: &[&RouteHop], _short_channel_id: u64) {}
}

struct TestBroadcaster {
Expand Down

4 changes: 2 additions & 2 deletions
lightning-invoice/src/utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -691,7 +691,7 @@ mod test {
 let first_hops = nodes[0].node.list_usable_channels();
 let network_graph = &node_cfgs[0].network_graph;
 let logger = test_utils::TestLogger::new();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let scorer = test_utils::TestScorer::new();
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &route_params, &network_graph,
Expand DownExpand Up@@ -1055,7 +1055,7 @@ mod test {
 let first_hops = nodes[0].node.list_usable_channels();
 let network_graph = &node_cfgs[0].network_graph;
 let logger = test_utils::TestLogger::new();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let scorer = test_utils::TestScorer::new();
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &params, &network_graph,
Expand Down

15 changes: 8 additions & 7 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2546,7 +2546,7 @@ where
 let best_block_height = self.best_block.read().unwrap().height();
 self.pending_outbound_payments
 .send_payment(payment_hash, payment_secret, payment_id, retry_strategy, route_params,
 &self.router, self.list_usable_channels(), self.compute_inflight_htlcs(),
 &self.router, self.list_usable_channels(), || self.compute_inflight_htlcs(),
 &self.entropy_source, &self.node_signer, best_block_height, &self.logger,
 |path, payment_params, payment_hash, payment_secret, total_value, cur_height, payment_id, keysend_preimage, session_priv|
 self.send_payment_along_path(path, payment_params, payment_hash, payment_secret, total_value, cur_height, payment_id, keysend_preimage, session_priv))
Expand DownExpand Up@@ -2646,7 +2646,7 @@ where
 let best_block_height = self.best_block.read().unwrap().height();
 self.pending_outbound_payments.send_spontaneous_payment(payment_preimage, payment_id,
 retry_strategy, route_params, &self.router, self.list_usable_channels(),
 self.compute_inflight_htlcs(), &self.entropy_source, &self.node_signer, best_block_height,
|| self.compute_inflight_htlcs(), &self.entropy_source, &self.node_signer, best_block_height,
 &self.logger,
 |path, payment_params, payment_hash, payment_secret, total_value, cur_height, payment_id, keysend_preimage, session_priv|
 self.send_payment_along_path(path, payment_params, payment_hash, payment_secret, total_value, cur_height, payment_id, keysend_preimage, session_priv))
Expand DownExpand Up@@ -7966,7 +7966,7 @@ mod tests {
 let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
 let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
 create_announced_chan_between_nodes(&nodes, 0, 1);
 let scorer = test_utils::TestScorer::with_penalty(0);
 let scorer = test_utils::TestScorer::new();
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();

 // To start (1), send a regular payment but don't claim it.
Expand DownExpand Up@@ -8074,7 +8074,7 @@ mod tests {
 };
 let network_graph = nodes[0].network_graph.clone();
 let first_hops = nodes[0].node.list_usable_channels();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let scorer = test_utils::TestScorer::new();
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
Expand DownExpand Up@@ -8119,7 +8119,7 @@ mod tests {
 };
 let network_graph = nodes[0].network_graph.clone();
 let first_hops = nodes[0].node.list_usable_channels();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let scorer = test_utils::TestScorer::new();
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
Expand DownExpand Up@@ -8589,7 +8589,8 @@ pub mod bench {
 let tx_broadcaster = test_utils::TestBroadcaster{txn_broadcasted: Mutex::new(Vec::new()), blocks: Arc::new(Mutex::new(Vec::new()))};
 let fee_estimator = test_utils::TestFeeEstimator { sat_per_kw: Mutex::new(253) };
 let logger_a = test_utils::TestLogger::with_id("node a".to_owned());
 let router = test_utils::TestRouter::new(Arc::new(NetworkGraph::new(genesis_hash, &logger_a)));
 let scorer = Mutex::new(test_utils::TestScorer::new());
 let router = test_utils::TestRouter::new(Arc::new(NetworkGraph::new(genesis_hash, &logger_a)), &scorer);

 let mut config: UserConfig = Default::default();
 config.channel_handshake_config.minimum_depth = 1;
Expand DownExpand Up@@ -8680,7 +8681,7 @@ pub mod bench {
 let usable_channels = $node_a.list_usable_channels();
 let payment_params = PaymentParameters::from_node_id($node_b.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features($node_b.invoice_features());
 let scorer = test_utils::TestScorer::with_penalty(0);
 let scorer = test_utils::TestScorer::new();
 let seed = [3u8; 32];
 let keys_manager = KeysManager::new(&seed, 42, 42);
 let random_seed_bytes = keys_manager.get_secure_random_bytes();
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -305,6 +305,7 @@ pub struct TestChanMonCfg {
	pub persister: test_utils::TestPersister,
	pub logger: test_utils::TestLogger,
	pub keys_manager: test_utils::TestKeysInterface,
	pub scorer: Mutex<test_utils::TestScorer>,
}

pub struct NodeCfg<'a> {
Expand DownExpand Up@@ -427,6 +428,7 @@ impl<'a, 'b, 'c> Drop for Node<'a, 'b, 'c> {
 channel_monitors.insert(monitor.get_funding_txo().0, monitor);
 }

 let scorer = Mutex::new(test_utils::TestScorer::new());
 let mut w = test_utils::TestVecWriter(Vec::new());
 self.node.write(&mut w).unwrap();
 <(BlockHash, ChannelManager<&test_utils::TestChainMonitor, &test_utils::TestBroadcaster, &test_utils::TestKeysInterface, &test_utils::TestKeysInterface, &test_utils::TestKeysInterface, &test_utils::TestFeeEstimator, &test_utils::TestRouter, &test_utils::TestLogger>)>::read(&mut io::Cursor::new(w.0), ChannelManagerReadArgs {
Expand All@@ -435,7 +437,7 @@ impl<'a, 'b, 'c> Drop for Node<'a, 'b, 'c> {
 node_signer: self.keys_manager,
 signer_provider: self.keys_manager,
 fee_estimator: &test_utils::TestFeeEstimator { sat_per_kw: Mutex::new(253) },
 router: &test_utils::TestRouter::new(Arc::new(network_graph)),
 router: &test_utils::TestRouter::new(Arc::new(network_graph), &scorer),
 chain_monitor: self.chain_monitor,
 tx_broadcaster: &broadcaster,
 logger: &self.logger,
Expand DownExpand Up@@ -1570,7 +1572,7 @@ macro_rules! get_payment_preimage_hash {
macro_rules! get_route {
	($send_node: expr, $payment_params: expr, $recv_value: expr, $cltv: expr) => {{
 use $crate::chain::keysinterface::EntropySource;
 let scorer = $crate::util::test_utils::TestScorer::with_penalty(0);
 let scorer = $crate::util::test_utils::TestScorer::new();
 let keys_manager = $crate::util::test_utils::TestKeysInterface::new(&[0u8; 32], bitcoin::network::constants::Network::Testnet);
 let random_seed_bytes = keys_manager.get_secure_random_bytes();
 $crate::routing::router::get_route(
Expand DownExpand Up@@ -2124,7 +2126,7 @@ pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_rou
	let payment_params = PaymentParameters::from_node_id(expected_route.last().unwrap().node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(expected_route.last().unwrap().node.invoice_features());
	let network_graph = origin_node.network_graph.read_only();
	let scorer = test_utils::TestScorer::with_penalty(0);
	let scorer = test_utils::TestScorer::new();
	let seed = [0u8; 32];
	let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
	let random_seed_bytes = keys_manager.get_secure_random_bytes();
Expand DownExpand Up@@ -2289,8 +2291,9 @@ pub fn create_chanmon_cfgs(node_count: usize) -> Vec<TestChanMonCfg> {
 let persister = test_utils::TestPersister::new();
 let seed = [i as u8; 32];
 let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
 let scorer = Mutex::new(test_utils::TestScorer::new());

 chan_mon_cfgs.push(TestChanMonCfg { tx_broadcaster, fee_estimator, chain_source, logger, persister, keys_manager });
 chan_mon_cfgs.push(TestChanMonCfg { tx_broadcaster, fee_estimator, chain_source, logger, persister, keys_manager, scorer });
	}

	chan_mon_cfgs
Expand All@@ -2308,7 +2311,7 @@ pub fn create_node_cfgs<'a>(node_count: usize, chanmon_cfgs: &'a Vec<TestChanMon
 logger: &chanmon_cfgs[i].logger,
 tx_broadcaster: &chanmon_cfgs[i].tx_broadcaster,
 fee_estimator: &chanmon_cfgs[i].fee_estimator,
 router: test_utils::TestRouter::new(network_graph.clone()),
 router: test_utils::TestRouter::new(network_graph.clone(), &chanmon_cfgs[i].scorer),
 chain_monitor,
 keys_manager: &chanmon_cfgs[i].keys_manager,
 node_seed: seed,
Expand Down

11 changes: 6 additions & 5 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5257,7 +5257,8 @@ fn test_key_derivation_params() {
	let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
	let chain_monitor = test_utils::TestChainMonitor::new(Some(&chanmon_cfgs[0].chain_source), &chanmon_cfgs[0].tx_broadcaster, &chanmon_cfgs[0].logger, &chanmon_cfgs[0].fee_estimator, &chanmon_cfgs[0].persister, &keys_manager);
	let network_graph = Arc::new(NetworkGraph::new(chanmon_cfgs[0].chain_source.genesis_hash, &chanmon_cfgs[0].logger));
	let router = test_utils::TestRouter::new(network_graph.clone());
	let scorer = Mutex::new(test_utils::TestScorer::new());
	let router = test_utils::TestRouter::new(network_graph.clone(), &scorer);
	let node = NodeCfg { chain_source: &chanmon_cfgs[0].chain_source, logger: &chanmon_cfgs[0].logger, tx_broadcaster: &chanmon_cfgs[0].tx_broadcaster, fee_estimator: &chanmon_cfgs[0].fee_estimator, router, chain_monitor, keys_manager: &keys_manager, network_graph, node_seed: seed, override_init_features: alloc::rc::Rc::new(core::cell::RefCell::new(None)) };
	let mut node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
	node_cfgs.remove(0);
Expand DownExpand Up@@ -6925,7 +6926,7 @@ fn test_check_htlc_underpaying() {
	// Create some initial channels
	create_announced_chan_between_nodes(&nodes, 0, 1);

	let scorer = test_utils::TestScorer::with_penalty(0);
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV).with_features(nodes[1].node.invoice_features());
	let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None, 10_000, TEST_FINAL_CLTV, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
Expand DownExpand Up@@ -7175,7 +7176,7 @@ fn test_bump_penalty_txn_on_revoked_htlcs() {
	let chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1000000, 59000000);
	// Lock HTLC in both directions (using a slightly lower CLTV delay to provide timely RBF bumps)
	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), 50).with_features(nodes[1].node.invoice_features());
	let scorer = test_utils::TestScorer::with_penalty(0);
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None,
 3_000_000, 50, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
Expand DownExpand Up@@ -9186,7 +9187,7 @@ fn test_keysend_payments_to_public_node() {
 final_value_msat: 10000,
 final_cltv_expiry_delta: 40,
	};
	let scorer = test_utils::TestScorer::with_penalty(0);
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let route = find_route(&payer_pubkey, &route_params, &network_graph, None, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();

Expand DownExpand Up@@ -9221,7 +9222,7 @@ fn test_keysend_payments_to_private_node() {
	};
	let network_graph = nodes[0].network_graph.clone();
	let first_hops = nodes[0].node.list_usable_channels();
	let scorer = test_utils::TestScorer::with_penalty(0);
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let route = find_route(
 &payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/onion_route_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -928,7 +928,7 @@ macro_rules! get_phantom_route {
 htlc_maximum_msat: None,
 }
 ])]);
 let scorer = test_utils::TestScorer::with_penalty(0);
 let scorer = test_utils::TestScorer::new();
 let network_graph = $nodes[0].network_graph.read_only();
 (get_route(
 &$nodes[0].node.get_our_node_id(), &payment_params, &network_graph,
Expand Down
Loading