Skip to content

Commit 108b2cd

Browse files
jkczyzjkczyz
committed
f - Use FixedPenaltyScorer in tests
1 parent 3644d83 commit 108b2cd

File tree

12 files changed

+75
-76
lines changed

12 files changed

+75
-76
lines changed

‎fuzz/src/full_stack.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ use lightning::ln::msgs::DecodeError;
3939
use lightning::ln::script::ShutdownScript;
4040
use lightning::routing::network_graph::{NetGraphMsgHandler, NetworkGraph};
4141
use lightning::routing::router::{find_route, Payee, RouteParameters};
42-
use lightning::routing::scoring::Scorer;
42+
use lightning::routing::scoring::FixedPenaltyScorer;
4343
use lightning::util::config::UserConfig;
4444
use lightning::util::errors::APIError;
4545
use lightning::util::events::Event;
@@ -390,7 +390,7 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
390390
let our_id = PublicKey::from_secret_key(&Secp256k1::signing_only(), &keys_manager.get_node_secret());
391391
let network_graph = Arc::new(NetworkGraph::new(genesis_block(network).block_hash()));
392392
let net_graph_msg_handler = Arc::new(NetGraphMsgHandler::new(Arc::clone(&network_graph), None, Arc::clone(&logger)));
393-
let scorer = Scorer::with_fixed_penalty(0);
393+
let scorer = FixedPenaltyScorer::with_penalty(0);
394394

