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

Add All Other Prysm CLI Entrypoints to "cmd" Folder (#8545)

Browse Source 
* other cmd

* comments

* gaz

* gaz ignored file

* build

Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com>
This commit is contained in:
Raul Jordan
2021-03-03 11:05:37 -06:00
committed by GitHub
parent c9858b5e6b
commit ff329df808
23 changed files with 154 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
beacon-chain/db/BUILD.bazel
View File

@@ -11,7 +11,6 @@ go_library(
name = "go_default_library",
srcs = [
"alias.go",
"cmd.go",
"log.go",
"restore.go",
] + select({

3
beacon-chain/db/restore.go
View File

@@ -16,7 +16,8 @@ import (
const dbExistsYesNoPrompt = "A database file already exists in the target directory. " +
"Are you sure that you want to overwrite it? [y/n]"
func restore(cliCtx *cli.Context) error {
// Restore a beacon chain database.
func Restore(cliCtx *cli.Context) error {
sourceFile := cliCtx.String(cmd.RestoreSourceFileFlag.Name)
targetDir := cliCtx.String(cmd.RestoreTargetDirFlag.Name)

2
cmd/beacon-chain/BUILD.bazel
View File

@@ -15,8 +15,8 @@ go_library(
importpath = "github.com/prysmaticlabs/prysm/cmd/beacon-chain",
visibility = ["//beacon-chain:__subpackages__"],
deps = [
"//beacon-chain/db:go_default_library",
"//beacon-chain/node:go_default_library",
"//cmd/beacon-chain/db:go_default_library",
"//cmd/beacon-chain/flags:go_default_library",
"//shared/cmd:go_default_library",
"//shared/debug:go_default_library",

15
cmd/beacon-chain/db/BUILD.bazel Normal file
View File

@@ -0,0 +1,15 @@
load("@prysm//tools/go:def.bzl", "go_library")
go_library(
name = "go_default_library",
srcs = ["db.go"],
importpath = "github.com/prysmaticlabs/prysm/cmd/beacon-chain/db",
visibility = ["//visibility:public"],
deps = [
"//beacon-chain/db:go_default_library",
"//shared/cmd:go_default_library",
"//shared/tos:go_default_library",
"@com_github_sirupsen_logrus//:go_default_library",
"@com_github_urfave_cli_v2//:go_default_library",
],
)

10
beacon-chain/db/cmd.go → cmd/beacon-chain/db/db.go
View File

@@ -1,13 +1,17 @@
package db
import (
beacondb "github.com/prysmaticlabs/prysm/beacon-chain/db"
"github.com/prysmaticlabs/prysm/shared/cmd"
"github.com/prysmaticlabs/prysm/shared/tos"
"github.com/sirupsen/logrus"
"github.com/urfave/cli/v2"
)
// DatabaseCommands for Prysm beacon node.
var DatabaseCommands = &cli.Command{
var log = logrus.WithField("prefix", "db")
// Commands for interacting with a beacon chain database.
var Commands = &cli.Command{
Name: "db",
Category: "db",
Usage: "defines commands for interacting with eth2 beacon node database",
@@ -21,7 +25,7 @@ var DatabaseCommands = &cli.Command{
}),
Before: tos.VerifyTosAcceptedOrPrompt,
Action: func(cliCtx *cli.Context) error {
if err := restore(cliCtx); err != nil {
if err := beacondb.Restore(cliCtx); err != nil {
log.Fatalf("Could not restore database: %v", err)
}
return nil

4
cmd/beacon-chain/main.go
View File

@@ -11,8 +11,8 @@ import (
gethlog "github.com/ethereum/go-ethereum/log"
golog "github.com/ipfs/go-log/v2"
joonix "github.com/joonix/log"
"github.com/prysmaticlabs/prysm/beacon-chain/db"
"github.com/prysmaticlabs/prysm/beacon-chain/node"
dbcommands "github.com/prysmaticlabs/prysm/cmd/beacon-chain/db"
"github.com/prysmaticlabs/prysm/cmd/beacon-chain/flags"
"github.com/prysmaticlabs/prysm/shared/cmd"
"github.com/prysmaticlabs/prysm/shared/debug"
@@ -122,7 +122,7 @@ func main() {
app.Action = startNode
app.Version = version.Version()
app.Commands = []*cli.Command{
db.DatabaseCommands,
dbcommands.Commands,
}
app.Flags = appFlags

7
cmd/validator/BUILD.bazel
View File

@@ -15,7 +15,11 @@ go_library(
importpath = "github.com/prysmaticlabs/prysm/cmd/validator",
visibility = ["//validator:__subpackages__"],
deps = [
"//cmd/validator/accounts:go_default_library",
"//cmd/validator/db:go_default_library",
"//cmd/validator/flags:go_default_library",
"//cmd/validator/slashing-protection:go_default_library",
"//cmd/validator/wallet:go_default_library",
"//shared/cmd:go_default_library",
"//shared/debug:go_default_library",
"//shared/featureconfig:go_default_library",
@@ -25,10 +29,7 @@ go_library(
"//shared/maxprocs:go_default_library",
"//shared/tos:go_default_library",
"//shared/version:go_default_library",
"//validator/accounts:go_default_library",
"//validator/db:go_default_library",
"//validator/node:go_default_library",
"//validator/slashing-protection:go_default_library",
"@com_github_joonix_log//:go_default_library",
"@com_github_sirupsen_logrus//:go_default_library",
"@com_github_urfave_cli_v2//:go_default_library",

17
cmd/validator/accounts/BUILD.bazel Normal file
View File

@@ -0,0 +1,17 @@
load("@prysm//tools/go:def.bzl", "go_library")
go_library(
name = "go_default_library",
srcs = ["accounts.go"],
importpath = "github.com/prysmaticlabs/prysm/cmd/validator/accounts",
visibility = ["//visibility:public"],
deps = [
"//cmd/validator/flags:go_default_library",
"//shared/cmd:go_default_library",
"//shared/featureconfig:go_default_library",
"//shared/tos:go_default_library",
"//validator/accounts:go_default_library",
"@com_github_sirupsen_logrus//:go_default_library",
"@com_github_urfave_cli_v2//:go_default_library",
],
)

18
validator/accounts/cmd_accounts.go → cmd/validator/accounts/accounts.go
View File

@@ -7,11 +7,15 @@ import (
"github.com/prysmaticlabs/prysm/shared/cmd"
"github.com/prysmaticlabs/prysm/shared/featureconfig"
"github.com/prysmaticlabs/prysm/shared/tos"
"github.com/prysmaticlabs/prysm/validator/accounts"
"github.com/sirupsen/logrus"
"github.com/urfave/cli/v2"
)
// AccountCommands for Prysm validators.
var AccountCommands = &cli.Command{
var log = logrus.WithField("prefix", "accounts")
// Commands for managing Prysm validator accounts.
var Commands = &cli.Command{
Name: "accounts",
Category: "accounts",
Usage: "defines commands for interacting with eth2 validator accounts",
@@ -36,7 +40,7 @@ var AccountCommands = &cli.Command{
},
Action: func(cliCtx *cli.Context) error {
featureconfig.ConfigureValidator(cliCtx)
if err := DeleteAccountCli(cliCtx); err != nil {
if err := accounts.DeleteAccountCli(cliCtx); err != nil {
log.Fatalf("Could not delete account: %v", err)
}
return nil
@@ -70,7 +74,7 @@ var AccountCommands = &cli.Command{
},
Action: func(cliCtx *cli.Context) error {
featureconfig.ConfigureValidator(cliCtx)
if err := ListAccountsCli(cliCtx); err != nil {
if err := accounts.ListAccountsCli(cliCtx); err != nil {
log.Fatalf("Could not list accounts: %v", err)
}
return nil
@@ -101,7 +105,7 @@ var AccountCommands = &cli.Command{
},
Action: func(cliCtx *cli.Context) error {
featureconfig.ConfigureValidator(cliCtx)
if err := BackupAccountsCli(cliCtx); err != nil {
if err := accounts.BackupAccountsCli(cliCtx); err != nil {
log.Fatalf("Could not backup accounts: %v", err)
}
return nil
@@ -129,7 +133,7 @@ var AccountCommands = &cli.Command{
},
Action: func(cliCtx *cli.Context) error {
featureconfig.ConfigureValidator(cliCtx)
if err := ImportAccountsCli(cliCtx); err != nil {
if err := accounts.ImportAccountsCli(cliCtx); err != nil {
log.Fatalf("Could not import accounts: %v", err)
}
return nil
@@ -163,7 +167,7 @@ var AccountCommands = &cli.Command{
},
Action: func(cliCtx *cli.Context) error {
featureconfig.ConfigureValidator(cliCtx)
if err := ExitAccountsCli(cliCtx, os.Stdin); err != nil {
if err := accounts.ExitAccountsCli(cliCtx, os.Stdin); err != nil {
log.Fatalf("Could not perform voluntary exit: %v", err)
}
return nil

15
cmd/validator/db/BUILD.bazel Normal file
View File

@@ -0,0 +1,15 @@
load("@prysm//tools/go:def.bzl", "go_library")
go_library(
name = "go_default_library",
srcs = ["db.go"],
importpath = "github.com/prysmaticlabs/prysm/cmd/validator/db",
visibility = ["//visibility:public"],
deps = [
"//shared/cmd:go_default_library",
"//shared/tos:go_default_library",
"//validator/db:go_default_library",
"@com_github_sirupsen_logrus//:go_default_library",
"@com_github_urfave_cli_v2//:go_default_library",
],
)

16
validator/db/cmd.go → cmd/validator/db/db.go
View File

@@ -3,14 +3,18 @@ package db
import (
"github.com/prysmaticlabs/prysm/shared/cmd"
"github.com/prysmaticlabs/prysm/shared/tos"
validatordb "github.com/prysmaticlabs/prysm/validator/db"
"github.com/sirupsen/logrus"
"github.com/urfave/cli/v2"
)
// DatabaseCommands for Prysm validator.
var DatabaseCommands = &cli.Command{
var log = logrus.WithField("prefix", "db")
// Commands for interacting with the Prysm validator database.
var Commands = &cli.Command{
Name: "db",
Category: "db",
Usage: "defines commands for interacting with eth2 validator database",
Usage: "defines commands for interacting with the Prysm validator database",
Subcommands: []*cli.Command{
{
Name: "restore",
@@ -21,7 +25,7 @@ var DatabaseCommands = &cli.Command{
}),
Before: tos.VerifyTosAcceptedOrPrompt,
Action: func(cliCtx *cli.Context) error {
if err := restore(cliCtx); err != nil {
if err := validatordb.Restore(cliCtx); err != nil {
log.Fatalf("Could not restore database: %v", err)
}
return nil
@@ -40,7 +44,7 @@ var DatabaseCommands = &cli.Command{
}),
Before: tos.VerifyTosAcceptedOrPrompt,
Action: func(cliCtx *cli.Context) error {
if err := migrateUp(cliCtx); err != nil {
if err := validatordb.MigrateUp(cliCtx); err != nil {
log.Fatalf("Could not run database migrations: %v", err)
}
return nil
@@ -54,7 +58,7 @@ var DatabaseCommands = &cli.Command{
}),
Before: tos.VerifyTosAcceptedOrPrompt,
Action: func(cliCtx *cli.Context) error {
if err := migrateDown(cliCtx); err != nil {
if err := validatordb.MigrateDown(cliCtx); err != nil {
log.Fatalf("Could not run database migrations: %v", err)
}
return nil

15
cmd/validator/main.go
View File

@@ -11,7 +11,11 @@ import (
runtimeDebug "runtime/debug"
joonix "github.com/joonix/log"
accountcommands "github.com/prysmaticlabs/prysm/cmd/validator/accounts"
dbcommands "github.com/prysmaticlabs/prysm/cmd/validator/db"
"github.com/prysmaticlabs/prysm/cmd/validator/flags"
slashingprotectioncommands "github.com/prysmaticlabs/prysm/cmd/validator/slashing-protection"
walletcommands "github.com/prysmaticlabs/prysm/cmd/validator/wallet"
"github.com/prysmaticlabs/prysm/shared/cmd"
"github.com/prysmaticlabs/prysm/shared/debug"
"github.com/prysmaticlabs/prysm/shared/featureconfig"
@@ -21,10 +25,7 @@ import (
_ "github.com/prysmaticlabs/prysm/shared/maxprocs"
"github.com/prysmaticlabs/prysm/shared/tos"
"github.com/prysmaticlabs/prysm/shared/version"
"github.com/prysmaticlabs/prysm/validator/accounts"
"github.com/prysmaticlabs/prysm/validator/db"
"github.com/prysmaticlabs/prysm/validator/node"
slashingprotection "github.com/prysmaticlabs/prysm/validator/slashing-protection"
"github.com/sirupsen/logrus"
"github.com/urfave/cli/v2"
prefixed "github.com/x-cray/logrus-prefixed-formatter"
@@ -112,10 +113,10 @@ func main() {
app.Version = version.Version()
app.Action = startNode
app.Commands = []*cli.Command{
accounts.WalletCommands,
accounts.AccountCommands,
slashingprotection.Commands,
db.DatabaseCommands,
walletcommands.Commands,
accountcommands.Commands,
slashingprotectioncommands.Commands,
dbcommands.Commands,
}
app.Flags = appFlags

16
cmd/validator/slashing-protection/BUILD.bazel Normal file
View File

@@ -0,0 +1,16 @@
load("@prysm//tools/go:def.bzl", "go_library")
go_library(
name = "go_default_library",
srcs = ["slashing-protection.go"],
importpath = "github.com/prysmaticlabs/prysm/cmd/validator/slashing-protection",
visibility = ["//visibility:public"],
deps = [
"//cmd/validator/flags:go_default_library",
"//shared/cmd:go_default_library",
"//shared/featureconfig:go_default_library",
"//shared/tos:go_default_library",
"//validator/slashing-protection:go_default_library",
"@com_github_urfave_cli_v2//:go_default_library",
],
)

7
validator/slashing-protection/cmd.go → cmd/validator/slashing-protection/slashing-protection.go
View File

@@ -1,10 +1,11 @@
package slashingprotection
package slashing_protection
import (
"github.com/prysmaticlabs/prysm/cmd/validator/flags"
"github.com/prysmaticlabs/prysm/shared/cmd"
"github.com/prysmaticlabs/prysm/shared/featureconfig"
"github.com/prysmaticlabs/prysm/shared/tos"
"github.com/prysmaticlabs/prysm/validator/slashing-protection"
"github.com/urfave/cli/v2"
)
@@ -29,7 +30,7 @@ var Commands = &cli.Command{
},
Action: func(cliCtx *cli.Context) error {
featureconfig.ConfigureValidator(cliCtx)
return ExportSlashingProtectionJSONCli(cliCtx)
return slashingprotection.ExportSlashingProtectionJSONCli(cliCtx)
},
},
{
@@ -51,7 +52,7 @@ var Commands = &cli.Command{
},
Action: func(cliCtx *cli.Context) error {
featureconfig.ConfigureValidator(cliCtx)
return ImportSlashingProtectionCLI(cliCtx)
return slashingprotection.ImportSlashingProtectionCLI(cliCtx)
},
},
},

17
cmd/validator/wallet/BUILD.bazel Normal file
View File

@@ -0,0 +1,17 @@
load("@prysm//tools/go:def.bzl", "go_library")
go_library(
name = "go_default_library",
srcs = ["wallet.go"],
importpath = "github.com/prysmaticlabs/prysm/cmd/validator/wallet",
visibility = ["//visibility:public"],
deps = [
"//cmd/validator/flags:go_default_library",
"//shared/cmd:go_default_library",
"//shared/featureconfig:go_default_library",
"//shared/tos:go_default_library",
"//validator/accounts:go_default_library",
"@com_github_sirupsen_logrus//:go_default_library",
"@com_github_urfave_cli_v2//:go_default_library",
],
)

16
validator/accounts/cmd_wallet.go → cmd/validator/wallet/wallet.go
View File

@@ -1,15 +1,19 @@
package accounts
package wallet
import (
"github.com/prysmaticlabs/prysm/cmd/validator/flags"
"github.com/prysmaticlabs/prysm/shared/cmd"
"github.com/prysmaticlabs/prysm/shared/featureconfig"
"github.com/prysmaticlabs/prysm/shared/tos"
"github.com/prysmaticlabs/prysm/validator/accounts"
"github.com/sirupsen/logrus"
"github.com/urfave/cli/v2"
)
// WalletCommands for accounts for Prysm validators.
var WalletCommands = &cli.Command{
var log = logrus.WithField("prefix", "wallet")
// Commands for wallets for Prysm validators.
var Commands = &cli.Command{
Name: "wallet",
Category: "wallet",
Usage: "defines commands for interacting with eth2 validator wallets",
@@ -42,7 +46,7 @@ var WalletCommands = &cli.Command{
},
Action: func(cliCtx *cli.Context) error {
featureconfig.ConfigureValidator(cliCtx)
if _, err := CreateAndSaveWalletCli(cliCtx); err != nil {
if _, err := accounts.CreateAndSaveWalletCli(cliCtx); err != nil {
log.Fatalf("Could not create a wallet: %v", err)
}
return nil
@@ -72,7 +76,7 @@ var WalletCommands = &cli.Command{
},
Action: func(cliCtx *cli.Context) error {
featureconfig.ConfigureValidator(cliCtx)
if err := EditWalletConfigurationCli(cliCtx); err != nil {
if err := accounts.EditWalletConfigurationCli(cliCtx); err != nil {
log.Fatalf("Could not edit wallet configuration: %v", err)
}
return nil
@@ -101,7 +105,7 @@ var WalletCommands = &cli.Command{
},
Action: func(cliCtx *cli.Context) error {
featureconfig.ConfigureValidator(cliCtx)
if err := RecoverWalletCli(cliCtx); err != nil {
if err := accounts.RecoverWalletCli(cliCtx); err != nil {
log.Fatalf("Could not recover wallet: %v", err)
}
return nil

4
validator/accounts/BUILD.bazel
View File

@@ -12,8 +12,6 @@ go_library(
"accounts_helper.go",
"accounts_import.go",
"accounts_list.go",
"cmd_accounts.go",
"cmd_wallet.go",
"doc.go",
"log.go",
"wallet_create.go",
@@ -32,13 +30,11 @@ go_library(
"//shared/bls:go_default_library",
"//shared/bytesutil:go_default_library",
"//shared/cmd:go_default_library",
"//shared/featureconfig:go_default_library",
"//shared/fileutil:go_default_library",
"//shared/grpcutils:go_default_library",
"//shared/params:go_default_library",
"//shared/petnames:go_default_library",
"//shared/promptutil:go_default_library",
"//shared/tos:go_default_library",
"//validator/accounts/iface:go_default_library",
"//validator/accounts/prompt:go_default_library",
"//validator/accounts/wallet:go_default_library",

2
validator/db/BUILD.bazel
View File

@@ -5,7 +5,6 @@ go_library(
name = "go_default_library",
srcs = [
"alias.go",
"cmd.go",
"log.go",
"migrate.go",
"restore.go",
@@ -19,7 +18,6 @@ go_library(
"//shared/cmd:go_default_library",
"//shared/fileutil:go_default_library",
"//shared/promptutil:go_default_library",
"//shared/tos:go_default_library",
"//validator/db/iface:go_default_library",
"//validator/db/kv:go_default_library",
"@com_github_pkg_errors//:go_default_library",

6
validator/db/migrate.go
View File

@@ -11,7 +11,8 @@ import (
"github.com/urfave/cli/v2"
)
func migrateUp(cliCtx *cli.Context) error {
// MigrateUp for a validator database.
func MigrateUp(cliCtx *cli.Context) error {
dataDir := cliCtx.String(cmd.DataDirFlag.Name)
if !fileutil.FileExists(path.Join(dataDir, kv.ProtectionDbFileName)) {
@@ -28,7 +29,8 @@ func migrateUp(cliCtx *cli.Context) error {
return validatorDB.RunUpMigrations(ctx)
}
func migrateDown(cliCtx *cli.Context) error {
// MigrateDown for a validator database.
func MigrateDown(cliCtx *cli.Context) error {
dataDir := cliCtx.String(cmd.DataDirFlag.Name)
if !fileutil.FileExists(path.Join(dataDir, kv.ProtectionDbFileName)) {

16
validator/db/migrate_test.go
View File

@@ -11,17 +11,17 @@ import (
"github.com/urfave/cli/v2"
)
func Test_migrateUp_NoDBFound(t *testing.T) {
func TestMigrateUp_NoDBFound(t *testing.T) {
app := cli.App{}
set := flag.NewFlagSet("test", 0)
set.String(cmd.DataDirFlag.Name, "", "")
require.NoError(t, set.Set(cmd.DataDirFlag.Name, ""))
cliCtx := cli.NewContext(&app, set, nil)
err := migrateUp(cliCtx)
err := MigrateUp(cliCtx)
assert.ErrorContains(t, "No validator db found at path", err)
}
func Test_migrateUp_OK(t *testing.T) {
func TestMigrateUp_OK(t *testing.T) {
validatorDB := dbtest.SetupDB(t, nil)
dbPath := validatorDB.DatabasePath()
require.NoError(t, validatorDB.Close())
@@ -30,20 +30,20 @@ func Test_migrateUp_OK(t *testing.T) {
set.String(cmd.DataDirFlag.Name, dbPath, "")
require.NoError(t, set.Set(cmd.DataDirFlag.Name, dbPath))
cliCtx := cli.NewContext(&app, set, nil)
assert.NoError(t, migrateUp(cliCtx))
assert.NoError(t, MigrateUp(cliCtx))
}
func Test_migrateDown_NoDBFound(t *testing.T) {
func TestMigrateDown_NoDBFound(t *testing.T) {
app := cli.App{}
set := flag.NewFlagSet("test", 0)
set.String(cmd.DataDirFlag.Name, "", "")
require.NoError(t, set.Set(cmd.DataDirFlag.Name, ""))
cliCtx := cli.NewContext(&app, set, nil)
err := migrateDown(cliCtx)
err := MigrateDown(cliCtx)
assert.ErrorContains(t, "No validator db found at path", err)
}
func Test_migrateDown_OK(t *testing.T) {
func TestMigrateDown_OK(t *testing.T) {
validatorDB := dbtest.SetupDB(t, nil)
dbPath := validatorDB.DatabasePath()
require.NoError(t, validatorDB.Close())
@@ -52,5 +52,5 @@ func Test_migrateDown_OK(t *testing.T) {
set.String(cmd.DataDirFlag.Name, dbPath, "")
require.NoError(t, set.Set(cmd.DataDirFlag.Name, dbPath))
cliCtx := cli.NewContext(&app, set, nil)
assert.NoError(t, migrateDown(cliCtx))
assert.NoError(t, MigrateDown(cliCtx))
}

3
validator/db/restore.go
View File

@@ -16,7 +16,8 @@ import (
const dbExistsYesNoPrompt = "A database file already exists in the target directory. " +
"Are you sure that you want to overwrite it? [y/n]"
func restore(cliCtx *cli.Context) error {
// Restore a Prysm validator database.
func Restore(cliCtx *cli.Context) error {
sourceFile := cliCtx.String(cmd.RestoreSourceFileFlag.Name)
targetDir := cliCtx.String(cmd.RestoreTargetDirFlag.Name)

2
validator/db/restore_test.go
View File

@@ -45,7 +45,7 @@ func TestRestore(t *testing.T) {
require.NoError(t, set.Set(cmd.RestoreTargetDirFlag.Name, restoreDir))
cliCtx := cli.NewContext(&app, set, nil)
assert.NoError(t, restore(cliCtx))
assert.NoError(t, Restore(cliCtx))
files, err := ioutil.ReadDir(restoreDir)
require.NoError(t, err)

3
validator/slashing-protection/BUILD.bazel
View File

@@ -6,7 +6,6 @@ go_library(
srcs = [
"cli_export.go",
"cli_import.go",
"cmd.go",
"external.go",
"log.go",
"slasher_client.go",
@@ -20,10 +19,8 @@ go_library(
"//cmd/validator/flags:go_default_library",
"//proto/slashing:go_default_library",
"//shared/cmd:go_default_library",
"//shared/featureconfig:go_default_library",
"//shared/fileutil:go_default_library",
"//shared/grpcutils:go_default_library",
"//shared/tos:go_default_library",
"//validator/accounts/prompt:go_default_library",
"//validator/db/kv:go_default_library",
"//validator/slashing-protection/local/standard-protection-format:go_default_library",