github/prysm
1
1
Fork 0
mirror of https://github.com/OffchainLabs/prysm.git synced 2026-01-08 23:18:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

removed redundant mock validator and replaced with test util one (#15111)

Browse Source
This commit is contained in:
james-prysm
2025-04-02 16:17:20 -05:00
committed by GitHub
parent 877d9ee948
commit 2cfc204e9a
7 changed files with 30 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
validator/rpc/BUILD.bazel
View File

@@ -125,9 +125,9 @@ go_test(
"//testing/validator-mock:go_default_library",
"//validator/accounts:go_default_library",
"//validator/accounts/iface:go_default_library",
"//validator/accounts/testing:go_default_library",
"//validator/accounts/wallet:go_default_library",
"//validator/client:go_default_library",
"//validator/client/testutil:go_default_library",
"//validator/db/common:go_default_library",
"//validator/db/filesystem:go_default_library",
"//validator/db/iface:go_default_library",

6
validator/rpc/handler_wallet_test.go
View File

@@ -20,9 +20,9 @@ import (
"github.com/prysmaticlabs/prysm/v5/testing/require"
"github.com/prysmaticlabs/prysm/v5/validator/accounts"
"github.com/prysmaticlabs/prysm/v5/validator/accounts/iface"
mock "github.com/prysmaticlabs/prysm/v5/validator/accounts/testing"
"github.com/prysmaticlabs/prysm/v5/validator/accounts/wallet"
"github.com/prysmaticlabs/prysm/v5/validator/client"
"github.com/prysmaticlabs/prysm/v5/validator/client/testutil"
"github.com/prysmaticlabs/prysm/v5/validator/keymanager"
"github.com/tyler-smith/go-bip39"
keystorev4 "github.com/wealdtech/go-eth2-wallet-encryptor-keystorev4"
@@ -48,7 +48,7 @@ func TestServer_CreateWallet_Local(t *testing.T) {
require.NoError(t, err)
vs, err := client.NewValidatorService(ctx, &client.Config{
Wallet: w,
Validator: &mock.Validator{
Validator: &testutil.FakeValidator{
Km: km,
},
})
@@ -445,7 +445,7 @@ func TestServer_WalletConfig(t *testing.T) {
s.wallet = w
vs, err := client.NewValidatorService(ctx, &client.Config{
Wallet: w,
Validator: &mock.Validator{
Validator: &testutil.FakeValidator{
Km: km,
},
})

8
validator/rpc/handlers_accounts_test.go
View File

@@ -23,8 +23,8 @@ import (
validatormock "github.com/prysmaticlabs/prysm/v5/testing/validator-mock"
"github.com/prysmaticlabs/prysm/v5/validator/accounts"
"github.com/prysmaticlabs/prysm/v5/validator/accounts/iface"
mock "github.com/prysmaticlabs/prysm/v5/validator/accounts/testing"
"github.com/prysmaticlabs/prysm/v5/validator/client"
"github.com/prysmaticlabs/prysm/v5/validator/client/testutil"
"github.com/prysmaticlabs/prysm/v5/validator/keymanager"
"github.com/prysmaticlabs/prysm/v5/validator/keymanager/derived"
constant "github.com/prysmaticlabs/prysm/v5/validator/testing"
@@ -55,7 +55,7 @@ func TestServer_ListAccounts(t *testing.T) {
require.NoError(t, err)
vs, err := client.NewValidatorService(ctx, &client.Config{
Wallet: w,
Validator: &mock.Validator{
Validator: &testutil.FakeValidator{
Km: km,
},
})
@@ -160,7 +160,7 @@ func TestServer_BackupAccounts(t *testing.T) {
require.NoError(t, err)
vs, err := client.NewValidatorService(ctx, &client.Config{
Wallet: w,
Validator: &mock.Validator{
Validator: &testutil.FakeValidator{
Km: km,
},
})
@@ -284,7 +284,7 @@ func TestServer_VoluntaryExit(t *testing.T) {
require.NoError(t, err)
vs, err := client.NewValidatorService(ctx, &client.Config{
Wallet: w,
Validator: &mock.Validator{
Validator: &testutil.FakeValidator{
Km: km,
},
})

38
validator/rpc/handlers_keymanager_test.go
View File

@@ -29,9 +29,9 @@ import (
validatormock "github.com/prysmaticlabs/prysm/v5/testing/validator-mock"
"github.com/prysmaticlabs/prysm/v5/validator/accounts"
"github.com/prysmaticlabs/prysm/v5/validator/accounts/iface"
mock "github.com/prysmaticlabs/prysm/v5/validator/accounts/testing"
"github.com/prysmaticlabs/prysm/v5/validator/accounts/wallet"
"github.com/prysmaticlabs/prysm/v5/validator/client"
"github.com/prysmaticlabs/prysm/v5/validator/client/testutil"
dbCommon "github.com/prysmaticlabs/prysm/v5/validator/db/common"
"github.com/prysmaticlabs/prysm/v5/validator/db/filesystem"
DBIface "github.com/prysmaticlabs/prysm/v5/validator/db/iface"
@@ -51,7 +51,7 @@ import (
func TestServer_ListKeystores(t *testing.T) {
ctx := context.Background()
t.Run("wallet not ready", func(t *testing.T) {
m := &mock.Validator{}
m := &testutil.FakeValidator{}
vs, err := client.NewValidatorService(ctx, &client.Config{
Validator: m,
})
@@ -83,7 +83,7 @@ func TestServer_ListKeystores(t *testing.T) {
require.NoError(t, err)
vs, err := client.NewValidatorService(ctx, &client.Config{
Wallet: w,
Validator: &mock.Validator{
Validator: &testutil.FakeValidator{
Km: km,
},
})
@@ -149,7 +149,7 @@ func TestServer_ImportKeystores(t *testing.T) {
require.NoError(t, err)
vs, err := client.NewValidatorService(ctx, &client.Config{
Wallet: w,
Validator: &mock.Validator{
Validator: &testutil.FakeValidator{
Km: km,
},
})
@@ -370,7 +370,7 @@ func TestServer_ImportKeystores_WrongKeymanagerKind(t *testing.T) {
require.NoError(t, err)
vs, err := client.NewValidatorService(ctx, &client.Config{
Wallet: w,
Validator: &mock.Validator{
Validator: &testutil.FakeValidator{
Km: km,
},
})
@@ -654,7 +654,7 @@ func TestServer_DeleteKeystores_WrongKeymanagerKind(t *testing.T) {
require.NoError(t, err)
vs, err := client.NewValidatorService(ctx, &client.Config{
Wallet: w,
Validator: &mock.Validator{
Validator: &testutil.FakeValidator{
Km: km,
},
})
@@ -697,7 +697,7 @@ func setupServerWithWallet(t testing.TB) *Server {
require.NoError(t, err)
vs, err := client.NewValidatorService(ctx, &client.Config{
Wallet: w,
Validator: &mock.Validator{
Validator: &testutil.FakeValidator{
Km: km,
},
})
@@ -729,7 +729,7 @@ func TestServer_SetVoluntaryExit(t *testing.T) {
km, err := w.InitializeKeymanager(ctx, iface.InitKeymanagerConfig{ListenForChanges: false})
require.NoError(t, err)
m := &mock.Validator{Km: km}
m := &testutil.FakeValidator{Km: km}
vs, err := client.NewValidatorService(ctx, &client.Config{
Validator: m,
})
@@ -950,7 +950,7 @@ func TestServer_GetGasLimit(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
m := &mock.Validator{}
m := &testutil.FakeValidator{}
err := m.SetProposerSettings(ctx, tt.args)
require.NoError(t, err)
vs, err := client.NewValidatorService(ctx, &client.Config{
@@ -1107,7 +1107,7 @@ func TestServer_SetGasLimit(t *testing.T) {
for _, isSlashingProtectionMinimal := range [...]bool{false, true} {
for _, tt := range tests {
t.Run(fmt.Sprintf("%s/isSlashingProtectionMinimal:%v", tt.name, isSlashingProtectionMinimal), func(t *testing.T) {
m := &mock.Validator{}
m := &testutil.FakeValidator{}
err := m.SetProposerSettings(ctx, tt.proposerSettings)
require.NoError(t, err)
validatorDB := dbtest.SetupDB(t, [][fieldparams.BLSPubkeyLength]byte{}, isSlashingProtectionMinimal)
@@ -1296,7 +1296,7 @@ func TestServer_DeleteGasLimit(t *testing.T) {
for _, isSlashingProtectionMinimal := range [...]bool{false, true} {
for _, tt := range tests {
t.Run(fmt.Sprintf("%s/isSlashingProtectionMinimal:%v", tt.name, isSlashingProtectionMinimal), func(t *testing.T) {
m := &mock.Validator{}
m := &testutil.FakeValidator{}
err := m.SetProposerSettings(ctx, tt.proposerSettings)
require.NoError(t, err)
validatorDB := dbtest.SetupDB(t, [][fieldparams.BLSPubkeyLength]byte{}, isSlashingProtectionMinimal)
@@ -1350,7 +1350,7 @@ func TestServer_ListRemoteKeys(t *testing.T) {
require.NoError(t, err)
vs, err := client.NewValidatorService(ctx, &client.Config{
Wallet: w,
Validator: &mock.Validator{
Validator: &testutil.FakeValidator{
Km: km,
},
Web3SignerConfig: config,
@@ -1406,7 +1406,7 @@ func TestServer_ImportRemoteKeys(t *testing.T) {
require.NoError(t, err)
vs, err := client.NewValidatorService(ctx, &client.Config{
Wallet: w,
Validator: &mock.Validator{
Validator: &testutil.FakeValidator{
Km: km,
},
Web3SignerConfig: config,
@@ -1468,7 +1468,7 @@ func TestServer_DeleteRemoteKeys(t *testing.T) {
require.NoError(t, err)
vs, err := client.NewValidatorService(ctx, &client.Config{
Wallet: w,
Validator: &mock.Validator{
Validator: &testutil.FakeValidator{
Km: km,
},
Web3SignerConfig: config,
@@ -1563,7 +1563,7 @@ func TestServer_ListFeeRecipientByPubkey(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
m := &mock.Validator{}
m := &testutil.FakeValidator{}
err := m.SetProposerSettings(ctx, tt.args)
require.NoError(t, err)
@@ -1592,7 +1592,7 @@ func TestServer_ListFeeRecipientByPubKey_NoFeeRecipientSet(t *testing.T) {
ctx := context.Background()
vs, err := client.NewValidatorService(ctx, &client.Config{
Validator: &mock.Validator{},
Validator: &testutil.FakeValidator{},
})
require.NoError(t, err)
@@ -1774,7 +1774,7 @@ func TestServer_FeeRecipientByPubkey(t *testing.T) {
for _, isSlashingProtectionMinimal := range [...]bool{false, true} {
for _, tt := range tests {
t.Run(fmt.Sprintf("%s/isSlashingProtectionMinimal:%v", tt.name, isSlashingProtectionMinimal), func(t *testing.T) {
m := &mock.Validator{}
m := &testutil.FakeValidator{}
err := m.SetProposerSettings(ctx, tt.proposerSettings)
require.NoError(t, err)
validatorDB := dbtest.SetupDB(t, [][fieldparams.BLSPubkeyLength]byte{}, isSlashingProtectionMinimal)
@@ -1886,7 +1886,7 @@ func TestServer_DeleteFeeRecipientByPubkey(t *testing.T) {
for _, isSlashingProtectionMinimal := range [...]bool{false, true} {
for _, tt := range tests {
t.Run(fmt.Sprintf("%s/isSlashingProtectionMinimal:%v", tt.name, isSlashingProtectionMinimal), func(t *testing.T) {
m := &mock.Validator{}
m := &testutil.FakeValidator{}
err := m.SetProposerSettings(ctx, tt.proposerSettings)
require.NoError(t, err)
validatorDB := dbtest.SetupDB(t, [][fieldparams.BLSPubkeyLength]byte{}, isSlashingProtectionMinimal)
@@ -1939,7 +1939,7 @@ func TestServer_DeleteFeeRecipientByPubkey_InvalidPubKey(t *testing.T) {
func TestServer_Graffiti(t *testing.T) {
graffiti := "graffiti"
m := &mock.Validator{}
m := &testutil.FakeValidator{}
vs, err := client.NewValidatorService(context.Background(), &client.Config{
Validator: m,
})