cleanup

app/eth2wrap/httpwrap.go

@@ -37,34 +37,6 @@ type NodePeerCountProvider interface {
 	NodePeerCount(ctx context.Context) (int, error)
 }
 
-type ActiveValidators map[eth2p0.ValidatorIndex]eth2p0.BLSPubKey
-
-// Pubkeys returns a list of active validator pubkeys.
-func (m ActiveValidators) Pubkeys() []eth2p0.BLSPubKey {
-	var pubkeys []eth2p0.BLSPubKey
-	for _, pubkey := range m {
-		pubkeys = append(pubkeys, pubkey)
-	}
-
-	return pubkeys
-}
-
-// Indices returns a list of active validator indices.
-func (m ActiveValidators) Indices() []eth2p0.ValidatorIndex {
-	var indices []eth2p0.ValidatorIndex
-	for index := range m {
-		indices = append(indices, index)
-	}
-
-	return indices
-}
-
-// ActiveValidatorsProvider is the interface for providing current epoch's cached active validator
-// identity information.
-type ActiveValidatorsProvider interface {
-	ActiveValidators(context.Context) (ActiveValidators, error)
-}
-
 // NewHTTPAdapterForT returns a http adapter for testing non-eth2service methods as it is nil.
 func NewHTTPAdapterForT(_ *testing.T, address string, timeout time.Duration) Client {
 	return newHTTPAdapter(nil, address, timeout)

app/eth2wrap/valcache.go

@@ -11,6 +11,35 @@ import (
 	"github.com/obolnetwork/charon/app/errors"
 )
 
+// ActiveValidators is a map of active validator indices to pubkeys.
+type ActiveValidators map[eth2p0.ValidatorIndex]eth2p0.BLSPubKey
+
+// Pubkeys returns a list of active validator pubkeys.
+func (m ActiveValidators) Pubkeys() []eth2p0.BLSPubKey {
+	var pubkeys []eth2p0.BLSPubKey
+	for _, pubkey := range m {
+		pubkeys = append(pubkeys, pubkey)
+	}
+
+	return pubkeys
+}
+
+// Indices returns a list of active validator indices.
+func (m ActiveValidators) Indices() []eth2p0.ValidatorIndex {
+	var indices []eth2p0.ValidatorIndex
+	for index := range m {
+		indices = append(indices, index)
+	}
+
+	return indices
+}
+
+// ActiveValidatorsProvider is the interface for providing current epoch's cached active validator
+// identity information.
+type ActiveValidatorsProvider interface {
+	ActiveValidators(context.Context) (ActiveValidators, error)
+}
+
 // NewValidatorCache creates a new validator cache.
 func NewValidatorCache(eth2Cl Client, pubkeys []eth2p0.BLSPubKey) *ValidatorCache {
 	return &ValidatorCache{