395395
let peers = RefCell::new([false; 256]);
396396
let mut loss_detector = MoneyLossDetector::new(&peers, channelmanager.clone(), monitor.clone(), PeerManager::new(MessageHandler {

‎fuzz/src/router.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use lightning::ln::channelmanager::{ChannelDetails, ChannelCounterparty};
1717
use lightning::ln::features::InitFeatures;
1818
use lightning::ln::msgs;
1919
use lightning::routing::router::{find_route, Payee, RouteHint, RouteHintHop, RouteParameters};
20-
use lightning::routing::scoring::Scorer;
20+
use lightning::routing::scoring::FixedPenaltyScorer;
2121
use lightning::util::logger::Logger;
2222
use lightning::util::ser::Readable;
2323
use lightning::routing::network_graph::{NetworkGraph, RoutingFees};
@@ -249,7 +249,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
249249
}]));
250250
}
251251
}
252-
let scorer = Scorer::with_fixed_penalty(0);
252+
let scorer = FixedPenaltyScorer::with_penalty(0);
253253
for target in node_pks.iter() {
254254
let params = RouteParameters {
255255
payee: Payee::from_node_id(*target).with_route_hints(last_hops.clone()),

‎lightning-background-processor/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -658,7 +658,7 @@ mod tests {
658658
let data_dir = nodes[0].persister.get_data_dir();
659659
let persister = move |node: &ChannelManager<InMemorySigner, Arc<ChainMonitor>, Arc<test_utils::TestBroadcaster>, Arc<KeysManager>, Arc<test_utils::TestFeeEstimator>, Arc<test_utils::TestLogger>>| FilesystemPersister::persist_manager(data_dir.clone(), node);
660660
let router = DefaultRouter::new(Arc::clone(&nodes[0].network_graph), Arc::clone(&nodes[0].logger));
661-
let scorer = Arc::new(Mutex::new(test_utils::TestScorer::default()));
661+
let scorer = Arc::new(Mutex::new(test_utils::TestScorer::with_penalty(0)));
662662
let invoice_payer = Arc::new(InvoicePayer::new(Arc::clone(&nodes[0].node), router, scorer, Arc::clone(&nodes[0].logger), |_: &_| {}, RetryAttempts(2)));
663663
let event_handler = Arc::clone(&invoice_payer);
664664
let bg_processor = BackgroundProcessor::start(persister, event_handler, nodes[0].chain_monitor.clone(), nodes[0].node.clone(), nodes[0].net_graph_msg_handler.clone(), nodes[0].peer_manager.clone(), nodes[0].logger.clone());

‎lightning-invoice/src/utils.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ mod test {
193193
let first_hops = nodes[0].node.list_usable_channels();
194194
let network_graph = node_cfgs[0].network_graph;
195195
let logger = test_utils::TestLogger::new();
196-
let scorer = test_utils::TestScorer::with_fixed_penalty(0);
196+
let scorer = test_utils::TestScorer::with_penalty(0);
197197
let route = find_route(
198198
&nodes[0].node.get_our_node_id(), &params, network_graph,
199199
Some(&first_hops.iter().collect::<Vec<_>>()), &logger, &scorer,

‎lightning/src/ln/channelmanager.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6891,7 +6891,7 @@ mod tests {
68916891
let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
68926892
let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
68936893
create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
6894-
let scorer = test_utils::TestScorer::with_fixed_penalty(0);
6894+
let scorer = test_utils::TestScorer::with_penalty(0);
68956895

68966896
// To start (1), send a regular payment but don't claim it.
68976897
let expected_route = [&nodes[1]];
@@ -6996,7 +6996,7 @@ mod tests {
69966996
};
69976997
let network_graph = nodes[0].network_graph;
69986998
let first_hops = nodes[0].node.list_usable_channels();
6999-
let scorer = test_utils::TestScorer::with_fixed_penalty(0);
6999+
let scorer = test_utils::TestScorer::with_penalty(0);
70007000
let route = find_route(
70017001
&payer_pubkey, &params, network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
70027002
nodes[0].logger, &scorer
@@ -7039,7 +7039,7 @@ mod tests {
70397039
};
70407040
let network_graph = nodes[0].network_graph;
70417041
let first_hops = nodes[0].node.list_usable_channels();
7042-
let scorer = test_utils::TestScorer::with_fixed_penalty(0);
7042+
let scorer = test_utils::TestScorer::with_penalty(0);
70437043
let route = find_route(
70447044
&payer_pubkey, &params, network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
70457045
nodes[0].logger, &scorer
@@ -7133,7 +7133,6 @@ pub mod bench {
71337133
use ln::msgs::{ChannelMessageHandler, Init};
71347134
use routing::network_graph::NetworkGraph;
71357135
use routing::router::{Payee, get_route};
7136-
use routing::scoring::Scorer;
71377136
use util::test_utils;
71387137
use util::config::UserConfig;
71397138
use util::events::{Event, MessageSendEvent, MessageSendEventsProvider, PaymentPurpose};
@@ -7243,7 +7242,7 @@ pub mod bench {
72437242
let usable_channels = $node_a.list_usable_channels();
72447243
let payee = Payee::from_node_id($node_b.get_our_node_id())
72457244
.with_features(InvoiceFeatures::known());
7246-
let scorer = Scorer::with_fixed_penalty(0);
7245+
let scorer = test_utils::TestScorer::with_penalty(0);
72477246
let route = get_route(&$node_a.get_our_node_id(), &payee, &dummy_graph,
72487247
Some(&usable_channels.iter().map(|r| r).collect::<Vec<_>>()), 10_000, TEST_FINAL_CLTV, &logger_a, &scorer).unwrap();
72497248

‎lightning/src/ln/functional_test_utils.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1051,7 +1051,7 @@ macro_rules! get_route_and_payment_hash {
10511051
let payee = $crate::routing::router::Payee::from_node_id($recv_node.node.get_our_node_id())
10521052
.with_features($crate::ln::features::InvoiceFeatures::known())
10531053
.with_route_hints($last_hops);
1054-
let scorer = $crate::util::test_utils::TestScorer::with_fixed_penalty(0);
1054+
let scorer = $crate::util::test_utils::TestScorer::with_penalty(0);
10551055
let route = $crate::routing::router::get_route(
10561056
&$send_node.node.get_our_node_id(), &payee, $send_node.network_graph,
10571057
Some(&$send_node.node.list_usable_channels().iter().collect::<Vec<_>>()),
@@ -1506,7 +1506,7 @@ pub const TEST_FINAL_CLTV: u32 = 70;
15061506
pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) -> (PaymentPreimage, PaymentHash, PaymentSecret) {
15071507
let payee = Payee::from_node_id(expected_route.last().unwrap().node.get_our_node_id())
15081508
.with_features(InvoiceFeatures::known());
1509-
let scorer = test_utils::TestScorer::with_fixed_penalty(0);
1509+
let scorer = test_utils::TestScorer::with_penalty(0);
15101510
let route = get_route(
15111511
&origin_node.node.get_our_node_id(), &payee, &origin_node.network_graph,
15121512
Some(&origin_node.node.list_usable_channels().iter().collect::<Vec<_>>()),
@@ -1524,7 +1524,7 @@ pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route:
15241524
pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) {
15251525
let payee = Payee::from_node_id(expected_route.last().unwrap().node.get_our_node_id())
15261526
.with_features(InvoiceFeatures::known());
1527-
let scorer = test_utils::TestScorer::with_fixed_penalty(0);
1527+
let scorer = test_utils::TestScorer::with_penalty(0);
15281528
let route = get_route(&origin_node.node.get_our_node_id(), &payee, origin_node.network_graph, None, recv_value, TEST_FINAL_CLTV, origin_node.logger, &scorer).unwrap();
15291529
assert_eq!(route.paths.len(), 1);
15301530
assert_eq!(route.paths[0].len(), expected_route.len());

‎lightning/src/ln/functional_tests.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7333,7 +7333,7 @@ fn test_check_htlc_underpaying() {
73337333
// Create some initial channels
73347334
create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
73357335

7336-
let scorer = test_utils::TestScorer::with_fixed_penalty(0);
7336+
let scorer = test_utils::TestScorer::with_penalty(0);
73377337
let payee = Payee::from_node_id(nodes[1].node.get_our_node_id()).with_features(InvoiceFeatures::known());
73387338
let route = get_route(&nodes[0].node.get_our_node_id(), &payee, nodes[0].network_graph, None, 10_000, TEST_FINAL_CLTV, nodes[0].logger, &scorer).unwrap();
73397339
let (_, our_payment_hash, _) = get_payment_preimage_hash!(nodes[0]);
@@ -7736,7 +7736,7 @@ fn test_bump_penalty_txn_on_revoked_htlcs() {
77367736
let chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1000000, 59000000, InitFeatures::known(), InitFeatures::known());
77377737
// Lock HTLC in both directions (using a slightly lower CLTV delay to provide timely RBF bumps)
77387738
let payee = Payee::from_node_id(nodes[1].node.get_our_node_id()).with_features(InvoiceFeatures::known());
7739-
let scorer = test_utils::TestScorer::with_fixed_penalty(0);
7739+
let scorer = test_utils::TestScorer::with_penalty(0);
77407740
let route = get_route(&nodes[0].node.get_our_node_id(), &payee, &nodes[0].network_graph, None,
77417741
3_000_000, 50, nodes[0].logger, &scorer).unwrap();
77427742
let payment_preimage = send_along_route(&nodes[0], route, &[&nodes[1]], 3_000_000).0;
@@ -9273,7 +9273,7 @@ fn test_keysend_payments_to_public_node() {
92739273
final_value_msat: 10000,
92749274
final_cltv_expiry_delta: 40,
92759275
};
9276-
let scorer = test_utils::TestScorer::with_fixed_penalty(0);
9276+
let scorer = test_utils::TestScorer::with_penalty(0);
92779277
let route = find_route(&payer_pubkey, &params, network_graph, None, nodes[0].logger, &scorer).unwrap();
92789278

92799279
let test_preimage = PaymentPreimage([42; 32]);
@@ -9307,7 +9307,7 @@ fn test_keysend_payments_to_private_node() {
93079307
};
93089308
let network_graph = nodes[0].network_graph;
93099309
let first_hops = nodes[0].node.list_usable_channels();
9310-
let scorer = test_utils::TestScorer::with_fixed_penalty(0);
9310+
let scorer = test_utils::TestScorer::with_penalty(0);
93119311
let route = find_route(
93129312
&payer_pubkey, &params, network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
93139313
nodes[0].logger, &scorer

‎lightning/src/ln/payment_tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -723,7 +723,7 @@ fn get_ldk_payment_preimage() {
723723

724724
let payee = Payee::from_node_id(nodes[1].node.get_our_node_id())
725725
.with_features(InvoiceFeatures::known());
726-
let scorer = test_utils::TestScorer::with_fixed_penalty(0);
726+
let scorer = test_utils::TestScorer::with_penalty(0);
727727
let route = get_route(
728728
&nodes[0].node.get_our_node_id(), &payee, &nodes[0].network_graph,
729729
Some(&nodes[0].node.list_usable_channels().iter().collect::<Vec<_>>()),

‎lightning/src/ln/shutdown_tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ fn updates_shutdown_wait() {
7676
let chan_1 = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
7777
let chan_2 = create_announced_chan_between_nodes(&nodes, 1, 2, InitFeatures::known(), InitFeatures::known());
7878
let logger = test_utils::TestLogger::new();
79-
let scorer = test_utils::TestScorer::with_fixed_penalty(0);
79+
let scorer = test_utils::TestScorer::with_penalty(0);
8080

8181
let (payment_preimage, _, _) = route_payment(&nodes[0], &[&nodes[1], &nodes[2]], 100000);
8282

0 commit comments

Comments
 (0)