From 1a5e2e53dd0471d5625312701270124c003cff09 Mon Sep 17 00:00:00 2001
From: Jordan Hrycaj <jordan@status.im>
Date: Wed, 6 Jul 2022 16:00:51 +0100
Subject: [PATCH] treat `persistBlocks()` exception as failure return code,
 unless `Defect` (#1155)

---
 nimbus/sync/fast.nim | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/nimbus/sync/fast.nim b/nimbus/sync/fast.nim
index 20a957252..f440c383a 100644
--- a/nimbus/sync/fast.nim
+++ b/nimbus/sync/fast.nim
@@ -57,17 +57,6 @@ type
     trustedPeers: HashSet[Peer]
     hasOutOfOrderBlocks: bool
 
-template catchException(info: string; code: untyped) =
-  try:
-    code
-  except CatchableError as e:
-    raise (ref CatchableError)(msg: e.msg)
-  except Defect as e:
-    raise (ref Defect)(msg: e.msg)
-  except Exception as e:
-    raise newException(
-      BlockchainSyncDefect, info & "(): " & $e.name & " -- " & e.msg)
-
 proc hash*(p: Peer): Hash = hash(cast[pointer](p))
 
 proc endIndex(b: WantedBlocks): BlockNumber =
@@ -120,8 +109,19 @@ proc availableWorkItem(ctx: FastSyncCtx): int =
 
 proc persistWorkItem(ctx: FastSyncCtx, wi: var WantedBlocks): ValidationResult
     {.gcsafe, raises:[Defect,CatchableError].} =
-  catchException("persistBlocks"):
+  try:
     result = ctx.chain.persistBlocks(wi.headers, wi.bodies)
+  except CatchableError as e:
+    error "storing persistent blocks failed",
+      error = $e.name, msg = e.msg
+    result = ValidationResult.Error
+  except Defect as e:
+    # Pass through
+    raise (ref Defect)(msg: e.msg)
+  except Exception as e:
+    error "exception while storing persistent blocks",
+      error = $e.name, msg = e.msg
+    result = ValidationResult.Error
   case result
   of ValidationResult.OK:
     ctx.finalizedBlock = wi.endIndex