From 382296f8092f71ad38e79ce9a8f0076488a40c41 Mon Sep 17 00:00:00 2001
From: Pedro Miranda <pedro.miranda@nimbus.team>
Date: Fri, 29 Nov 2024 11:36:39 +0000
Subject: [PATCH] Start using eth2 code.

All possible constraints regarding eth2 are identified and tested for possible solutions.
---
 nimbus_unified/consensus/consensus_wrapper.nim | 4 ++--
 nimbus_unified/nimbus_unified.nim              | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/nimbus_unified/consensus/consensus_wrapper.nim b/nimbus_unified/consensus/consensus_wrapper.nim
index 1569ee0bf..5d8ead41c 100644
--- a/nimbus_unified/consensus/consensus_wrapper.nim
+++ b/nimbus_unified/consensus/consensus_wrapper.nim
@@ -9,7 +9,7 @@
 import
   std/[os, atomics, random, terminal, times, exitprocs, sequtils],
   metrics,
-  beacon_chain/nimbus_binary_common,
+  beacon_chain/[nimbus_beacon_node, nimbus_binary_common],
   beacon_chain/spec/forks,
   beacon_chain/[beacon_chain_db, trusted_node_sync],
   beacon_chain/networking/network_metadata_downloads,
@@ -2357,7 +2357,7 @@ proc start*(node: BeaconNode) {.raises: [CatchableError].} =
 
 ## runs beacon node
 ## adapted from nimbus-eth2
-proc doRunBeaconNode(
+proc doRunBeaconNodeLocal(
     config: var BeaconNodeConf, rng: ref HmacDrbgContext
 ) {.raises: [CatchableError].} =
   # TODO: Define this varaibles somewhere
diff --git a/nimbus_unified/nimbus_unified.nim b/nimbus_unified/nimbus_unified.nim
index a856c3077..f4b00d68d 100644
--- a/nimbus_unified/nimbus_unified.nim
+++ b/nimbus_unified/nimbus_unified.nim
@@ -6,15 +6,13 @@
 # at your option. This file may not be copied, modified, or distributed except according to those terms.
 
 import
-  std/[atomics, os],
+  std/[atomics, os, exitprocs],
   chronicles,
   stew/io2,
   consensus/consensus_wrapper,
   execution/execution_wrapper,
-  beacon_chain/[conf, conf_common],
-  beacon_chain/[beacon_chain_db],
+  beacon_chain/[nimbus_binary_common, conf, conf_common],
   beacon_chain/validators/keystore_management,
-  beacon_chain/nimbus_binary_common,
   version
 
 ## Constants