From 9233a52e4b22b1b75a4c1c5d71d9f62bc737bff7 Mon Sep 17 00:00:00 2001
From: henridf <henridf@gmail.com>
Date: Sat, 4 Feb 2023 12:13:09 +0100
Subject: [PATCH] Don't pass RuntimeConfig to RequestManager (#4589)

---
 beacon_chain/nimbus_beacon_node.nim   | 4 +++-
 beacon_chain/sync/request_manager.nim | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/beacon_chain/nimbus_beacon_node.nim b/beacon_chain/nimbus_beacon_node.nim
index 255cb1999..5e99eddc7 100644
--- a/beacon_chain/nimbus_beacon_node.nim
+++ b/beacon_chain/nimbus_beacon_node.nim
@@ -387,7 +387,9 @@ proc initFullNode(
   node.processor = processor
   node.blockProcessor = blockProcessor
   node.consensusManager = consensusManager
-  node.requestManager = RequestManager.init(node.network, dag.cfg, getBeaconTime,
+  node.requestManager = RequestManager.init(node.network,
+                                            dag.cfg.EIP4844_FORK_EPOCH,
+                                            getBeaconTime,
                                             blockVerifier, blockBlobsVerifier)
   node.syncManager = syncManager
   node.backfiller = backfiller
diff --git a/beacon_chain/sync/request_manager.nim b/beacon_chain/sync/request_manager.nim
index 620670ffd..7162556ea 100644
--- a/beacon_chain/sync/request_manager.nim
+++ b/beacon_chain/sync/request_manager.nim
@@ -39,7 +39,7 @@ type
   RequestManager* = object
     network*: Eth2Node
     inpQueue*: AsyncQueue[FetchRecord]
-    cfg: RuntimeConfig
+    EIP4844_FORK_EPOCH: Epoch
     getBeaconTime: GetBeaconTimeFn
     blockVerifier: BlockVerifier
     blockBlobsVerifier: BlockBlobsVerifier
@@ -52,14 +52,14 @@ func shortLog*(x: seq[FetchRecord]): string =
   "[" & x.mapIt(shortLog(it.root)).join(", ") & "]"
 
 proc init*(T: type RequestManager, network: Eth2Node,
-              cfg: RuntimeConfig,
+              eip4844Epoch: Epoch,
               getBeaconTime: GetBeaconTimeFn,
               blockVerifier: BlockVerifier,
               blockBlobsVerifier: BlockBlobsVerifier): RequestManager =
   RequestManager(
     network: network,
     inpQueue: newAsyncQueue[FetchRecord](),
-    cfg: cfg,
+    EIP4844_FORK_EPOCH: eip4844Epoch,
     getBeaconTime: getBeaconTime,
     blockVerifier: blockVerifier,
     blockBlobsVerifier: blockBlobsVerifier,
@@ -249,7 +249,7 @@ proc fetchAncestorBlocksAndBlobsFromNetwork(rman: RequestManager,
 
 
 proc isBlobsTime(rman: RequestManager): bool =
-  rman.getBeaconTime().slotOrZero.epoch >= rman.cfg.EIP4844_FORK_EPOCH
+  rman.getBeaconTime().slotOrZero.epoch >= rman.EIP4844_FORK_EPOCH
 
 proc requestManagerLoop(rman: RequestManager) {.async.} =
   var rootList = newSeq[Eth2Digest]()