Remove Accounts Enable/Disable Code (#8576)

* rem * remove all enable disable code * fix broken build * fix more tests * fix broken tests Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com>
prysmaticlabs · Mar 9, 2021 · ab301aa · ab301aa
1 parent 2bb0a60
commit ab301aa
Show file tree

Hide file tree

Showing 21 changed files with 35 additions and 820 deletions.
diff --git a/validator/accounts/BUILD.bazel b/validator/accounts/BUILD.bazel
@@ -7,7 +7,6 @@ go_library(
         "accounts.go",
         "accounts_backup.go",
         "accounts_delete.go",
-        "accounts_enable_disable.go",
         "accounts_exit.go",
         "accounts_helper.go",
         "accounts_import.go",
@@ -63,7 +62,6 @@ go_test(
     srcs = [
         "accounts_backup_test.go",
         "accounts_delete_test.go",
-        "accounts_enable_disable_test.go",
         "accounts_exit_test.go",
         "accounts_import_test.go",
         "accounts_list_test.go",

diff --git a/validator/accounts/accounts.go b/validator/accounts/accounts.go
@@ -11,11 +11,9 @@ var (
 	ErrCouldNotInitializeKeymanager = "could not initialize keymanager"
 )
 
-// Config specifies parameters to run to delete, enable, disable accounts.
+// Config specifies parameters for accounts commands.
 type Config struct {
-	Wallet            *wallet.Wallet
-	Keymanager        keymanager.IKeymanager
-	DisablePublicKeys [][]byte
-	EnablePublicKeys  [][]byte
-	DeletePublicKeys  [][]byte
+	Wallet           *wallet.Wallet
+	Keymanager       keymanager.IKeymanager
+	DeletePublicKeys [][]byte
 }
diff --git a/validator/accounts/accounts_backup.go b/validator/accounts/accounts_backup.go
@@ -56,7 +56,7 @@ func BackupAccountsCli(cliCtx *cli.Context) error {
 	if err != nil {
 		return errors.Wrap(err, ErrCouldNotInitializeKeymanager)
 	}
-	pubKeys, err := km.FetchAllValidatingPublicKeys(cliCtx.Context)
+	pubKeys, err := km.FetchValidatingPublicKeys(cliCtx.Context)
 	if err != nil {
 		return errors.Wrap(err, "could not fetch validating public keys")
 	}

diff --git a/validator/accounts/accounts_delete.go b/validator/accounts/accounts_delete.go
@@ -32,7 +32,7 @@ func DeleteAccountCli(cliCtx *cli.Context) error {
 	if err != nil {
 		return errors.Wrap(err, ErrCouldNotInitializeKeymanager)
 	}
-	validatingPublicKeys, err := kManager.FetchAllValidatingPublicKeys(cliCtx.Context)
+	validatingPublicKeys, err := kManager.FetchValidatingPublicKeys(cliCtx.Context)
 	if err != nil {
 		return err
 	}

diff --git a/validator/accounts/accounts_enable_disable.go b/validator/accounts/accounts_enable_disable.go
diff --git a/validator/accounts/accounts_enable_disable_test.go b/validator/accounts/accounts_enable_disable_test.go