Skip to content

Commit a534a5e

Browse files
valentinewallacevalentinewallace
authored
Merge pull request #1434 from TheBlueMatt/2022-04-robust-payment-claims
Improve Robustness of Inbound MPP Claims Across Restart
2 parents ce7b0b4 + 531d6c8 commit a534a5e

14 files changed

+754
-175
lines changed

‎fuzz/src/chanmon_consistency.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -840,13 +840,14 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {
840840
events::Event::PaymentReceived { payment_hash, .. } => {
841841
if claim_set.insert(payment_hash.0) {
842842
if $fail {
843-
assert!(nodes[$node].fail_htlc_backwards(&payment_hash));
843+
nodes[$node].fail_htlc_backwards(&payment_hash);
844844
} else {
845-
assert!(nodes[$node].claim_funds(PaymentPreimage(payment_hash.0)));
845+
nodes[$node].claim_funds(PaymentPreimage(payment_hash.0));
846846
}
847847
}
848848
},
849849
events::Event::PaymentSent { .. } => {},
850+
events::Event::PaymentClaimed { .. } => {},
850851
events::Event::PaymentPathSuccessful { .. } => {},
851852
events::Event::PaymentPathFailed { .. } => {},
852853
events::Event::PaymentForwarded { .. } if $node == 1 => {},

‎lightning/src/chain/chainmonitor.rs

+7-4
Original file line numberDiff line numberDiff line change
@@ -731,7 +731,7 @@ impl<ChannelSigner: Sign, C: Deref, T: Deref, F: Deref, L: Deref, P: Deref> even
731731
mod tests {
732732
use bitcoin::BlockHeader;
733733
use ::{check_added_monitors, check_closed_broadcast, check_closed_event};
734-
use ::{expect_payment_sent, expect_payment_sent_without_paths, expect_payment_path_successful, get_event_msg};
734+
use ::{expect_payment_sent, expect_payment_claimed, expect_payment_sent_without_paths, expect_payment_path_successful, get_event_msg};
735735
use ::{get_htlc_update_msgs, get_local_commitment_txn, get_revoke_commit_msgs, get_route_and_payment_hash, unwrap_send_err};
736736
use chain::{ChannelMonitorUpdateErr, Confirm, Watch};
737737
use chain::channelmonitor::LATENCY_GRACE_PERIOD_BLOCKS;
@@ -798,16 +798,18 @@ mod tests {
798798
create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
799799

800800
// Route two payments to be claimed at the same time.
801-
let payment_preimage_1 = route_payment(&nodes[0], &[&nodes[1]], 1_000_000).0;
802-
let payment_preimage_2 = route_payment(&nodes[0], &[&nodes[1]], 1_000_000).0;
801+
let (payment_preimage_1, payment_hash_1, _) = route_payment(&nodes[0], &[&nodes[1]], 1_000_000);
802+
let (payment_preimage_2, payment_hash_2, _) = route_payment(&nodes[0], &[&nodes[1]], 1_000_000);
803803

804804
chanmon_cfgs[1].persister.offchain_monitor_updates.lock().unwrap().clear();
805805
chanmon_cfgs[1].persister.set_update_ret(Err(ChannelMonitorUpdateErr::TemporaryFailure));
806806

807807
nodes[1].node.claim_funds(payment_preimage_1);
808808
check_added_monitors!(nodes[1], 1);
809+
expect_payment_claimed!(nodes[1], payment_hash_1, 1_000_000);
809810
nodes[1].node.claim_funds(payment_preimage_2);
810811
check_added_monitors!(nodes[1], 1);
812+
expect_payment_claimed!(nodes[1], payment_hash_2, 1_000_000);
811813

812814
chanmon_cfgs[1].persister.set_update_ret(Ok(()));
813815

@@ -877,8 +879,9 @@ mod tests {
877879
let (route, second_payment_hash, _, second_payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[1], 100_000);
878880

879881
// First route a payment that we will claim on chain and give the recipient the preimage.
880-
let payment_preimage = route_payment(&nodes[0], &[&nodes[1]], 1_000_000).0;
882+
let (payment_preimage, payment_hash, _) = route_payment(&nodes[0], &[&nodes[1]], 1_000_000);
881883
nodes[1].node.claim_funds(payment_preimage);
884+
expect_payment_claimed!(nodes[1], payment_hash, 1_000_000);
882885
nodes[1].node.get_and_clear_pending_msg_events();
883886
check_added_monitors!(nodes[1], 1);
884887
let remote_txn = get_local_commitment_txn!(nodes[1], channel.2);

‎lightning/src/chain/channelmonitor.rs

+10-1
Original file line numberDiff line numberDiff line change
@@ -655,6 +655,10 @@ pub(crate) struct ChannelMonitorImpl<Signer: Sign> {
655655
// deserialization
656656
current_holder_commitment_number: u64,
657657

658+
/// The set of payment hashes from inbound payments for which we know the preimage. Payment
659+
/// preimages that are not included in any unrevoked local commitment transaction or unrevoked
660+
/// remote commitment transactions are automatically removed when commitment transactions are
661+
/// revoked.
658662
payment_preimages: HashMap<PaymentHash, PaymentPreimage>,
659663

660664
// Note that `MonitorEvent`s MUST NOT be generated during update processing, only generated
@@ -1085,7 +1089,8 @@ impl<Signer: Sign> ChannelMonitor<Signer> {
10851089
self.inner.lock().unwrap().provide_latest_holder_commitment_tx(holder_commitment_tx, htlc_outputs).map_err(|_| ())
10861090
}
10871091

1088-
#[cfg(test)]
1092+
/// This is used to provide payment preimage(s) out-of-band during startup without updating the
1093+
/// off-chain state with a new commitment transaction.
10891094
pub(crate) fn provide_payment_preimage<B: Deref, F: Deref, L: Deref>(
10901095
&self,
10911096
payment_hash: &PaymentHash,
@@ -1632,6 +1637,10 @@ impl<Signer: Sign> ChannelMonitor<Signer> {
16321637

16331638
res
16341639
}
1640+
1641+
pub(crate) fn get_stored_preimages(&self) -> HashMap<PaymentHash, PaymentPreimage> {
1642+
self.inner.lock().unwrap().payment_preimages.clone()
1643+
}
16351644
}
16361645

16371646
/// Compares a broadcasted commitment transaction's HTLCs with those in the latest state,

‎lightning/src/ln/chanmon_update_fail_tests.rs

+50-33
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ fn test_monitor_and_persister_update_fail() {
8989
send_payment(&nodes[0], &vec!(&nodes[1])[..], 10_000_000);
9090

9191
// Route an HTLC from node 0 to node 1 (but don't settle)
92-
let preimage = route_payment(&nodes[0], &vec!(&nodes[1])[..], 9_000_000).0;
92+
let (preimage, payment_hash, _) = route_payment(&nodes[0], &[&nodes[1]], 9_000_000);
9393

9494
// Make a copy of the ChainMonitor so we can capture the error it returns on a
9595
// bogus update. Note that if instead we updated the nodes[0]'s ChainMonitor
@@ -123,8 +123,10 @@ fn test_monitor_and_persister_update_fail() {
123123
persister.set_update_ret(Err(ChannelMonitorUpdateErr::TemporaryFailure));
124124

125125
// Try to update ChannelMonitor
126-
assert!(nodes[1].node.claim_funds(preimage));
126+
nodes[1].node.claim_funds(preimage);
127+
expect_payment_claimed!(nodes[1], payment_hash, 9_000_000);
127128
check_added_monitors!(nodes[1], 1);
129+
128130
let updates = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
129131
assert_eq!(updates.update_fulfill_htlcs.len(), 1);
130132
nodes[0].node.handle_update_fulfill_htlc(&nodes[1].node.get_our_node_id(), &updates.update_fulfill_htlcs[0]);
@@ -189,9 +191,9 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
189191
let events_3 = nodes[1].node.get_and_clear_pending_events();
190192
assert_eq!(events_3.len(), 1);
191193
match events_3[0] {
192-
Event::PaymentReceived { ref payment_hash, ref purpose, amt } => {
194+
Event::PaymentReceived { ref payment_hash, ref purpose, amount_msat } => {
193195
assert_eq!(payment_hash_1, *payment_hash);
194-
assert_eq!(amt, 1000000);
196+
assert_eq!(amount_msat, 1_000_000);
195197
match &purpose {
196198
PaymentPurpose::InvoicePayment { payment_preimage, payment_secret, .. } => {
197199
assert!(payment_preimage.is_none());
@@ -267,7 +269,7 @@ fn do_test_monitor_temporary_update_fail(disconnect_count: usize) {
267269
let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
268270
let channel_id = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known()).2;
269271

270-
let (payment_preimage_1, payment_hash_1, _) = route_payment(&nodes[0], &[&nodes[1]], 1000000);
272+
let (payment_preimage_1, payment_hash_1, _) = route_payment(&nodes[0], &[&nodes[1]], 1_000_000);
271273

272274
// Now try to send a second payment which will fail to send
273275
let (route, payment_hash_2, payment_preimage_2, payment_secret_2) = get_route_and_payment_hash!(nodes[0], nodes[1], 1000000);
@@ -283,8 +285,10 @@ fn do_test_monitor_temporary_update_fail(disconnect_count: usize) {
283285

284286
// Claim the previous payment, which will result in a update_fulfill_htlc/CS from nodes[1]
285287
// but nodes[0] won't respond since it is frozen.
286-
assert!(nodes[1].node.claim_funds(payment_preimage_1));
288+
nodes[1].node.claim_funds(payment_preimage_1);
287289
check_added_monitors!(nodes[1], 1);
290+
expect_payment_claimed!(nodes[1], payment_hash_1, 1_000_000);
291+
288292
let events_2 = nodes[1].node.get_and_clear_pending_msg_events();
289293
assert_eq!(events_2.len(), 1);
290294
let (bs_initial_fulfill, bs_initial_commitment_signed) = match events_2[0] {
@@ -555,9 +559,9 @@ fn do_test_monitor_temporary_update_fail(disconnect_count: usize) {
555559
let events_5 = nodes[1].node.get_and_clear_pending_events();
556560
assert_eq!(events_5.len(), 1);
557561
match events_5[0] {
558-
Event::PaymentReceived { ref payment_hash, ref purpose, amt } => {
562+
Event::PaymentReceived { ref payment_hash, ref purpose, amount_msat } => {
559563
assert_eq!(payment_hash_2, *payment_hash);
560-
assert_eq!(amt, 1000000);
564+
assert_eq!(amount_msat, 1_000_000);
561565
match &purpose {
562566
PaymentPurpose::InvoicePayment { payment_preimage, payment_secret, .. } => {
563567
assert!(payment_preimage.is_none());
@@ -672,9 +676,9 @@ fn test_monitor_update_fail_cs() {
672676
let events = nodes[1].node.get_and_clear_pending_events();
673677
assert_eq!(events.len(), 1);
674678
match events[0] {
675-
Event::PaymentReceived { payment_hash, ref purpose, amt } => {
679+
Event::PaymentReceived { payment_hash, ref purpose, amount_msat } => {
676680
assert_eq!(payment_hash, our_payment_hash);
677-
assert_eq!(amt, 1000000);
681+
assert_eq!(amount_msat, 1_000_000);
678682
match &purpose {
679683
PaymentPurpose::InvoicePayment { payment_preimage, payment_secret, .. } => {
680684
assert!(payment_preimage.is_none());
@@ -827,7 +831,7 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
827831
let (_, payment_hash_1, _) = route_payment(&nodes[0], &[&nodes[1], &nodes[2]], 1000000);
828832

829833
// Fail the payment backwards, failing the monitor update on nodes[1]'s receipt of the RAA
830-
assert!(nodes[2].node.fail_htlc_backwards(&payment_hash_1));
834+
nodes[2].node.fail_htlc_backwards(&payment_hash_1);
831835
expect_pending_htlcs_forwardable!(nodes[2]);
832836
check_added_monitors!(nodes[2], 1);
833837

@@ -1088,13 +1092,15 @@ fn test_monitor_update_fail_reestablish() {
10881092
let chan_1 = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
10891093
create_announced_chan_between_nodes(&nodes, 1, 2, InitFeatures::known(), InitFeatures::known());
10901094

1091-
let (payment_preimage, _, _) = route_payment(&nodes[0], &[&nodes[1], &nodes[2]], 1000000);
1095+
let (payment_preimage, payment_hash, _) = route_payment(&nodes[0], &[&nodes[1], &nodes[2]], 1_000_000);
10921096

10931097
nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
10941098
nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
10951099

1096-
assert!(nodes[2].node.claim_funds(payment_preimage));
1100+
nodes[2].node.claim_funds(payment_preimage);
10971101
check_added_monitors!(nodes[2], 1);
1102+
expect_payment_claimed!(nodes[2], payment_hash, 1_000_000);
1103+
10981104
let mut updates = get_htlc_update_msgs!(nodes[2], nodes[1].node.get_our_node_id());
10991105
assert!(updates.update_add_htlcs.is_empty());
11001106
assert!(updates.update_fail_htlcs.is_empty());
@@ -1292,13 +1298,14 @@ fn claim_while_disconnected_monitor_update_fail() {
12921298
let channel_id = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known()).2;
12931299

12941300
// Forward a payment for B to claim
1295-
let (payment_preimage_1, _, _) = route_payment(&nodes[0], &[&nodes[1]], 1000000);
1301+
let (payment_preimage_1, payment_hash_1, _) = route_payment(&nodes[0], &[&nodes[1]], 1_000_000);
12961302

12971303
nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
12981304
nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
12991305

1300-
assert!(nodes[1].node.claim_funds(payment_preimage_1));
1306+
nodes[1].node.claim_funds(payment_preimage_1);
13011307
check_added_monitors!(nodes[1], 1);
1308+
expect_payment_claimed!(nodes[1], payment_hash_1, 1_000_000);
13021309

13031310
nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: InitFeatures::empty(), remote_network_address: None });
13041311
nodes[1].node.peer_connected(&nodes[0].node.get_our_node_id(), &msgs::Init { features: InitFeatures::empty(), remote_network_address: None });
@@ -1578,10 +1585,11 @@ fn test_monitor_update_fail_claim() {
15781585
// Rebalance a bit so that we can send backwards from 3 to 2.
15791586
send_payment(&nodes[0], &[&nodes[1], &nodes[2]], 5000000);
15801587

1581-
let (payment_preimage_1, _, _) = route_payment(&nodes[0], &[&nodes[1]], 1000000);
1588+
let (payment_preimage_1, payment_hash_1, _) = route_payment(&nodes[0], &[&nodes[1]], 1_000_000);
15821589

15831590
chanmon_cfgs[1].persister.set_update_ret(Err(ChannelMonitorUpdateErr::TemporaryFailure));
1584-
assert!(nodes[1].node.claim_funds(payment_preimage_1));
1591+
nodes[1].node.claim_funds(payment_preimage_1);
1592+
expect_payment_claimed!(nodes[1], payment_hash_1, 1_000_000);
15851593
nodes[1].logger.assert_log("lightning::ln::channelmanager".to_string(), "Temporary failure claiming HTLC, treating as success: Failed to update ChannelMonitor".to_string(), 1);
15861594
check_added_monitors!(nodes[1], 1);
15871595

@@ -1642,9 +1650,9 @@ fn test_monitor_update_fail_claim() {
16421650
let events = nodes[0].node.get_and_clear_pending_events();
16431651
assert_eq!(events.len(), 2);
16441652
match events[0] {
1645-
Event::PaymentReceived { ref payment_hash, ref purpose, amt } => {
1653+
Event::PaymentReceived { ref payment_hash, ref purpose, amount_msat } => {
16461654
assert_eq!(payment_hash_2, *payment_hash);
1647-
assert_eq!(1_000_000, amt);
1655+
assert_eq!(1_000_000, amount_msat);
16481656
match &purpose {
16491657
PaymentPurpose::InvoicePayment { payment_preimage, payment_secret, .. } => {
16501658
assert!(payment_preimage.is_none());
@@ -1656,9 +1664,9 @@ fn test_monitor_update_fail_claim() {
16561664
_ => panic!("Unexpected event"),
16571665
}
16581666
match events[1] {
1659-
Event::PaymentReceived { ref payment_hash, ref purpose, amt } => {
1667+
Event::PaymentReceived { ref payment_hash, ref purpose, amount_msat } => {
16601668
assert_eq!(payment_hash_3, *payment_hash);
1661-
assert_eq!(1_000_000, amt);
1669+
assert_eq!(1_000_000, amount_msat);
16621670
match &purpose {
16631671
PaymentPurpose::InvoicePayment { payment_preimage, payment_secret, .. } => {
16641672
assert!(payment_preimage.is_none());
@@ -1688,7 +1696,7 @@ fn test_monitor_update_on_pending_forwards() {
16881696
send_payment(&nodes[0], &[&nodes[1], &nodes[2]], 5000000);
16891697

16901698
let (_, payment_hash_1, _) = route_payment(&nodes[0], &[&nodes[1], &nodes[2]], 1000000);
1691-
assert!(nodes[2].node.fail_htlc_backwards(&payment_hash_1));
1699+
nodes[2].node.fail_htlc_backwards(&payment_hash_1);
16921700
expect_pending_htlcs_forwardable!(nodes[2]);
16931701
check_added_monitors!(nodes[2], 1);
16941702

@@ -1754,7 +1762,7 @@ fn monitor_update_claim_fail_no_response() {
17541762
let channel_id = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known()).2;
17551763

17561764
// Forward a payment for B to claim
1757-
let (payment_preimage_1, _, _) = route_payment(&nodes[0], &[&nodes[1]], 1000000);
1765+
let (payment_preimage_1, payment_hash_1, _) = route_payment(&nodes[0], &[&nodes[1]], 1_000_000);
17581766

17591767
// Now start forwarding a second payment, skipping the last RAA so B is in AwaitingRAA
17601768
let (route, payment_hash_2, payment_preimage_2, payment_secret_2) = get_route_and_payment_hash!(nodes[0], nodes[1], 1000000);
@@ -1770,8 +1778,10 @@ fn monitor_update_claim_fail_no_response() {
17701778
let as_raa = commitment_signed_dance!(nodes[1], nodes[0], payment_event.commitment_msg, false, true, false, true);
17711779

17721780
chanmon_cfgs[1].persister.set_update_ret(Err(ChannelMonitorUpdateErr::TemporaryFailure));
1773-
assert!(nodes[1].node.claim_funds(payment_preimage_1));
1781+
nodes[1].node.claim_funds(payment_preimage_1);
1782+
expect_payment_claimed!(nodes[1], payment_hash_1, 1_000_000);
17741783
check_added_monitors!(nodes[1], 1);
1784+
17751785
let events = nodes[1].node.get_and_clear_pending_msg_events();
17761786
assert_eq!(events.len(), 0);
17771787
nodes[1].logger.assert_log("lightning::ln::channelmanager".to_string(), "Temporary failure claiming HTLC, treating as success: Failed to update ChannelMonitor".to_string(), 1);
@@ -2076,13 +2086,15 @@ fn test_fail_htlc_on_broadcast_after_claim() {
20762086
create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
20772087
let chan_id_2 = create_announced_chan_between_nodes(&nodes, 1, 2, InitFeatures::known(), InitFeatures::known()).2;
20782088

2079-
let payment_preimage = route_payment(&nodes[0], &[&nodes[1], &nodes[2]], 2000).0;
2089+
let (payment_preimage, payment_hash, _) = route_payment(&nodes[0], &[&nodes[1], &nodes[2]], 2000);
20802090

20812091
let bs_txn = get_local_commitment_txn!(nodes[2], chan_id_2);
20822092
assert_eq!(bs_txn.len(), 1);
20832093

20842094
nodes[2].node.claim_funds(payment_preimage);
20852095
check_added_monitors!(nodes[2], 1);
2096+
expect_payment_claimed!(nodes[2], payment_hash, 2000);
2097+
20862098
let cs_updates = get_htlc_update_msgs!(nodes[2], nodes[1].node.get_our_node_id());
20872099
nodes[1].node.handle_update_fulfill_htlc(&nodes[2].node.get_our_node_id(), &cs_updates.update_fulfill_htlcs[0]);
20882100
let bs_updates = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
@@ -2235,7 +2247,7 @@ fn do_channel_holding_cell_serialize(disconnect: bool, reload_a: bool) {
22352247
//
22362248
// Note that because, at the end, MonitorUpdateFailed is still set, the HTLC generated in (c)
22372249
// will not be freed from the holding cell.
2238-
let (payment_preimage_0, _, _) = route_payment(&nodes[1], &[&nodes[0]], 100000);
2250+
let (payment_preimage_0, payment_hash_0, _) = route_payment(&nodes[1], &[&nodes[0]], 100_000);
22392251

22402252
nodes[0].node.send_payment(&route, payment_hash_1, &Some(payment_secret_1)).unwrap();
22412253
check_added_monitors!(nodes[0], 1);
@@ -2246,8 +2258,9 @@ fn do_channel_holding_cell_serialize(disconnect: bool, reload_a: bool) {
22462258
check_added_monitors!(nodes[0], 0);
22472259

22482260
chanmon_cfgs[0].persister.set_update_ret(Err(ChannelMonitorUpdateErr::TemporaryFailure));
2249-
assert!(nodes[0].node.claim_funds(payment_preimage_0));
2261+
nodes[0].node.claim_funds(payment_preimage_0);
22502262
check_added_monitors!(nodes[0], 1);
2263+
expect_payment_claimed!(nodes[0], payment_hash_0, 100_000);
22512264

22522265
nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &send.msgs[0]);
22532266
nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), &send.commitment_msg);
@@ -2455,13 +2468,15 @@ fn do_test_reconnect_dup_htlc_claims(htlc_status: HTLCStatusAtDupClaim, second_f
24552468
payment_preimage,
24562469
};
24572470
if second_fails {
2458-
assert!(nodes[2].node.fail_htlc_backwards(&payment_hash));
2471+
nodes[2].node.fail_htlc_backwards(&payment_hash);
24592472
expect_pending_htlcs_forwardable!(nodes[2]);
24602473
check_added_monitors!(nodes[2], 1);
24612474
get_htlc_update_msgs!(nodes[2], nodes[1].node.get_our_node_id());
24622475
} else {
2463-
assert!(nodes[2].node.claim_funds(payment_preimage));
2476+
nodes[2].node.claim_funds(payment_preimage);
24642477
check_added_monitors!(nodes[2], 1);
2478+
expect_payment_claimed!(nodes[2], payment_hash, 100_000);
2479+
24652480
let cs_updates = get_htlc_update_msgs!(nodes[2], nodes[1].node.get_our_node_id());
24662481
assert_eq!(cs_updates.update_fulfill_htlcs.len(), 1);
24672482
// Check that the message we're about to deliver matches the one generated:
@@ -2630,20 +2645,22 @@ fn double_temp_error() {
26302645

26312646
let (_, _, channel_id, _) = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
26322647

2633-
let (payment_preimage_1, _, _) = route_payment(&nodes[0], &[&nodes[1]], 1000000);
2634-
let (payment_preimage_2, _, _) = route_payment(&nodes[0], &[&nodes[1]], 1000000);
2648+
let (payment_preimage_1, payment_hash_1, _) = route_payment(&nodes[0], &[&nodes[1]], 1_000_000);
2649+
let (payment_preimage_2, payment_hash_2, _) = route_payment(&nodes[0], &[&nodes[1]], 1_000_000);
26352650

26362651
chanmon_cfgs[1].persister.set_update_ret(Err(ChannelMonitorUpdateErr::TemporaryFailure));
26372652
// `claim_funds` results in a ChannelMonitorUpdate.
2638-
assert!(nodes[1].node.claim_funds(payment_preimage_1));
2653+
nodes[1].node.claim_funds(payment_preimage_1);
26392654
check_added_monitors!(nodes[1], 1);
2655+
expect_payment_claimed!(nodes[1], payment_hash_1, 1_000_000);
26402656
let (funding_tx, latest_update_1, _) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&channel_id).unwrap().clone();
26412657

26422658
chanmon_cfgs[1].persister.set_update_ret(Err(ChannelMonitorUpdateErr::TemporaryFailure));
26432659
// Previously, this would've panicked due to a double-call to `Channel::monitor_update_failed`,
26442660
// which had some asserts that prevented it from being called twice.
2645-
assert!(nodes[1].node.claim_funds(payment_preimage_2));
2661+
nodes[1].node.claim_funds(payment_preimage_2);
26462662
check_added_monitors!(nodes[1], 1);
2663+
expect_payment_claimed!(nodes[1], payment_hash_2, 1_000_000);
26472664
chanmon_cfgs[1].persister.set_update_ret(Ok(()));
26482665

26492666
let (_, latest_update_2, _) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&channel_id).unwrap().clone();

0 commit comments

Comments
 (0)