Skip to content

Commit bf74365

Browse files
committed
Handle event_queue push failure in PaymentClaimable.
1 parent 07c34ef commit bf74365

File tree

1 file changed

+16
-15
lines changed

1 file changed

+16
-15
lines changed

src/event.rs

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ where
502502
Ok(_) => return Ok(()),
503503
Err(e) => {
504504
log_error!(self.logger, "Failed to access payment store: {}", e);
505-
return Err(ReplayEvent())
505+
return Err(ReplayEvent());
506506
},
507507
};
508508
}
@@ -526,7 +526,7 @@ where
526526
Ok(_) => return Ok(()),
527527
Err(e) => {
528528
log_error!(self.logger, "Failed to access payment store: {}", e);
529-
return Err(ReplayEvent())
529+
return Err(ReplayEvent());
530530
},
531531
};
532532
}
@@ -567,7 +567,7 @@ where
567567
Ok(_) => return Ok(()),
568568
Err(e) => {
569569
log_error!(self.logger, "Failed to access payment store: {}", e);
570-
return Err(ReplayEvent())
570+
return Err(ReplayEvent());
571571
},
572572
};
573573
}
@@ -583,22 +583,23 @@ where
583583
"We would have registered the preimage if we knew"
584584
);
585585

586-
self.event_queue
587-
.add_event(Event::PaymentClaimable {
588-
payment_id,
589-
payment_hash,
590-
claimable_amount_msat: amount_msat,
591-
claim_deadline,
592-
})
593-
.unwrap_or_else(|e| {
586+
let event = Event::PaymentClaimable {
587+
payment_id,
588+
payment_hash,
589+
claimable_amount_msat: amount_msat,
590+
claim_deadline,
591+
};
592+
match self.event_queue.add_event(event) {
593+
Ok(_) => return Ok(()),
594+
Err(e) => {
594595
log_error!(
595596
self.logger,
596597
"Failed to push to event queue: {}",
597598
e
598599
);
599-
panic!("Failed to push to event queue");
600-
});
601-
return Ok(());
600+
return Err(ReplayEvent());
601+
},
602+
};
602603
}
603604
},
604605
_ => {},
@@ -725,7 +726,7 @@ where
725726
Ok(_) => return Ok(()),
726727
Err(e) => {
727728
log_error!(self.logger, "Failed to access payment store: {}", e);
728-
return Err(ReplayEvent())
729+
return Err(ReplayEvent());
729730
},
730731
};
731732
}

0 commit comments

Comments
 (0)