From f02480d8bbf9ff6fb5057d361763f327279a0a09 Mon Sep 17 00:00:00 2001 From: Kiel barry Date: Tue, 29 May 2018 16:51:07 -0700 Subject: [PATCH] cmd: fix and gofmt --- cmd/clef/main.go | 4 ++-- cmd/evm/json_logger.go | 1 + cmd/geth/main.go | 2 +- cmd/geth/usage.go | 2 +- cmd/swarm/config.go | 8 ++++---- cmd/swarm/config_test.go | 16 ++++++++-------- cmd/swarm/list.go | 2 +- cmd/swarm/main.go | 10 +++++----- cmd/swarm/manifest.go | 6 +++--- cmd/swarm/upload.go | 2 +- cmd/utils/cmd.go | 2 +- cmd/utils/customflags.go | 4 ++-- 12 files changed, 30 insertions(+), 29 deletions(-) diff --git a/cmd/clef/main.go b/cmd/clef/main.go index 348bcb22f6..0c2644c269 100644 --- a/cmd/clef/main.go +++ b/cmd/clef/main.go @@ -175,7 +175,7 @@ func init() { logLevelFlag, keystoreFlag, configdirFlag, - utils.NetworkIdFlag, + utils.NetworkIDFlag, utils.LightKDFFlag, utils.NoUSBFlag, utils.RPCListenAddrFlag, @@ -380,7 +380,7 @@ func signer(c *cli.Context) error { } apiImpl := core.NewSignerAPI( - c.Int64(utils.NetworkIdFlag.Name), + c.Int64(utils.NetworkIDFlag.Name), c.String(keystoreFlag.Name), c.Bool(utils.NoUSBFlag.Name), ui, db, diff --git a/cmd/evm/json_logger.go b/cmd/evm/json_logger.go index f16424fbe6..a1e5d2f25c 100644 --- a/cmd/evm/json_logger.go +++ b/cmd/evm/json_logger.go @@ -27,6 +27,7 @@ import ( "github.com/ethereum/go-ethereum/core/vm" ) +// JSONLogger stores the EVM tracer. type JSONLogger struct { encoder *json.Encoder cfg *vm.LogConfig diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 09d9c493d1..c2cc92471b 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -108,7 +108,7 @@ var ( utils.TestnetFlag, utils.RinkebyFlag, utils.VMEnableDebugFlag, - utils.NetworkIdFlag, + utils.NetworkIDFlag, utils.RPCCORSDomainFlag, utils.RPCVirtualHostsFlag, utils.EthStatsURLFlag, diff --git a/cmd/geth/usage.go b/cmd/geth/usage.go index d934c6b021..d845ff04e4 100644 --- a/cmd/geth/usage.go +++ b/cmd/geth/usage.go @@ -71,7 +71,7 @@ var AppHelpFlagGroups = []flagGroup{ utils.DataDirFlag, utils.KeyStoreDirFlag, utils.NoUSBFlag, - utils.NetworkIdFlag, + utils.NetworkIDFlag, utils.TestnetFlag, utils.RinkebyFlag, utils.SyncModeFlag, diff --git a/cmd/swarm/config.go b/cmd/swarm/config.go index adac772bab..79918e4fc2 100644 --- a/cmd/swarm/config.go +++ b/cmd/swarm/config.go @@ -38,7 +38,7 @@ import ( ) var ( - //flag definition for the dumpconfig command + //DumpConfigCommand is the definition for the dumpconfig command DumpConfigCommand = cli.Command{ Action: utils.MigrateFlags(dumpConfig), Name: "dumpconfig", @@ -49,7 +49,7 @@ var ( Description: `The dumpconfig command shows configuration values.`, } - //flag definition for the config file command + //SwarmTomlConfigPathFlag is the definition for the config file command SwarmTomlConfigPathFlag = cli.StringFlag{ Name: "config", Usage: "TOML configuration file", @@ -166,7 +166,7 @@ func cmdLineOverride(currentConfig *bzzapi.Config, ctx *cli.Context) *bzzapi.Con currentConfig.Contract = common.HexToAddress(chbookaddr) } - if networkid := ctx.GlobalString(SwarmNetworkIdFlag.Name); networkid != "" { + if networkid := ctx.GlobalString(SwarmNetworkIDFlag.Name); networkid != "" { if id, _ := strconv.Atoi(networkid); id != 0 { currentConfig.NetworkId = uint64(id) } @@ -357,7 +357,7 @@ func validateEnsAPIs(s string) (err error) { return nil } -//print a Config as string +//printConfig prints a Config as string. func printConfig(config *bzzapi.Config) string { out, err := tomlSettings.Marshal(&config) if err != nil { diff --git a/cmd/swarm/config_test.go b/cmd/swarm/config_test.go index 9bf584f50c..140e3220d5 100644 --- a/cmd/swarm/config_test.go +++ b/cmd/swarm/config_test.go @@ -45,7 +45,7 @@ func TestDumpConfig(t *testing.T) { func TestFailsSwapEnabledNoSwapApi(t *testing.T) { flags := []string{ - fmt.Sprintf("--%s", SwarmNetworkIdFlag.Name), "42", + fmt.Sprintf("--%s", SwarmNetworkIDFlag.Name), "42", fmt.Sprintf("--%s", SwarmPortFlag.Name), "54545", fmt.Sprintf("--%s", SwarmSwapEnabledFlag.Name), } @@ -57,7 +57,7 @@ func TestFailsSwapEnabledNoSwapApi(t *testing.T) { func TestFailsNoBzzAccount(t *testing.T) { flags := []string{ - fmt.Sprintf("--%s", SwarmNetworkIdFlag.Name), "42", + fmt.Sprintf("--%s", SwarmNetworkIDFlag.Name), "42", fmt.Sprintf("--%s", SwarmPortFlag.Name), "54545", } @@ -83,7 +83,7 @@ func TestCmdLineOverrides(t *testing.T) { } flags := []string{ - fmt.Sprintf("--%s", SwarmNetworkIdFlag.Name), "42", + fmt.Sprintf("--%s", SwarmNetworkIDFlag.Name), "42", fmt.Sprintf("--%s", SwarmPortFlag.Name), httpPort, fmt.Sprintf("--%s", SwarmSyncEnabledFlag.Name), fmt.Sprintf("--%s", CorsStringFlag.Name), "*", @@ -255,7 +255,7 @@ func TestEnvVars(t *testing.T) { envVars := os.Environ() envVars = append(envVars, fmt.Sprintf("%s=%s", SwarmPortFlag.EnvVar, httpPort)) - envVars = append(envVars, fmt.Sprintf("%s=%s", SwarmNetworkIdFlag.EnvVar, "999")) + envVars = append(envVars, fmt.Sprintf("%s=%s", SwarmNetworkIDFlag.EnvVar, "999")) envVars = append(envVars, fmt.Sprintf("%s=%s", CorsStringFlag.EnvVar, "*")) envVars = append(envVars, fmt.Sprintf("%s=%s", SwarmSyncEnabledFlag.EnvVar, "true")) @@ -387,10 +387,10 @@ func TestCmdLineOverridesFile(t *testing.T) { conf, account := getTestAccount(t, dir) node := &testNode{Dir: dir} - expectNetworkId := uint64(77) + expectNetworkID := uint64(77) flags := []string{ - fmt.Sprintf("--%s", SwarmNetworkIdFlag.Name), "77", + fmt.Sprintf("--%s", SwarmNetworkIDFlag.Name), "77", fmt.Sprintf("--%s", SwarmPortFlag.Name), httpPort, fmt.Sprintf("--%s", SwarmSyncEnabledFlag.Name), fmt.Sprintf("--%s", SwarmTomlConfigPathFlag.Name), f.Name(), @@ -427,8 +427,8 @@ func TestCmdLineOverridesFile(t *testing.T) { t.Fatalf("Expected port to be %s, got %s", httpPort, info.Port) } - if info.NetworkId != expectNetworkId { - t.Fatalf("Expected network ID to be %d, got %d", expectNetworkId, info.NetworkId) + if info.NetworkId != expectNetworkID { + t.Fatalf("Expected network ID to be %d, got %d", expectNetworkID, info.NetworkId) } if !info.SyncEnabled { diff --git a/cmd/swarm/list.go b/cmd/swarm/list.go index 57b5517c6e..e792734442 100644 --- a/cmd/swarm/list.go +++ b/cmd/swarm/list.go @@ -42,7 +42,7 @@ func list(ctx *cli.Context) { prefix = args[1] } - bzzapi := strings.TrimRight(ctx.GlobalString(SwarmApiFlag.Name), "/") + bzzapi := strings.TrimRight(ctx.GlobalString(SwarmAPIFlag.Name), "/") client := swarm.NewClient(bzzapi) list, err := client.List(manifest, prefix) if err != nil { diff --git a/cmd/swarm/main.go b/cmd/swarm/main.go index 360020b77b..d8a7fd5550 100644 --- a/cmd/swarm/main.go +++ b/cmd/swarm/main.go @@ -82,7 +82,7 @@ var ( Usage: "Swarm local http api port", EnvVar: SWARM_ENV_PORT, } - SwarmNetworkIdFlag = cli.IntFlag{ + SwarmNetworkIDFlag = cli.IntFlag{ Name: "bzznetworkid", Usage: "Network identifier (integer, default 3=swarm testnet)", EnvVar: SWARM_ENV_NETWORK_ID, @@ -111,7 +111,7 @@ var ( Usage: "ENS API endpoint for a TLD and with contract address, can be repeated, format [tld:][contract-addr@]url", EnvVar: SWARM_ENV_ENS_API, } - SwarmApiFlag = cli.StringFlag{ + SwarmAPIFlag = cli.StringFlag{ Name: "bzzapi", Usage: "Swarm HTTP endpoint", Value: "http://127.0.0.1:8500", @@ -346,10 +346,10 @@ DEPRECATED: use 'swarm db clean'. SwarmListenAddrFlag, SwarmPortFlag, SwarmAccountFlag, - SwarmNetworkIdFlag, + SwarmNetworkIDFlag, ChequebookAddrFlag, // upload flags - SwarmApiFlag, + SwarmAPIFlag, SwarmRecursiveUploadFlag, SwarmWantManifestFlag, SwarmUploadDefaultPath, @@ -388,7 +388,7 @@ func version(ctx *cli.Context) error { if gitCommit != "" { fmt.Println("Git Commit:", gitCommit) } - fmt.Println("Network Id:", ctx.GlobalInt(utils.NetworkIdFlag.Name)) + fmt.Println("Network Id:", ctx.GlobalInt(utils.NetworkIDFlag.Name)) fmt.Println("Go Version:", runtime.Version()) fmt.Println("OS:", runtime.GOOS) fmt.Printf("GOPATH=%s\n", os.Getenv("GOPATH")) diff --git a/cmd/swarm/manifest.go b/cmd/swarm/manifest.go index 41a69a5d05..c7eaba6128 100644 --- a/cmd/swarm/manifest.go +++ b/cmd/swarm/manifest.go @@ -126,7 +126,7 @@ func remove(ctx *cli.Context) { func addEntryToManifest(ctx *cli.Context, mhash, path, hash, ctype string) string { var ( - bzzapi = strings.TrimRight(ctx.GlobalString(SwarmApiFlag.Name), "/") + bzzapi = strings.TrimRight(ctx.GlobalString(SwarmAPIFlag.Name), "/") client = swarm.NewClient(bzzapi) longestPathEntry = api.ManifestEntry{} ) @@ -191,7 +191,7 @@ func addEntryToManifest(ctx *cli.Context, mhash, path, hash, ctype string) strin func updateEntryInManifest(ctx *cli.Context, mhash, path, hash, ctype string) string { var ( - bzzapi = strings.TrimRight(ctx.GlobalString(SwarmApiFlag.Name), "/") + bzzapi = strings.TrimRight(ctx.GlobalString(SwarmAPIFlag.Name), "/") client = swarm.NewClient(bzzapi) newEntry = api.ManifestEntry{} longestPathEntry = api.ManifestEntry{} @@ -267,7 +267,7 @@ func updateEntryInManifest(ctx *cli.Context, mhash, path, hash, ctype string) st func removeEntryFromManifest(ctx *cli.Context, mhash, path string) string { var ( - bzzapi = strings.TrimRight(ctx.GlobalString(SwarmApiFlag.Name), "/") + bzzapi = strings.TrimRight(ctx.GlobalString(SwarmAPIFlag.Name), "/") client = swarm.NewClient(bzzapi) entryToRemove = api.ManifestEntry{} longestPathEntry = api.ManifestEntry{} diff --git a/cmd/swarm/upload.go b/cmd/swarm/upload.go index 9f4c525bb9..50f3dbe967 100644 --- a/cmd/swarm/upload.go +++ b/cmd/swarm/upload.go @@ -39,7 +39,7 @@ func upload(ctx *cli.Context) { args := ctx.Args() var ( - bzzapi = strings.TrimRight(ctx.GlobalString(SwarmApiFlag.Name), "/") + bzzapi = strings.TrimRight(ctx.GlobalString(SwarmAPIFlag.Name), "/") recursive = ctx.GlobalBool(SwarmRecursiveUploadFlag.Name) wantManifest = ctx.GlobalBoolT(SwarmWantManifestFlag.Name) defaultPath = ctx.GlobalString(SwarmUploadDefaultPath.Name) diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go index d3d58a373e..0ee2fc6b34 100644 --- a/cmd/utils/cmd.go +++ b/cmd/utils/cmd.go @@ -93,7 +93,7 @@ func StartNode(stack *node.Node) { // wrong. // // ImportChain also listens for interrupting signals. -// +// // After insertion is done, all accumulated events will be fired. func ImportChain(chain *core.BlockChain, fn string) error { // Watch for Ctrl-C while the import is running. diff --git a/cmd/utils/customflags.go b/cmd/utils/customflags.go index 9d9329b19a..0b941093be 100644 --- a/cmd/utils/customflags.go +++ b/cmd/utils/customflags.go @@ -32,7 +32,7 @@ import ( ) // DirectoryString is a custom type which is registered in the flags library -// which cli uses for argument parsing. This allows us to expand Value to an +// which cli uses for argument parsing. This allows us to expand Value to an // absolute path when the argument is parsed type DirectoryString struct { Value string @@ -42,6 +42,7 @@ type DirectoryString struct { func (s *DirectoryString) String() string { return s.Value } + // Set updates the field Value by passing it's parameter to the expandPath function. func (s *DirectoryString) Set(value string) error { s.Value = expandPath(value) @@ -80,7 +81,6 @@ func (df DirectoryFlag) Apply(set *flag.FlagSet) { }) } - // TextMarshaler holds interfaces from the encoding package. type TextMarshaler interface { encoding.TextMarshaler