move deposit data file to testutils

ssvlabs · Jul 4, 2024 · 31b0064 · 31b0064
1 parent 610d136
commit 31b0064
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/types/spectest/tests/beacon/deposit_data.go b/types/spectest/tests/beacon/deposit_data.go
@@ -3,6 +3,7 @@ package beacon
 import (
 	"encoding/hex"
 	"github.com/ssvlabs/ssv-spec/types"
+	"github.com/ssvlabs/ssv-spec/types/testingutils"
 	comparable2 "github.com/ssvlabs/ssv-spec/types/testingutils/comparable"
 	"github.com/stretchr/testify/require"
 	"reflect"
@@ -25,7 +26,7 @@ func (test *DepositDataSpecTest) Run(t *testing.T) {
 	validatorPK, _ := hex.DecodeString(test.ValidatorPK)
 	withdrawalCredentials, _ := hex.DecodeString(test.WithdrawalCredentials)
 
-	r, _, err := types.GenerateETHDepositData(
+	r, _, err := testingutils.GenerateETHDepositData(
 		validatorPK,
 		withdrawalCredentials,
 		test.ForkVersion,

diff --git a/types/eth1_deposit.go → types/testingutils/eth1_deposit.go b/types/eth1_deposit.go → types/testingutils/eth1_deposit.go
@@ -1,8 +1,9 @@
-package types
+package testingutils
 
 import (
 	"github.com/attestantio/go-eth2-client/spec/phase0"
 	"github.com/pkg/errors"
+	"github.com/ssvlabs/ssv-spec/types"
 )
 
 // GenerateETHDepositData returns un-signed deposit data and deposit data root for signature
@@ -16,20 +17,20 @@ func GenerateETHDepositData(
 	ret := &phase0.DepositMessage{
 		PublicKey:             pk,
 		WithdrawalCredentials: withdrawalCredentials,
-		Amount:                phase0.Gwei(MaxEffectiveBalanceInGwei),
+		Amount:                phase0.Gwei(types.MaxEffectiveBalanceInGwei),
 	}
 
-	domainR, err := ComputeETHDomain(domain, fork, GenesisValidatorsRoot)
+	domainR, err := types.ComputeETHDomain(domain, fork, types.GenesisValidatorsRoot)
 	if err != nil {
 		return nil, nil, errors.Wrap(err, "could not compute deposit domain")
 	}
-	signingRoot, err := ComputeETHSigningRoot(ret, domainR)
+	signingRoot, err := types.ComputeETHSigningRoot(ret, domainR)
 	if err != nil {
 		return nil, nil, errors.Wrap(err, "could not compute deposit signing root")
 	}
 	return signingRoot[:], &phase0.DepositData{
 		PublicKey:             pk,
 		WithdrawalCredentials: withdrawalCredentials,
-		Amount:                phase0.Gwei(MaxEffectiveBalanceInGwei),
+		Amount:                phase0.Gwei(types.MaxEffectiveBalanceInGwei),
 	}, nil
 }