Post rebase fixes.

Author: cheatfate

beacon_chain/consensus_object_pools/blob_quarantine.nim

@@ -9,7 +9,7 @@
 
 import
   stew/bitops2,
-  std/[sets, tables],
+  std/[sets, tables, sequtils],
   results, metrics,
   ../spec/[presets, helpers, column_map],
   ../beacon_chain_db_quarantine
@@ -73,12 +73,14 @@ type
   OnDataColumnSidecarCallback* = proc(
     data: DataColumnSidecarInfoObject) {.gcsafe, raises: [].}
 
+  SomeSidecarRef = ref fulu.DataColumnSidecar | ref BlobSidecar
+
   BlobQuarantine* =
     SidecarQuarantine[BlobSidecar, OnBlobSidecarCallback]
   ColumnQuarantine* =
     SidecarQuarantine[fulu.DataColumnSidecar, OnDataColumnSidecarCallback]
 
-func indexLog[T](sidecars: openArray[ref T]): string =
+func indexLog[T: SomeSidecarRef](sidecars: openArray[ref T]): string =
   "[" & sidecars.mapIt($uint64(it[].index)).join(",") & "]"
 
 func isEmpty[A](holder: SidecarHolder[A]): bool =

beacon_chain/nimbus_beacon_node.nim

@@ -2287,8 +2287,7 @@ proc installMessageValidators(node: BeaconNode) =
                 if res == ValidationResult.Accept:
                   node.eventBus.blockGossipPeerQueue.emit(
                     EventBeaconBlockGossipPeerObject.init(signedBlock, src))
-                res
-        )
+                res)
         # beacon_attestation_{subnet_id}
         # https://github.com/ethereum/consensus-specs/blob/v1.4.0-beta.5/specs/phase0/p2p-interface.md#beacon_attestation_subnet_id
         # https://github.com/ethereum/consensus-specs/blob/v1.6.0-beta.0/specs/gloas/p2p-interface.md#beacon_attestation_subnet_id