From bf575aac5780284bea6202b3a1150840bc8f1dc8 Mon Sep 17 00:00:00 2001
From: tersec <tersec@users.noreply.github.com>
Date: Wed, 28 Jun 2023 13:30:49 +0000
Subject: [PATCH] make OnFooBlockAdded callback types generic (#5134)

---
 .../block_pools_types.nim                     | 43 +++----------------
 1 file changed, 7 insertions(+), 36 deletions(-)

diff --git a/beacon_chain/consensus_object_pools/block_pools_types.nim b/beacon_chain/consensus_object_pools/block_pools_types.nim
index bdc8c32dc..7c938abe0 100644
--- a/beacon_chain/consensus_object_pools/block_pools_types.nim
+++ b/beacon_chain/consensus_object_pools/block_pools_types.nim
@@ -279,43 +279,14 @@ type
     # balances, as used in fork choice
     effective_balances_bytes*: seq[byte]
 
-  # TODO when Nim 1.2 support is dropped, make these generic. 1.2 generates
-  # invalid C code, which gcc refuses to compile. Example test case:
-  # type
-  #   OnBlockAdded[T] = proc(x: T)
-  #   OnPhase0BlockAdded = OnBlockAdded[int]
-  # proc f(x: OnPhase0BlockAdded) = discard
-  # const nilCallback = OnPhase0BlockAdded(nil)
-  # f(nilCallback)
-  OnPhase0BlockAdded* = proc(
-    blckRef: BlockRef,
-    blck: phase0.TrustedSignedBeaconBlock,
-    epochRef: EpochRef,
-    unrealized: FinalityCheckpoints) {.gcsafe, raises: [Defect].}
-
-  OnAltairBlockAdded* = proc(
-    blckRef: BlockRef,
-    blck: altair.TrustedSignedBeaconBlock,
-    epochRef: EpochRef,
-    unrealized: FinalityCheckpoints) {.gcsafe, raises: [Defect].}
-
-  OnBellatrixBlockAdded* = proc(
-    blckRef: BlockRef,
-    blck: bellatrix.TrustedSignedBeaconBlock,
-    epochRef: EpochRef,
-    unrealized: FinalityCheckpoints) {.gcsafe, raises: [Defect].}
-
-  OnCapellaBlockAdded* = proc(
-    blckRef: BlockRef,
-    blck: capella.TrustedSignedBeaconBlock,
-    epochRef: EpochRef,
-    unrealized: FinalityCheckpoints) {.gcsafe, raises: [Defect].}
-
-  OnDenebBlockAdded* = proc(
-    blckRef: BlockRef,
-    blck: deneb.TrustedSignedBeaconBlock,
-    epochRef: EpochRef,
+  OnBlockAdded[T] = proc(
+    blckRef: BlockRef, blck: T, epochRef: EpochRef,
     unrealized: FinalityCheckpoints) {.gcsafe, raises: [Defect].}
+  OnPhase0BlockAdded* = OnBlockAdded[phase0.TrustedSignedBeaconBlock]
+  OnAltairBlockAdded* = OnBlockAdded[altair.TrustedSignedBeaconBlock]
+  OnBellatrixBlockAdded* = OnBlockAdded[bellatrix.TrustedSignedBeaconBlock]
+  OnCapellaBlockAdded* = OnBlockAdded[capella.TrustedSignedBeaconBlock]
+  OnDenebBlockAdded* = OnBlockAdded[deneb.TrustedSignedBeaconBlock]
 
   OnForkyBlockAdded* =
     OnPhase0BlockAdded | OnAltairBlockAdded | OnBellatrixBlockAdded |