Post-rebase fixes.

cheatfate · cheatfate · commit db73853b13a8 · 2025-11-10T16:39:00.000+02:00
diff --git a/beacon_chain/consensus_object_pools/block_quarantine.nim b/beacon_chain/consensus_object_pools/block_quarantine.nim
@@ -396,6 +396,11 @@ func getColumnless*(
 ): Opt[ForkedSignedBeaconBlock] =
   quarantine.sidecarless.peek(root)
 
+func peekSidecarless*(
+    quarantine: var Quarantine, root: Eth2Digest
+): Opt[ForkedSignedBeaconBlock] =
+  quarantine.sidecarless.peek(root)
+
 iterator peekSidecarless*(quarantine: Quarantine): ForkedSignedBeaconBlock =
   for k, v in quarantine.sidecarless.pairs():
     yield v
diff --git a/beacon_chain/gossip_processing/block_processor.nim b/beacon_chain/gossip_processing/block_processor.nim
@@ -279,6 +279,8 @@ proc storeBackfillBlock(
       res
     of VerifierError.Duplicate:
       res
+    of VerifierError.MissingSidecars:
+      res
   else:
     # Only store side cars after successfully establishing block viability.
     self.storeSidecars(sidecarsOpt)
@@ -835,3 +837,5 @@ proc addBlock*(
       err(res.error())
     of VerifierError.Duplicate:
       err(res.error())
+    of VerifierError.MissingSidecars:
+      err(res.error())
diff --git a/beacon_chain/sync/sync_overseer2.nim b/beacon_chain/sync/sync_overseer2.nim
@@ -1307,14 +1307,10 @@ proc doPeerUpdateRootsSidecars(
         var res: ref ForkedSignedBeaconBlock
         res = overseer.rblockBuffer.getOrDefault(bid.root)
         if isNil(res):
-          let qres =
-            try:
-              newClone overseer.blockQuarantine.sidecarless[bid.root]
-            except KeyError:
-              nil
-          if isNil(qres):
+          let qres = overseer.blockQuarantine[].peekSidecarless(bid.root)
+          if qres.isNone():
             continue
-          res = qres
+          res = newClone qres.get()
         res
 
     withBlck(signedBlock[]):
