Skip to content

Commit 9f34cbf

Browse files
jurvisjurvis
committed
Remove RefCell from TestRouter init
1 parent 0076635 commit 9f34cbf

File tree

1 file changed

+29
-51
lines changed

1 file changed

+29
-51
lines changed

‎lightning-invoice/src/payment.rs

Lines changed: 29 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -864,8 +864,7 @@ mod tests {
864864
let final_value_msat = invoice.amount_milli_satoshis().unwrap();
865865

866866
let payer = TestPayer::new().expect_send(Amount::ForInvoice(final_value_msat));
867-
let scorer = RefCell::new(TestScorer::new());
868-
let router = TestRouter::new(scorer);
867+
let router = TestRouter::new(TestScorer::new());
869868
let logger = TestLogger::new();
870869
let invoice_payer =
871870
InvoicePayer::new(&payer, router, &logger, event_handler, Retry::Attempts(0));
@@ -893,8 +892,7 @@ mod tests {
893892
let payer = TestPayer::new()
894893
.expect_send(Amount::ForInvoice(final_value_msat))
895894
.expect_send(Amount::OnRetry(final_value_msat / 2));
896-
let scorer = RefCell::new(TestScorer::new());
897-
let router = TestRouter::new(scorer);
895+
let router = TestRouter::new(TestScorer::new());
898896
let logger = TestLogger::new();
899897
let invoice_payer =
900898
InvoicePayer::new(&payer, router, &logger, event_handler, Retry::Attempts(2));
@@ -938,8 +936,7 @@ mod tests {
938936
.expect_send(Amount::ForInvoice(final_value_msat))
939937
.expect_send(Amount::OnRetry(final_value_msat / 2))
940938
.expect_send(Amount::OnRetry(final_value_msat / 2));
941-
let scorer = RefCell::new(TestScorer::new());
942-
let router = TestRouter::new(scorer);
939+
let router = TestRouter::new(TestScorer::new());
943940
let logger = TestLogger::new();
944941
let invoice_payer =
945942
InvoicePayer::new(&payer, router, &logger, event_handler, Retry::Attempts(2));
@@ -960,8 +957,7 @@ mod tests {
960957
let payer = TestPayer::new()
961958
.expect_send(Amount::OnRetry(final_value_msat / 2))
962959
.expect_send(Amount::OnRetry(final_value_msat / 2));
963-
let scorer = RefCell::new(TestScorer::new());
964-
let router = TestRouter::new(scorer);
960+
let router = TestRouter::new(TestScorer::new());
965961
let logger = TestLogger::new();
966962
let invoice_payer =
967963
InvoicePayer::new(&payer, router, &logger, event_handler, Retry::Attempts(2));
@@ -1005,8 +1001,7 @@ mod tests {
10051001
.expect_send(Amount::ForInvoice(final_value_msat))
10061002
.expect_send(Amount::OnRetry(final_value_msat / 2))
10071003
.expect_send(Amount::OnRetry(final_value_msat / 2));
1008-
let scorer = RefCell::new(TestScorer::new());
1009-
let router = TestRouter::new(scorer);
1004+
let router = TestRouter::new(TestScorer::new());
10101005
let logger = TestLogger::new();
10111006
let invoice_payer =
10121007
InvoicePayer::new(&payer, router, &logger, event_handler, Retry::Attempts(2));
@@ -1063,8 +1058,7 @@ mod tests {
10631058
.expect_send(Amount::ForInvoice(final_value_msat))
10641059
.expect_send(Amount::OnRetry(final_value_msat / 2));
10651060

1066-
let scorer = RefCell::new(TestScorer::new());
1067-
let router = TestRouter::new(scorer);
1061+
let router = TestRouter::new(TestScorer::new());
10681062
let logger = TestLogger::new();
10691063
type InvoicePayerUsingSinceEpoch <P, R, L, E> = InvoicePayerUsingTime::<P, R, L, E, SinceEpoch>;
10701064

@@ -1105,8 +1099,7 @@ mod tests {
11051099
let final_value_msat = invoice.amount_milli_satoshis().unwrap();
11061100

11071101
let payer = TestPayer::new().expect_send(Amount::ForInvoice(final_value_msat));
1108-
let scorer = RefCell::new(TestScorer::new());
1109-
let router = TestRouter::new(scorer);
1102+
let router = TestRouter::new(TestScorer::new());
11101103
let logger = TestLogger::new();
11111104
let invoice_payer =
11121105
InvoicePayer::new(&payer, router, &logger, event_handler, Retry::Attempts(2));
@@ -1137,8 +1130,7 @@ mod tests {
11371130
let event_handler = |_: &_| { *event_handled.borrow_mut() = true; };
11381131

11391132
let payer = TestPayer::new();
1140-
let scorer = RefCell::new(TestScorer::new());
1141-
let router = TestRouter::new(scorer);
1133+
let router = TestRouter::new(TestScorer::new());
11421134
let logger = TestLogger::new();
11431135
let invoice_payer =
11441136
InvoicePayer::new(&payer, router, &logger, event_handler, Retry::Attempts(2));
@@ -1162,8 +1154,7 @@ mod tests {
11621154
let final_value_msat = invoice.amount_milli_satoshis().unwrap();
11631155

11641156
let payer = TestPayer::new().expect_send(Amount::ForInvoice(final_value_msat));
1165-
let scorer = RefCell::new(TestScorer::new());
1166-
let router = TestRouter::new(scorer);
1157+
let router = TestRouter::new(TestScorer::new());
11671158
let logger = TestLogger::new();
11681159
let invoice_payer =
11691160
InvoicePayer::new(&payer, router, &logger, event_handler, Retry::Attempts(2));
@@ -1203,8 +1194,7 @@ mod tests {
12031194
.fails_on_attempt(2)
12041195
.expect_send(Amount::ForInvoice(final_value_msat))
12051196
.expect_send(Amount::OnRetry(final_value_msat / 2));
1206-
let scorer = RefCell::new(TestScorer::new());
1207-
let router = TestRouter::new(scorer);
1197+
let router = TestRouter::new(TestScorer::new());
12081198
let logger = TestLogger::new();
12091199
let invoice_payer =
12101200
InvoicePayer::new(&payer, router, &logger, event_handler, Retry::Attempts(2));
@@ -1237,8 +1227,7 @@ mod tests {
12371227
let final_value_msat = invoice.amount_milli_satoshis().unwrap();
12381228

12391229
let payer = TestPayer::new().expect_send(Amount::ForInvoice(final_value_msat));
1240-
let scorer = RefCell::new(TestScorer::new());
1241-
let router = TestRouter::new(scorer);
1230+
let router = TestRouter::new(TestScorer::new());
12421231
let logger = TestLogger::new();
12431232
let invoice_payer =
12441233
InvoicePayer::new(&payer, router, &logger, event_handler, Retry::Attempts(2));
@@ -1273,8 +1262,7 @@ mod tests {
12731262
let payer = TestPayer::new()
12741263
.expect_send(Amount::ForInvoice(final_value_msat))
12751264
.expect_send(Amount::ForInvoice(final_value_msat));
1276-
let scorer = RefCell::new(TestScorer::new());
1277-
let router = TestRouter::new(scorer);
1265+
let router = TestRouter::new(TestScorer::new());
12781266
let logger = TestLogger::new();
12791267
let invoice_payer =
12801268
InvoicePayer::new(&payer, router, &logger, event_handler, Retry::Attempts(0));
@@ -1335,8 +1323,7 @@ mod tests {
13351323
let payer = TestPayer::new()
13361324
.fails_on_attempt(1)
13371325
.expect_send(Amount::ForInvoice(final_value_msat));
1338-
let scorer = RefCell::new(TestScorer::new());
1339-
let router = TestRouter::new(scorer);
1326+
let router = TestRouter::new(TestScorer::new());
13401327
let logger = TestLogger::new();
13411328
let invoice_payer =
13421329
InvoicePayer::new(&payer, router, &logger, |_: &_| {}, Retry::Attempts(0));
@@ -1359,8 +1346,7 @@ mod tests {
13591346
let final_value_msat = 100;
13601347

13611348
let payer = TestPayer::new().expect_send(Amount::ForInvoice(final_value_msat));
1362-
let scorer = RefCell::new(TestScorer::new());
1363-
let router = TestRouter::new(scorer);
1349+
let router = TestRouter::new(TestScorer::new());
13641350
let logger = TestLogger::new();
13651351
let invoice_payer =
13661352
InvoicePayer::new(&payer, router, &logger, event_handler, Retry::Attempts(0));
@@ -1382,8 +1368,7 @@ mod tests {
13821368
let event_handler = |_: &_| { *event_handled.borrow_mut() = true; };
13831369

13841370
let payer = TestPayer::new();
1385-
let scorer = RefCell::new(TestScorer::new());
1386-
let router = TestRouter::new(scorer);
1371+
let router = TestRouter::new(TestScorer::new());
13871372
let logger = TestLogger::new();
13881373
let invoice_payer =
13891374
InvoicePayer::new(&payer, router, &logger, event_handler, Retry::Attempts(0));
@@ -1413,8 +1398,7 @@ mod tests {
14131398
let payer = TestPayer::new()
14141399
.expect_send(Amount::Spontaneous(final_value_msat))
14151400
.expect_send(Amount::OnRetry(final_value_msat));
1416-
let scorer = RefCell::new(TestScorer::new());
1417-
let router = TestRouter::new(scorer);
1401+
let router = TestRouter::new(TestScorer::new());
14181402
let logger = TestLogger::new();
14191403
let invoice_payer =
14201404
InvoicePayer::new(&payer, router, &logger, event_handler, Retry::Attempts(2));
@@ -1466,9 +1450,9 @@ mod tests {
14661450
let payer = TestPayer::new()
14671451
.expect_send(Amount::ForInvoice(final_value_msat))
14681452
.expect_send(Amount::OnRetry(final_value_msat / 2));
1469-
let scorer = RefCell::new(TestScorer::new().expect(TestResult::PaymentFailure {
1453+
let scorer = TestScorer::new().expect(TestResult::PaymentFailure {
14701454
path: path.clone(), short_channel_id: path[0].short_channel_id,
1471-
}));
1455+
});
14721456
let router = TestRouter::new(scorer);
14731457
let logger = TestLogger::new();
14741458
let invoice_payer =
@@ -1501,10 +1485,9 @@ mod tests {
15011485

15021486
// Expect that scorer is given short_channel_id upon handling the event.
15031487
let payer = TestPayer::new().expect_send(Amount::ForInvoice(final_value_msat));
1504-
let scorer = RefCell::new(TestScorer::new()
1488+
let scorer = TestScorer::new()
15051489
.expect(TestResult::PaymentSuccess { path: route.paths[0].clone() })
1506-
.expect(TestResult::PaymentSuccess { path: route.paths[1].clone() })
1507-
);
1490+
.expect(TestResult::PaymentSuccess { path: route.paths[1].clone() });
15081491
let router = TestRouter::new(scorer);
15091492
let logger = TestLogger::new();
15101493
let invoice_payer =
@@ -1534,8 +1517,7 @@ mod tests {
15341517
let payer = TestPayer::new().expect_send(Amount::ForInvoice(final_value_msat));
15351518
let final_value_msat = invoice.amount_milli_satoshis().unwrap();
15361519
let route = TestRouter::route_for_value(final_value_msat);
1537-
let scorer = RefCell::new(TestScorer::new());
1538-
let router = TestRouter::new(scorer);
1520+
let router = TestRouter::new(TestScorer::new());
15391521
let logger = TestLogger::new();
15401522
let invoice_payer =
15411523
InvoicePayer::new(&payer, router, &logger, event_handler, Retry::Attempts(0));
@@ -1583,7 +1565,7 @@ mod tests {
15831565
.expect_send(Amount::ForInvoice(final_value_msat));
15841566
let final_value_msat = payment_invoice.amount_milli_satoshis().unwrap();
15851567
let route = TestRouter::route_for_value(final_value_msat);
1586-
let scorer = RefCell::new(TestScorer::new()
1568+
let scorer = TestScorer::new()
15871569
// 1st invoice, 1st path
15881570
.expect_usage(ChannelUsage { amount_msat: 64, inflight_htlc_msat: 0, effective_capacity: EffectiveCapacity::Unknown } )
15891571
.expect_usage(ChannelUsage { amount_msat: 84, inflight_htlc_msat: 0, effective_capacity: EffectiveCapacity::Unknown } )
@@ -1597,8 +1579,7 @@ mod tests {
15971579
.expect_usage(ChannelUsage { amount_msat: 94, inflight_htlc_msat: 0, effective_capacity: EffectiveCapacity::Unknown } )
15981580
// 2nd invoice, 2nd path
15991581
.expect_usage(ChannelUsage { amount_msat: 64, inflight_htlc_msat: 64, effective_capacity: EffectiveCapacity::Unknown } )
1600-
.expect_usage(ChannelUsage { amount_msat: 74, inflight_htlc_msat: 74, effective_capacity: EffectiveCapacity::Unknown } )
1601-
);
1582+
.expect_usage(ChannelUsage { amount_msat: 74, inflight_htlc_msat: 74, effective_capacity: EffectiveCapacity::Unknown } );
16021583
let router = TestRouter::new(scorer);
16031584
let logger = TestLogger::new();
16041585
let invoice_payer =
@@ -1635,7 +1616,7 @@ mod tests {
16351616
.expect_send(Amount::OnRetry(final_value_msat / 2))
16361617
.expect_send(Amount::OnRetry(final_value_msat / 4));
16371618
let final_value_msat = payment_invoice.amount_milli_satoshis().unwrap();
1638-
let scorer = RefCell::new(TestScorer::new()
1619+
let scorer = TestScorer::new()
16391620
// 1st invoice, 1st path
16401621
.expect_usage(ChannelUsage { amount_msat: 64, inflight_htlc_msat: 0, effective_capacity: EffectiveCapacity::Unknown } )
16411622
.expect_usage(ChannelUsage { amount_msat: 84, inflight_htlc_msat: 0, effective_capacity: EffectiveCapacity::Unknown } )
@@ -1656,8 +1637,7 @@ mod tests {
16561637
.expect_usage(ChannelUsage { amount_msat: 46, inflight_htlc_msat: 0, effective_capacity: EffectiveCapacity::Unknown } )
16571638
// Retry 2, 2nd path
16581639
.expect_usage(ChannelUsage { amount_msat: 16, inflight_htlc_msat: 64 + 32, effective_capacity: EffectiveCapacity::Unknown } )
1659-
.expect_usage(ChannelUsage { amount_msat: 26, inflight_htlc_msat: 74 + 32 + 10, effective_capacity: EffectiveCapacity::Unknown } )
1660-
);
1640+
.expect_usage(ChannelUsage { amount_msat: 26, inflight_htlc_msat: 74 + 32 + 10, effective_capacity: EffectiveCapacity::Unknown } );
16611641
let router = TestRouter::new(scorer);
16621642
let logger = TestLogger::new();
16631643
let invoice_payer =
@@ -1710,8 +1690,7 @@ mod tests {
17101690
]))
17111691
.expect_send(Amount::ForInvoice(final_value_msat));
17121692

1713-
let scorer = RefCell::new(TestScorer::new());
1714-
let router = TestRouter::new(scorer);
1693+
let router = TestRouter::new(TestScorer::new());
17151694
let logger = TestLogger::new();
17161695
let invoice_payer =
17171696
InvoicePayer::new(&payer, router, &logger, event_handler, Retry::Attempts(0));
@@ -1742,8 +1721,7 @@ mod tests {
17421721
]))
17431722
.expect_send(Amount::ForInvoice(final_value_msat));
17441723

1745-
let scorer = RefCell::new(TestScorer::new());
1746-
let router = TestRouter::new(scorer);
1724+
let router = TestRouter::new(TestScorer::new());
17471725
let logger = TestLogger::new();
17481726
let invoice_payer =
17491727
InvoicePayer::new(&payer, router, &logger, event_handler, Retry::Attempts(0));
@@ -1760,8 +1738,8 @@ mod tests {
17601738
}
17611739

17621740
impl TestRouter {
1763-
fn new(scorer: RefCell<TestScorer>) -> Self {
1764-
TestRouter { scorer }
1741+
fn new(scorer: TestScorer) -> Self {
1742+
TestRouter { scorer: RefCell::new(scorer) }
17651743
}
17661744

17671745
fn route_for_value(final_value_msat: u64) -> Route {

0 commit comments

Comments
 (0)