Skip to content

Commit 2ec427f

Browse files
TheBlueMattTheBlueMatt
committed
Rename Payee::new to Payee::from_node_id to clarify it somewhat
This also differentiates it from the bindings default-constructed `new` method which is constructed when all fields are exposed and of mappable types.
1 parent b2ce9d3 commit 2ec427f

File tree

9 files changed

+55
-55
lines changed

9 files changed

+55
-55
lines changed

‎fuzz/src/full_stack.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
438438
},
439439
4 => {
440440
let final_value_msat = slice_to_be24(get_slice!(3)) as u64;
441-
let payee = Payee::new(get_pubkey!());
441+
let payee = Payee::from_node_id(get_pubkey!());
442442
let params = RouteParameters {
443443
payee,
444444
final_value_msat,
@@ -461,7 +461,7 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
461461
},
462462
15 => {
463463
let final_value_msat = slice_to_be24(get_slice!(3)) as u64;
464-
let payee = Payee::new(get_pubkey!());
464+
let payee = Payee::from_node_id(get_pubkey!());
465465
let params = RouteParameters {
466466
payee,
467467
final_value_msat,

‎fuzz/src/router.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
251251
let scorer = Scorer::with_fixed_penalty(0);
252252
for target in node_pks.iter() {
253253
let params = RouteParameters {
254-
payee: Payee::new(*target).with_route_hints(last_hops.clone()),
254+
payee: Payee::from_node_id(*target).with_route_hints(last_hops.clone()),
255255
final_value_msat: slice_to_be64(get_slice!(8)),
256256
final_cltv_expiry_delta: slice_to_be32(get_slice!(4)),
257257
};

‎lightning-invoice/src/payment.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ where
262262
match payment_cache.entry(payment_hash) {
263263
hash_map::Entry::Vacant(entry) => {
264264
let payer = self.payer.node_id();
265-
let mut payee = Payee::new(invoice.recover_payee_pub_key())
265+
let mut payee = Payee::from_node_id(invoice.recover_payee_pub_key())
266266
.with_expiry_time(expiry_time_from_unix_epoch(&invoice).as_secs())
267267
.with_route_hints(invoice.route_hints());
268268
if let Some(features) = invoice.features() {
@@ -1034,7 +1034,7 @@ mod tests {
10341034
}
10351035

10361036
fn retry_for_invoice(invoice: &Invoice) -> RouteParameters {
1037-
let mut payee = Payee::new(invoice.recover_payee_pub_key())
1037+
let mut payee = Payee::from_node_id(invoice.recover_payee_pub_key())
10381038
.with_expiry_time(expiry_time_from_unix_epoch(invoice).as_secs())
10391039
.with_route_hints(invoice.route_hints());
10401040
if let Some(features) = invoice.features() {
@@ -1266,7 +1266,7 @@ mod tests {
12661266
cltv_expiry_delta: 100,
12671267
}],
12681268
],
1269-
payee: Some(Payee::new(nodes[1].node.get_our_node_id())),
1269+
payee: Some(Payee::from_node_id(nodes[1].node.get_our_node_id())),
12701270
};
12711271
let router = ManualRouter(RefCell::new(VecDeque::new()));
12721272
router.expect_find_route(Ok(route.clone()));
@@ -1309,7 +1309,7 @@ mod tests {
13091309
cltv_expiry_delta: 100,
13101310
}],
13111311
],
1312-
payee: Some(Payee::new(nodes[1].node.get_our_node_id())),
1312+
payee: Some(Payee::from_node_id(nodes[1].node.get_our_node_id())),
13131313
};
13141314
let router = ManualRouter(RefCell::new(VecDeque::new()));
13151315
router.expect_find_route(Ok(route.clone()));

‎lightning-invoice/src/utils.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ mod test {
171171
assert_eq!(invoice.min_final_cltv_expiry(), MIN_FINAL_CLTV_EXPIRY as u64);
172172
assert_eq!(invoice.description(), InvoiceDescription::Direct(&Description("test".to_string())));
173173

174-
let payee = Payee::new(invoice.recover_payee_pub_key())
174+
let payee = Payee::from_node_id(invoice.recover_payee_pub_key())
175175
.with_features(invoice.features().unwrap().clone())
176176
.with_route_hints(invoice.route_hints());
177177
let params = RouteParameters {

‎lightning/src/ln/channelmanager.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6646,7 +6646,7 @@ pub mod bench {
66466646
macro_rules! send_payment {
66476647
($node_a: expr, $node_b: expr) => {
66486648
let usable_channels = $node_a.list_usable_channels();
6649-
let payee = Payee::new($node_b.get_our_node_id())
6649+
let payee = Payee::from_node_id($node_b.get_our_node_id())
66506650
.with_features(InvoiceFeatures::known());
66516651
let scorer = Scorer::with_fixed_penalty(0);
66526652
let route = get_route(&$node_a.get_our_node_id(), &payee, &dummy_graph,

‎lightning/src/ln/functional_test_utils.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1012,7 +1012,7 @@ macro_rules! get_route_and_payment_hash {
10121012
}};
10131013
($send_node: expr, $recv_node: expr, $last_hops: expr, $recv_value: expr, $cltv: expr) => {{
10141014
let (payment_preimage, payment_hash, payment_secret) = get_payment_preimage_hash!($recv_node, Some($recv_value));
1015-
let payee = $crate::routing::router::Payee::new($recv_node.node.get_our_node_id())
1015+
let payee = $crate::routing::router::Payee::from_node_id($recv_node.node.get_our_node_id())
10161016
.with_features($crate::ln::features::InvoiceFeatures::known())
10171017
.with_route_hints($last_hops);
10181018
let scorer = ::util::test_utils::TestScorer::with_fixed_penalty(0);
@@ -1350,7 +1350,7 @@ pub fn claim_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route:
13501350
pub const TEST_FINAL_CLTV: u32 = 70;
13511351

13521352
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) {
1353-
let payee = Payee::new(expected_route.last().unwrap().node.get_our_node_id())
1353+
let payee = Payee::from_node_id(expected_route.last().unwrap().node.get_our_node_id())
13541354
.with_features(InvoiceFeatures::known());
13551355
let scorer = test_utils::TestScorer::with_fixed_penalty(0);
13561356
let route = get_route(
@@ -1368,7 +1368,7 @@ pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route:
13681368
}
13691369

13701370
pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) {
1371-
let payee = Payee::new(expected_route.last().unwrap().node.get_our_node_id())
1371+
let payee = Payee::from_node_id(expected_route.last().unwrap().node.get_our_node_id())
13721372
.with_features(InvoiceFeatures::known());
13731373
let scorer = test_utils::TestScorer::with_fixed_penalty(0);
13741374
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();

‎lightning/src/ln/functional_tests.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7161,7 +7161,7 @@ fn test_check_htlc_underpaying() {
71617161
create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
71627162

71637163
let scorer = test_utils::TestScorer::with_fixed_penalty(0);
7164-
let payee = Payee::new(nodes[1].node.get_our_node_id()).with_features(InvoiceFeatures::known());
7164+
let payee = Payee::from_node_id(nodes[1].node.get_our_node_id()).with_features(InvoiceFeatures::known());
71657165
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();
71667166
let (_, our_payment_hash, _) = get_payment_preimage_hash!(nodes[0]);
71677167
let our_payment_secret = nodes[1].node.create_inbound_payment_for_hash(our_payment_hash, Some(100_000), 7200, 0).unwrap();
@@ -7559,12 +7559,12 @@ fn test_bump_penalty_txn_on_revoked_htlcs() {
75597559

75607560
let chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1000000, 59000000, InitFeatures::known(), InitFeatures::known());
75617561
// Lock HTLC in both directions (using a slightly lower CLTV delay to provide timely RBF bumps)
7562-
let payee = Payee::new(nodes[1].node.get_our_node_id()).with_features(InvoiceFeatures::known());
7562+
let payee = Payee::from_node_id(nodes[1].node.get_our_node_id()).with_features(InvoiceFeatures::known());
75637563
let scorer = test_utils::TestScorer::with_fixed_penalty(0);
75647564
let route = get_route(&nodes[0].node.get_our_node_id(), &payee, &nodes[0].network_graph, None,
75657565
3_000_000, 50, nodes[0].logger, &scorer).unwrap();
75667566
let payment_preimage = send_along_route(&nodes[0], route, &[&nodes[1]], 3_000_000).0;
7567-
let payee = Payee::new(nodes[0].node.get_our_node_id()).with_features(InvoiceFeatures::known());
7567+
let payee = Payee::from_node_id(nodes[0].node.get_our_node_id()).with_features(InvoiceFeatures::known());
75687568
let route = get_route(&nodes[1].node.get_our_node_id(), &payee, nodes[1].network_graph, None,
75697569
3_000_000, 50, nodes[0].logger, &scorer).unwrap();
75707570
send_along_route(&nodes[1], route, &[&nodes[0]], 3_000_000);

‎lightning/src/ln/shutdown_tests.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@ fn updates_shutdown_wait() {
9696

9797
let (_, payment_hash, payment_secret) = get_payment_preimage_hash!(nodes[0]);
9898

99-
let payee_1 = Payee::new(nodes[1].node.get_our_node_id()).with_features(InvoiceFeatures::known());
99+
let payee_1 = Payee::from_node_id(nodes[1].node.get_our_node_id()).with_features(InvoiceFeatures::known());
100100
let route_1 = get_route(&nodes[0].node.get_our_node_id(), &payee_1, nodes[0].network_graph, None, 100000, TEST_FINAL_CLTV, &logger, &scorer).unwrap();
101-
let payee_2 = Payee::new(nodes[0].node.get_our_node_id()).with_features(InvoiceFeatures::known());
101+
let payee_2 = Payee::from_node_id(nodes[0].node.get_our_node_id()).with_features(InvoiceFeatures::known());
102102
let route_2 = get_route(&nodes[1].node.get_our_node_id(), &payee_2, nodes[1].network_graph, None, 100000, TEST_FINAL_CLTV, &logger, &scorer).unwrap();
103103
unwrap_send_err!(nodes[0].node.send_payment(&route_1, payment_hash, &Some(payment_secret)), true, APIError::ChannelUnavailable {..}, {});
104104
unwrap_send_err!(nodes[1].node.send_payment(&route_2, payment_hash, &Some(payment_secret)), true, APIError::ChannelUnavailable {..}, {});

0 commit comments

Comments
 (0)