From f8a855d1681a4cc9bb7e52ecab0debecb17fcbc8 Mon Sep 17 00:00:00 2001 From: Ivan Martinez Date: Sat, 21 Nov 2020 05:15:44 -0500 Subject: [PATCH] Remove outdated code in accounts (#7881) * Remove outdated test in accounts * gaz --- validator/accounts/cmd_accounts.go | 2 +- validator/accounts/cmd_wallet.go | 2 +- validator/accounts/wallet/BUILD.bazel | 4 -- validator/accounts/wallet/wallet_test.go | 76 ------------------------ 4 files changed, 2 insertions(+), 82 deletions(-) diff --git a/validator/accounts/cmd_accounts.go b/validator/accounts/cmd_accounts.go index 4f98398d6b..f6bd016ebd 100644 --- a/validator/accounts/cmd_accounts.go +++ b/validator/accounts/cmd_accounts.go @@ -14,7 +14,7 @@ import ( var AccountCommands = &cli.Command{ Name: "accounts", Category: "accounts", - Usage: "defines commands for interacting with eth2 validator accounts (work in progress)", + Usage: "defines commands for interacting with eth2 validator accounts", Subcommands: []*cli.Command{ { Name: "delete", diff --git a/validator/accounts/cmd_wallet.go b/validator/accounts/cmd_wallet.go index d412efd26c..5dcd6835e7 100644 --- a/validator/accounts/cmd_wallet.go +++ b/validator/accounts/cmd_wallet.go @@ -12,7 +12,7 @@ import ( var WalletCommands = &cli.Command{ Name: "wallet", Category: "wallet", - Usage: "defines commands for interacting with eth2 validator wallets (work in progress)", + Usage: "defines commands for interacting with eth2 validator wallets", Subcommands: []*cli.Command{ { Name: "create", diff --git a/validator/accounts/wallet/BUILD.bazel b/validator/accounts/wallet/BUILD.bazel index 0e6542187c..56759249b1 100644 --- a/validator/accounts/wallet/BUILD.bazel +++ b/validator/accounts/wallet/BUILD.bazel @@ -27,11 +27,7 @@ go_test( deps = [ ":go_default_library", "//shared/params:go_default_library", - "//shared/testutil/assert:go_default_library", "//shared/testutil/require:go_default_library", - "//validator/flags:go_default_library", - "//validator/keymanager:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", - "@com_github_urfave_cli_v2//:go_default_library", ], ) diff --git a/validator/accounts/wallet/wallet_test.go b/validator/accounts/wallet/wallet_test.go index b6fc3a66a4..465991e809 100644 --- a/validator/accounts/wallet/wallet_test.go +++ b/validator/accounts/wallet/wallet_test.go @@ -1,26 +1,15 @@ package wallet_test import ( - "flag" "io/ioutil" "os" "path/filepath" - "strconv" "testing" "github.com/prysmaticlabs/prysm/shared/params" - "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" "github.com/prysmaticlabs/prysm/validator/accounts/wallet" - "github.com/prysmaticlabs/prysm/validator/flags" - "github.com/prysmaticlabs/prysm/validator/keymanager" "github.com/sirupsen/logrus" - "github.com/urfave/cli/v2" -) - -const ( - passwordFileName = "password.txt" - password = "OhWOWthisisatest42!$" ) func init() { @@ -28,71 +17,6 @@ func init() { logrus.SetOutput(ioutil.Discard) } -type testWalletConfig struct { - walletDir string - passwordsDir string - backupDir string - keysDir string - deletePublicKeys string - voluntaryExitPublicKeys string - backupPublicKeys string - backupPasswordFile string - walletPasswordFile string - accountPasswordFile string - privateKeyFile string - skipDepositConfirm bool - numAccounts int64 - keymanagerKind keymanager.Kind -} - -func setupWalletCtx( - tb testing.TB, - cfg *testWalletConfig, -) *cli.Context { - app := cli.App{} - set := flag.NewFlagSet("test", 0) - set.String(flags.WalletDirFlag.Name, cfg.walletDir, "") - set.String(flags.KeysDirFlag.Name, cfg.keysDir, "") - set.String(flags.KeymanagerKindFlag.Name, cfg.keymanagerKind.String(), "") - set.String(flags.DeletePublicKeysFlag.Name, cfg.deletePublicKeys, "") - set.String(flags.VoluntaryExitPublicKeysFlag.Name, cfg.voluntaryExitPublicKeys, "") - set.String(flags.BackupDirFlag.Name, cfg.backupDir, "") - set.String(flags.BackupPasswordFile.Name, cfg.backupPasswordFile, "") - set.String(flags.BackupPublicKeysFlag.Name, cfg.backupPublicKeys, "") - set.String(flags.WalletPasswordFileFlag.Name, cfg.walletPasswordFile, "") - set.String(flags.AccountPasswordFileFlag.Name, cfg.accountPasswordFile, "") - set.Int64(flags.NumAccountsFlag.Name, cfg.numAccounts, "") - set.Bool(flags.SkipDepositConfirmationFlag.Name, cfg.skipDepositConfirm, "") - - if cfg.privateKeyFile != "" { - set.String(flags.ImportPrivateKeyFileFlag.Name, cfg.privateKeyFile, "") - assert.NoError(tb, set.Set(flags.ImportPrivateKeyFileFlag.Name, cfg.privateKeyFile)) - } - assert.NoError(tb, set.Set(flags.WalletDirFlag.Name, cfg.walletDir)) - assert.NoError(tb, set.Set(flags.KeysDirFlag.Name, cfg.keysDir)) - assert.NoError(tb, set.Set(flags.KeymanagerKindFlag.Name, cfg.keymanagerKind.String())) - assert.NoError(tb, set.Set(flags.DeletePublicKeysFlag.Name, cfg.deletePublicKeys)) - assert.NoError(tb, set.Set(flags.VoluntaryExitPublicKeysFlag.Name, cfg.voluntaryExitPublicKeys)) - assert.NoError(tb, set.Set(flags.BackupDirFlag.Name, cfg.backupDir)) - assert.NoError(tb, set.Set(flags.BackupPublicKeysFlag.Name, cfg.backupPublicKeys)) - assert.NoError(tb, set.Set(flags.BackupPasswordFile.Name, cfg.backupPasswordFile)) - assert.NoError(tb, set.Set(flags.WalletPasswordFileFlag.Name, cfg.walletPasswordFile)) - assert.NoError(tb, set.Set(flags.AccountPasswordFileFlag.Name, cfg.accountPasswordFile)) - assert.NoError(tb, set.Set(flags.NumAccountsFlag.Name, strconv.Itoa(int(cfg.numAccounts)))) - assert.NoError(tb, set.Set(flags.SkipDepositConfirmationFlag.Name, strconv.FormatBool(cfg.skipDepositConfirm))) - return cli.NewContext(&app, set, nil) -} - -func setupWalletAndPasswordsDir(t testing.TB) (string, string, string) { - walletDir := filepath.Join(t.TempDir(), "wallet") - passwordsDir := filepath.Join(t.TempDir(), "passwords") - passwordFileDir := filepath.Join(t.TempDir(), "passwordFile") - require.NoError(t, os.MkdirAll(passwordFileDir, os.ModePerm)) - passwordFilePath := filepath.Join(passwordFileDir, passwordFileName) - require.NoError(t, ioutil.WriteFile(passwordFilePath, []byte(password), os.ModePerm)) - return walletDir, passwordsDir, passwordFilePath -} - func Test_Exists_RandomFiles(t *testing.T) { path := filepath.Join(t.TempDir(), "wallet")