From f81ae2404f6a1c79ef571b05909c17f220660811 Mon Sep 17 00:00:00 2001 From: MicaiahReid Date: Wed, 7 Feb 2024 11:38:14 -0500 Subject: [PATCH 1/2] fix: remove unreachable panic; error instead --- components/chainhook-cli/src/service/mod.rs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/components/chainhook-cli/src/service/mod.rs b/components/chainhook-cli/src/service/mod.rs index 8e387d02e..a315686e1 100644 --- a/components/chainhook-cli/src/service/mod.rs +++ b/components/chainhook-cli/src/service/mod.rs @@ -955,7 +955,14 @@ pub fn set_confirmed_expiration_status( return; } }, - None => unreachable!("found no status for predicate: {}", predicate_key), + None => { + warn!( + ctx.expect_logger(), + "found no status for predicate when trying to set confirmed expiration: {}", + predicate_key + ); + return; + } }; update_predicate_status( predicate_key, From 12e35046b754ee5c43b4bdc8f210809de2202efc Mon Sep 17 00:00:00 2001 From: MicaiahReid Date: Wed, 7 Feb 2024 13:19:40 -0500 Subject: [PATCH 2/2] fix: return instead of log error --- components/chainhook-cli/src/service/mod.rs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/components/chainhook-cli/src/service/mod.rs b/components/chainhook-cli/src/service/mod.rs index a315686e1..1ddcc134c 100644 --- a/components/chainhook-cli/src/service/mod.rs +++ b/components/chainhook-cli/src/service/mod.rs @@ -956,11 +956,7 @@ pub fn set_confirmed_expiration_status( } }, None => { - warn!( - ctx.expect_logger(), - "found no status for predicate when trying to set confirmed expiration: {}", - predicate_key - ); + // None means the predicate was deleted, so we can just ignore this predicate expiring return; } };