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

Massive code cleanup (#10913)

Browse Source 
* Massive code cleanup

* fix test issues

* remove GetGenesis mock expectations

* unused receiver

* rename unused params

Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com>
This commit is contained in:
Radosław Kapka
2022-06-27 15:34:38 +02:00
committed by GitHub
parent 9216be7d43
commit 7f56ac6355
158 changed files with 1020 additions and 1177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/validator/accounts/delete_test.go
View File

@@ -175,7 +175,7 @@ func TestDeleteAccounts_Noninteractive(t *testing.T) {
// We attempt to delete the accounts specified.
require.NoError(t, accountsDelete(cliCtx))
keymanager, err := local.NewKeymanager(
km, err := local.NewKeymanager(
cliCtx.Context,
&local.SetupConfig{
Wallet: w,
@@ -183,7 +183,7 @@ func TestDeleteAccounts_Noninteractive(t *testing.T) {
},
)
require.NoError(t, err)
remainingAccounts, err := keymanager.FetchValidatingPublicKeys(cliCtx.Context)
remainingAccounts, err := km.FetchValidatingPublicKeys(cliCtx.Context)
require.NoError(t, err)
require.Equal(t, len(remainingAccounts), 1)
remainingPublicKey, err := hex.DecodeString(k3.Pubkey)

16
cmd/validator/accounts/exit_test.go
View File

@@ -77,11 +77,11 @@ func TestExitAccountsCli_OK(t *testing.T) {
require.NoError(t, err)
require.NoError(t, accountsImport(cliCtx))
_, keymanager, err := walletWithKeymanager(cliCtx)
_, km, err := walletWithKeymanager(cliCtx)
require.NoError(t, err)
require.NotNil(t, keymanager)
require.NotNil(t, km)
validatingPublicKeys, err := keymanager.FetchValidatingPublicKeys(cliCtx.Context)
validatingPublicKeys, err := km.FetchValidatingPublicKeys(cliCtx.Context)
require.NoError(t, err)
require.NotNil(t, validatingPublicKeys)
@@ -98,7 +98,7 @@ func TestExitAccountsCli_OK(t *testing.T) {
cfg := accounts.PerformExitCfg{
ValidatorClient: mockValidatorClient,
NodeClient: mockNodeClient,
Keymanager: keymanager,
Keymanager: km,
RawPubKeys: rawPubKeys,
FormattedPubKeys: formattedPubKeys,
}
@@ -177,11 +177,11 @@ func TestExitAccountsCli_OK_AllPublicKeys(t *testing.T) {
require.NoError(t, err)
require.NoError(t, accountsImport(cliCtx))
_, keymanager, err := walletWithKeymanager(cliCtx)
_, km, err := walletWithKeymanager(cliCtx)
require.NoError(t, err)
require.NotNil(t, keymanager)
require.NotNil(t, km)
validatingPublicKeys, err := keymanager.FetchValidatingPublicKeys(cliCtx.Context)
validatingPublicKeys, err := km.FetchValidatingPublicKeys(cliCtx.Context)
require.NoError(t, err)
require.NotNil(t, validatingPublicKeys)
@@ -198,7 +198,7 @@ func TestExitAccountsCli_OK_AllPublicKeys(t *testing.T) {
cfg := accounts.PerformExitCfg{
ValidatorClient: mockValidatorClient,
NodeClient: mockNodeClient,
Keymanager: keymanager,
Keymanager: km,
RawPubKeys: rawPubKeys,
FormattedPubKeys: formattedPubKeys,
}

18
cmd/validator/accounts/import_test.go
View File

@@ -44,7 +44,7 @@ func TestImport_Noninteractive(t *testing.T) {
},
})
require.NoError(t, err)
keymanager, err := local.NewKeymanager(
newKm, err := local.NewKeymanager(
cliCtx.Context,
&local.SetupConfig{
Wallet: w,
@@ -54,9 +54,9 @@ func TestImport_Noninteractive(t *testing.T) {
require.NoError(t, err)
// Make sure there are no accounts at the start.
accounts, err := keymanager.ValidatingAccountNames()
accNames, err := newKm.ValidatingAccountNames()
require.NoError(t, err)
assert.Equal(t, len(accounts), 0)
assert.Equal(t, len(accNames), 0)
// Create 2 keys.
createKeystore(t, keysDir)
@@ -149,7 +149,7 @@ func TestImport_Noninteractive_RandomName(t *testing.T) {
},
})
require.NoError(t, err)
keymanager, err := local.NewKeymanager(
newKm, err := local.NewKeymanager(
cliCtx.Context,
&local.SetupConfig{
Wallet: w,
@@ -159,9 +159,9 @@ func TestImport_Noninteractive_RandomName(t *testing.T) {
require.NoError(t, err)
// Make sure there are no accounts at the start.
accounts, err := keymanager.ValidatingAccountNames()
accNames, err := newKm.ValidatingAccountNames()
require.NoError(t, err)
assert.Equal(t, len(accounts), 0)
assert.Equal(t, len(accNames), 0)
// Create 2 keys.
createRandomNameKeystore(t, keysDir)
@@ -232,7 +232,7 @@ func TestImport_Noninteractive_Filepath(t *testing.T) {
},
})
require.NoError(t, err)
keymanager, err := local.NewKeymanager(
newKm, err := local.NewKeymanager(
cliCtx.Context,
&local.SetupConfig{
Wallet: w,
@@ -242,9 +242,9 @@ func TestImport_Noninteractive_Filepath(t *testing.T) {
require.NoError(t, err)
// Make sure there are no accounts at the start.
accounts, err := keymanager.ValidatingAccountNames()
accNames, err := newKm.ValidatingAccountNames()
require.NoError(t, err)
assert.Equal(t, len(accounts), 0)
assert.Equal(t, len(accNames), 0)
require.NoError(t, accountsImport(cliCtx))