Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle remaining panic on persistence failure #498

Merged
merged 1 commit into from
Mar 23, 2025
Merged

Handle remaining panic on persistence failure #498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions bindings/ldk_node.udl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ interface Node {
Event wait_next_event();
[Async]
Event next_event_async();
[Throws=NodeError]
void event_handled();
PublicKey node_id();
sequence<SocketAddress>? listening_addresses();
Expand Down
8 changes: 4 additions & 4 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -781,15 +781,15 @@ impl Node {
/// Confirm the last retrieved event handled.
///
/// **Note:** This **MUST** be called after each event has been handled.
pub fn event_handled(&self) {
self.event_queue.event_handled().unwrap_or_else(|e| {
pub fn event_handled(&self) -> Result<(), Error> {
self.event_queue.event_handled().map_err(|e| {
log_error!(
self.logger,
"Couldn't mark event handled due to persistence failure: {}",
e
);
panic!("Couldn't mark event handled due to persistence failure");
});
e
})
}

/// Returns our own node id
Expand Down
18 changes: 9 additions & 9 deletions tests/common/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ macro_rules! expect_event {
match $node.wait_next_event() {
ref e @ Event::$event_type { .. } => {
println!("{} got event {:?}", $node.node_id(), e);
$node.event_handled();
$node.event_handled().unwrap();
},
ref e => {
panic!("{} got unexpected event!: {:?}", std::stringify!($node), e);
Expand All @@ -70,7 +70,7 @@ macro_rules! expect_channel_pending_event {
ref e @ Event::ChannelPending { funding_txo, counterparty_node_id, .. } => {
println!("{} got event {:?}", $node.node_id(), e);
assert_eq!(counterparty_node_id, $counterparty_node_id);
$node.event_handled();
$node.event_handled().unwrap();
funding_txo
},
ref e => {
Expand All @@ -88,7 +88,7 @@ macro_rules! expect_channel_ready_event {
ref e @ Event::ChannelReady { user_channel_id, counterparty_node_id, .. } => {
println!("{} got event {:?}", $node.node_id(), e);
assert_eq!(counterparty_node_id, Some($counterparty_node_id));
$node.event_handled();
$node.event_handled().unwrap();
user_channel_id
},
ref e => {
Expand All @@ -110,7 +110,7 @@ macro_rules! expect_payment_received_event {
if !matches!(payment.kind, PaymentKind::Onchain { .. }) {
assert_eq!(payment.fee_paid_msat, None);
}
$node.event_handled();
$node.event_handled().unwrap();
payment_id
},
ref e => {
Expand All @@ -135,7 +135,7 @@ macro_rules! expect_payment_claimable_event {
assert_eq!(payment_hash, $payment_hash);
assert_eq!(payment_id, $payment_id);
assert_eq!(claimable_amount_msat, $claimable_amount_msat);
$node.event_handled();
$node.event_handled().unwrap();
claimable_amount_msat
},
ref e => {
Expand All @@ -158,7 +158,7 @@ macro_rules! expect_payment_successful_event {
let payment = $node.payment(&$payment_id.unwrap()).unwrap();
assert_eq!(payment.fee_paid_msat, fee_paid_msat);
assert_eq!(payment_id, $payment_id);
$node.event_handled();
$node.event_handled().unwrap();
},
ref e => {
panic!("{} got unexpected event!: {:?}", std::stringify!(node_b), e);
Expand Down Expand Up @@ -707,7 +707,7 @@ pub(crate) fn do_channel_full_cycle<E: ElectrumApi>(
let received_amount = match node_b.wait_next_event() {
ref e @ Event::PaymentReceived { amount_msat, .. } => {
println!("{} got event {:?}", std::stringify!(node_b), e);
node_b.event_handled();
node_b.event_handled().unwrap();
amount_msat
},
ref e => {
Expand Down Expand Up @@ -745,7 +745,7 @@ pub(crate) fn do_channel_full_cycle<E: ElectrumApi>(
let received_amount = match node_b.wait_next_event() {
ref e @ Event::PaymentReceived { amount_msat, .. } => {
println!("{} got event {:?}", std::stringify!(node_b), e);
node_b.event_handled();
node_b.event_handled().unwrap();
amount_msat
},
ref e => {
Expand Down Expand Up @@ -868,7 +868,7 @@ pub(crate) fn do_channel_full_cycle<E: ElectrumApi>(
let (received_keysend_amount, received_custom_records) = match next_event {
ref e @ Event::PaymentReceived { amount_msat, ref custom_records, .. } => {
println!("{} got event {:?}", std::stringify!(node_b), e);
node_b.event_handled();
node_b.event_handled().unwrap();
(amount_msat, custom_records)
},
ref e => {
Expand Down