refactor: add beacon node supervisor. (lambdaclass#566)

Co-authored-by: Martin Paulucci <mpaulucci@Martins-MacBook-Pro.local>
h3lio5 · Jan 5, 2024 · 62cbc9a · 62cbc9a
1 parent 61280ac
commit 62cbc9a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/lib/lambda_ethereum_consensus/application.ex b/lib/lambda_ethereum_consensus/application.ex
@@ -29,11 +29,7 @@ defmodule LambdaEthereumConsensus.Application do
       {LambdaEthereumConsensus.Libp2pPort, libp2p_opts},
       {LambdaEthereumConsensus.Store.Db, []},
       {LambdaEthereumConsensus.P2P.Peerbook, []},
-      {LambdaEthereumConsensus.ForkChoice, [checkpoint_sync]},
-      {LambdaEthereumConsensus.P2P.IncomingRequests, []},
-      {LambdaEthereumConsensus.Beacon.PendingBlocks, []},
-      {LambdaEthereumConsensus.Beacon.SyncBlocks, []},
-      {LambdaEthereumConsensus.P2P.GossipSub, []},
+      {LambdaEthereumConsensus.Beacon.BeaconNode, [checkpoint_sync]},
       {BeaconApi.Endpoint, []}
     ]
 

diff --git a/...ereum_consensus/fork_choice/supervisor.ex → ..._ethereum_consensus/beacon/beacon_node.ex b/...ereum_consensus/fork_choice/supervisor.ex → ..._ethereum_consensus/beacon/beacon_node.ex
@@ -1,10 +1,10 @@
-defmodule LambdaEthereumConsensus.ForkChoice do
+defmodule LambdaEthereumConsensus.Beacon.BeaconNode do
   @moduledoc false
 
   use Supervisor
   require Logger
 
-  alias LambdaEthereumConsensus.ForkChoice.CheckpointSync
+  alias LambdaEthereumConsensus.Beacon.CheckpointSync
   alias LambdaEthereumConsensus.StateTransition.Cache
   alias LambdaEthereumConsensus.Store.{BlockStore, StateStore}
 
@@ -60,7 +60,10 @@ defmodule LambdaEthereumConsensus.ForkChoice do
 
     children = [
       {LambdaEthereumConsensus.ForkChoice.Store, {anchor_state, anchor_block}},
-      {LambdaEthereumConsensus.ForkChoice.Tree, []}
+      {LambdaEthereumConsensus.Beacon.PendingBlocks, []},
+      {LambdaEthereumConsensus.Beacon.SyncBlocks, []},
+      {LambdaEthereumConsensus.P2P.IncomingRequests, []},
+      {LambdaEthereumConsensus.P2P.GossipSub, []}
     ]
 
     Supervisor.init(children, strategy: :one_for_all)

diff --git a/..._consensus/fork_choice/checkpoint_sync.ex → ...ereum_consensus/beacon/checkpoint_sync.ex b/..._consensus/fork_choice/checkpoint_sync.ex → ...ereum_consensus/beacon/checkpoint_sync.ex
@@ -1,4 +1,4 @@
-defmodule LambdaEthereumConsensus.ForkChoice.CheckpointSync do
+defmodule LambdaEthereumConsensus.Beacon.CheckpointSync do
   @moduledoc """
   Functions related to checkpoint-sync.
   """