Eliminate warnings.

Author: cheatfate

beacon_chain/sync/sync_dag.nim

@@ -246,14 +246,7 @@ proc updateRoot*[A, B](
   else:
     # Parent entry is already present and has its own parent, so we need
     # to find last pending root.
-    let
-      res = getPendingParentRoot(parentEntry)
-      resentry =
-        if res.isSome():
-          shortLog(res.get())
-        else:
-          "<empty>"
-    res
+    getPendingParentRoot(parentEntry)
 
 proc prune*[A, B](
     sdag: var SyncDag[A, B],

beacon_chain/sync/sync_overseer2.nim

@@ -211,41 +211,6 @@ func getMissingColumnsLog(
         raiseAssert "Unsupported fork"
   "[ " & res.join(",") & " ]"
 
-func getMissingSidecarsLog(
-    overseer: SyncOverseerRef2,
-    blck: ref ForkedSignedBeaconBlock,
-    fullSupernodeLog = false
-): string =
-  var res = "["
-  withBlck(blck[]):
-    when consensusFork < ConsensusFork.Deneb:
-      discard
-    elif consensusFork in [ConsensusFork.Deneb, ConsensusFork.Electra]:
-      let indices =
-        overseer.blobQuarantine[].getMissingSidecarIndices(
-          forkyBlck.root, forkyBlck)
-      if len(indices) > 0:
-        res.add(indices.mapIt($uint8(it)).join(","))
-    elif consensusFork == ConsensusFork.Fulu:
-      let indices =
-        overseer.columnQuarantine[].getMissingSidecarIndices(
-          forkyBlck.root, forkyBlck)
-      if len(indices) > 0:
-        if overseer.config.peerdasSupernode:
-          if fullSupernodeLog:
-            res.add(indices.mapIt($uint8(it)).join(","))
-          else:
-            let superCount = (NUMBER_OF_COLUMNS div 2) - 1
-            res.add($len(indices))
-            res.add(" of ")
-            res.add($superCount)
-        else:
-          res.add(indices.mapIt($uint8(it)).join(","))
-    else:
-      raiseAssert "Unsupported fork"
-  res.add("]")
-  res
-
 func consensusForkAtEpoch(
     overseer: SyncOverseerRef2,
     epoch: Epoch
@@ -322,14 +287,6 @@ proc shouldGetColumns(overseer: SyncOverseerRef2, slot: Slot): bool =
     return false
   slot.epoch() >= overseer.getColumnsHorizon()
 
-proc getPeerColumns(overseer: SyncOverseerRef2, peer: Peer): seq[ColumnIndex] =
-  let
-    cfg = overseer.consensusManager.dag.cfg
-    nodeId = peer.fetchNodeIdFromPeerId()
-    custodyGroupCount = peer.lookupCgcFromPeer()
-  # TODO: get_custody_groups performs O(custodyGroupCount) eth2digest operations
-  cfg.get_custody_groups(nodeId, custodyGroupCount)
-
 proc getPeerColumnMap(
     overseer: SyncOverseerRef2,
     peer: Peer
@@ -1328,7 +1285,6 @@ proc doPeerUpdateRootsSidecars(
     blobRoots: seq[BlobIdentifier]
     columnRoots: seq[DataColumnsByRootIdentifier]
     columnsCount = 0
-    peerColumns: seq[ColumnIndex]
 
   logScope:
     peer = peer
@@ -1731,7 +1687,7 @@ proc doRangeSidecarsStep(
     logScope:
       peer = peer
       block_slot = blockSlot
-      block_range = $block_range
+      block_range = $blockRange
       head = shortLog(dag.head)
       block_buffer = shortLog(overseer.sbuffer(direction))
       blocks_queue = shortLog(overseer.bsqueue(direction))
@@ -2536,7 +2492,7 @@ proc blockMonitoringLoop(
     let
       dag = overseer.consensusManager.dag
       eventKey = overseer.blocksQueueBus.register()
-      blockQuarantine = overseer.blockQuarantine
+
     debug "Block monitoring established"
     while true:
       let
@@ -2668,11 +2624,6 @@ proc mainLoop*(
 
   overseer.fblockBuffer =
     BlocksRangeBuffer.init(SyncQueueKind.Forward, 320)
-  let backSlot =
-    if dag.backfill.parent_root != dag.tail.root:
-      dag.backfill.slot
-    else:
-      dag.tail.slot
   overseer.bblockBuffer =
     BlocksRangeBuffer.init(SyncQueueKind.Backward, 320)