remove storageMap from eventhandler

ssvlabs · Aug 13, 2024 · 87845f1 · 87845f1
1 parent b5dd15c
commit 87845f1
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 15 deletions.
diff --git a/cli/operator/node.go b/cli/operator/node.go
@@ -371,7 +371,6 @@ var StartNodeCmd = &cobra.Command{
 			logger,
 			executionClient,
 			validatorCtrl,
-			storageMap,
 			metricsReporter,
 			networkConfig,
 			nodeStorage,
@@ -644,7 +643,6 @@ func setupEventHandling(
 	logger *zap.Logger,
 	executionClient *executionclient.ExecutionClient,
 	validatorCtrl validator.Controller,
-	storageMap *ibftstorage.QBFTStores,
 	metricsReporter metricsreporter.MetricsReporter,
 	networkConfig networkconfig.NetworkConfig,
 	nodeStorage operatorstorage.Storage,
@@ -668,7 +666,6 @@ func setupEventHandling(
 		operatorDecrypter,
 		keyManager,
 		cfg.SSVOptions.ValidatorOptions.Beacon,
-		storageMap,
 		eventhandler.WithFullNode(),
 		eventhandler.WithLogger(logger),
 		eventhandler.WithMetrics(metricsReporter),

diff --git a/eth/ethtest/utils_test.go b/eth/ethtest/utils_test.go
@@ -190,7 +190,6 @@ func setupEventHandler(
 			operator.privateKey,
 			keyManager,
 			bc,
-			storageMap,
 			eventhandler.WithFullNode(),
 			eventhandler.WithLogger(logger),
 		)
@@ -222,7 +221,6 @@ func setupEventHandler(
 		operator.privateKey,
 		keyManager,
 		bc,
-		storageMap,
 		eventhandler.WithFullNode(),
 		eventhandler.WithLogger(logger),
 	)

diff --git a/eth/eventhandler/event_handler.go b/eth/eventhandler/event_handler.go
@@ -5,10 +5,11 @@ package eventhandler
 import (
 	"errors"
 	"fmt"
-	"github.com/ssvlabs/ssv/ekm"
 	"math/big"
 	"time"
 
+	"github.com/ssvlabs/ssv/ekm"
+
 	"github.com/attestantio/go-eth2-client/spec/phase0"
 	ethcommon "github.com/ethereum/go-ethereum/common"
 	ethtypes "github.com/ethereum/go-ethereum/core/types"
@@ -19,7 +20,6 @@ import (
 	"github.com/ssvlabs/ssv/eth/eventparser"
 	"github.com/ssvlabs/ssv/eth/executionclient"
 	"github.com/ssvlabs/ssv/eth/localevents"
-	qbftstorage "github.com/ssvlabs/ssv/ibft/storage"
 	"github.com/ssvlabs/ssv/logging/fields"
 	"github.com/ssvlabs/ssv/networkconfig"
 	operatordatastore "github.com/ssvlabs/ssv/operator/datastore"
@@ -66,7 +66,6 @@ type EventHandler struct {
 	operatorDecrypter keys.OperatorDecrypter
 	keyManager        ekm.KeyManager
 	beacon            beaconprotocol.BeaconNode
-	storageMap        *qbftstorage.QBFTStores
 
 	fullNode bool
 	logger   *zap.Logger
@@ -82,7 +81,6 @@ func New(
 	operatorDecrypter keys.OperatorDecrypter,
 	keyManager ekm.KeyManager,
 	beacon beaconprotocol.BeaconNode,
-	storageMap *qbftstorage.QBFTStores,
 	opts ...Option,
 ) (*EventHandler, error) {
 	eh := &EventHandler{
@@ -94,7 +92,6 @@ func New(
 		operatorDecrypter: operatorDecrypter,
 		keyManager:        keyManager,
 		beacon:            beacon,
-		storageMap:        storageMap,
 		logger:            zap.NewNop(),
 		metrics:           nopMetrics{},
 	}

diff --git a/eth/eventhandler/event_handler_test.go b/eth/eventhandler/event_handler_test.go
@@ -1324,7 +1324,6 @@ func setupEventHandler(t *testing.T, ctx context.Context, logger *zap.Logger, ne
 			operator.privateKey,
 			keyManager,
 			bc,
-			storageMap,
 			WithFullNode(),
 			WithLogger(logger),
 			WithMetrics(nopMetrics{}),
@@ -1363,7 +1362,6 @@ func setupEventHandler(t *testing.T, ctx context.Context, logger *zap.Logger, ne
 		operator.privateKey,
 		keyManager,
 		bc,
-		storageMap,
 		WithFullNode(),
 		WithLogger(logger))
 	if err != nil {

diff --git a/eth/eventsyncer/event_syncer_test.go b/eth/eventsyncer/event_syncer_test.go
@@ -27,7 +27,6 @@ import (
 	"github.com/ssvlabs/ssv/eth/executionclient"
 	"github.com/ssvlabs/ssv/eth/simulator"
 	"github.com/ssvlabs/ssv/eth/simulator/simcontract"
-	ibftstorage "github.com/ssvlabs/ssv/ibft/storage"
 	"github.com/ssvlabs/ssv/networkconfig"
 	operatordatastore "github.com/ssvlabs/ssv/operator/datastore"
 	"github.com/ssvlabs/ssv/operator/keys"
@@ -152,7 +151,6 @@ func setupEventHandler(
 	operatorData *registrystorage.OperatorData,
 	privateKey keys.OperatorPrivateKey,
 ) *eventhandler.EventHandler {
-	storageMap := ibftstorage.NewStores()
 	operatorDataStore := operatordatastore.New(operatorData)
 	testNetworkConfig := networkconfig.TestNetwork
 
@@ -187,7 +185,6 @@ func setupEventHandler(
 		privateKey,
 		keyManager,
 		bc,
-		storageMap,
 		eventhandler.WithFullNode(),
 		eventhandler.WithLogger(logger))