Skip to content

Commit 02dc058

Browse files
committed
f clarify error message - its paused, not ever failed
1 parent 6c427af commit 02dc058

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

lightning/src/ln/chanmon_update_fail_tests.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -791,7 +791,7 @@ fn test_monitor_update_raa_while_paused() {
791791

792792
nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_raa);
793793
assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
794-
nodes[0].logger.assert_log("lightning::ln::channelmanager".to_string(), "Previous monitor update failure prevented responses to RAA".to_string(), 1);
794+
nodes[0].logger.assert_log("lightning::ln::channelmanager".to_string(), "Existing pending monitor update prevented responses to RAA".to_string(), 1);
795795
check_added_monitors!(nodes[0], 1);
796796

797797
chanmon_cfgs[0].persister.set_update_ret(ChannelMonitorUpdateStatus::Complete);
@@ -1235,7 +1235,7 @@ fn raa_no_response_awaiting_raa_state() {
12351235

12361236
nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_raa);
12371237
assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
1238-
nodes[1].logger.assert_log("lightning::ln::channelmanager".to_string(), "Previous monitor update failure prevented responses to RAA".to_string(), 1);
1238+
nodes[1].logger.assert_log("lightning::ln::channelmanager".to_string(), "Existing pending monitor update prevented responses to RAA".to_string(), 1);
12391239
check_added_monitors!(nodes[1], 1);
12401240

12411241
chanmon_cfgs[1].persister.set_update_ret(ChannelMonitorUpdateStatus::Complete);

lightning/src/ln/channelmanager.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5050,7 +5050,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
50505050
assert!(raa_updates.accepted_htlcs.is_empty());
50515051
assert!(raa_updates.failed_htlcs.is_empty());
50525052
assert!(raa_updates.finalized_claimed_htlcs.is_empty());
5053-
break Err(MsgHandleErrInternal::ignore_no_close("Previous monitor update failure prevented responses to RAA".to_owned()));
5053+
break Err(MsgHandleErrInternal::ignore_no_close("Existing pending monitor update prevented responses to RAA".to_owned()));
50545054
}
50555055
if update_res != ChannelMonitorUpdateStatus::Complete {
50565056
if let Err(e) = handle_monitor_err!(self, update_res, channel_state, chan,

0 commit comments

Comments
 (0)