Skip to content

Commit 763ed22

Browse files
committed
Rename ChannelState::MonitorUpdateFailed MonitorUpdateInProgress
As we're moving towards monitor update async being a supported use-case, we shouldn't call an async monitor update "failed", but rather "in progress". This simply updates the internal channel.rs enum name to reflect the new thinking.
1 parent c125034 commit 763ed22

File tree

2 files changed

+44
-43
lines changed

2 files changed

+44
-43
lines changed

lightning/src/ln/chanmon_update_fail_tests.rs

+8-7
Original file line numberDiff line numberDiff line change
@@ -2238,11 +2238,12 @@ fn do_channel_holding_cell_serialize(disconnect: bool, reload_a: bool) {
22382238
let (route, payment_hash_1, payment_preimage_1, payment_secret_1) = get_route_and_payment_hash!(&nodes[0], nodes[1], 100000);
22392239
let (payment_preimage_2, payment_hash_2, payment_secret_2) = get_payment_preimage_hash!(&nodes[1]);
22402240

2241-
// Do a really complicated dance to get an HTLC into the holding cell, with MonitorUpdateFailed
2242-
// set but AwaitingRemoteRevoke unset. When this test was written, any attempts to send an HTLC
2243-
// while MonitorUpdateFailed is set are immediately failed-backwards. Thus, the only way to get
2244-
// an AddHTLC into the holding cell is to add it while AwaitingRemoteRevoke is set but
2245-
// MonitorUpdateFailed is unset, and then swap the flags.
2241+
// Do a really complicated dance to get an HTLC into the holding cell, with
2242+
// MonitorUpdateInProgress set but AwaitingRemoteRevoke unset. When this test was written, any
2243+
// attempts to send an HTLC while MonitorUpdateInProgress is set are immediately
2244+
// failed-backwards. Thus, the only way to get an AddHTLC into the holding cell is to add it
2245+
// while AwaitingRemoteRevoke is set but MonitorUpdateInProgress is unset, and then swap the
2246+
// flags.
22462247
//
22472248
// We do this by:
22482249
// a) routing a payment from node B to node A,
@@ -2255,8 +2256,8 @@ fn do_channel_holding_cell_serialize(disconnect: bool, reload_a: bool) {
22552256
// e) delivering A's commitment_signed from (b) and the resulting B revoke_and_ack message,
22562257
// clearing AwaitingRemoteRevoke on node A.
22572258
//
2258-
// Note that because, at the end, MonitorUpdateFailed is still set, the HTLC generated in (c)
2259-
// will not be freed from the holding cell.
2259+
// Note that because, at the end, MonitorUpdateInProgress is still set, the HTLC generated in
2260+
// (c) will not be freed from the holding cell.
22602261
let (payment_preimage_0, payment_hash_0, _) = route_payment(&nodes[1], &[&nodes[0]], 100_000);
22612262

22622263
nodes[0].node.send_payment(&route, payment_hash_1, &Some(payment_secret_1)).unwrap();

0 commit comments

Comments
 (0)