forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 02:12:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cmd: fix and gofmt

Browse source
This commit is contained in:
Kiel barry 2018-05-29 16:51:07 -07:00
parent f7151bf6f5
commit f02480d8bb
12 changed files with 30 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmd/clef/main.go
View file

@ -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,

1
cmd/evm/json_logger.go
View file

@ -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

2
cmd/geth/main.go
View file

@ -108,7 +108,7 @@ var (
utils.TestnetFlag,
utils.RinkebyFlag,
utils.VMEnableDebugFlag,
utils.NetworkIdFlag,
utils.NetworkIDFlag,
utils.RPCCORSDomainFlag,
utils.RPCVirtualHostsFlag,
utils.EthStatsURLFlag,

2
cmd/geth/usage.go
View file

@ -71,7 +71,7 @@ var AppHelpFlagGroups = []flagGroup{
utils.DataDirFlag,
utils.KeyStoreDirFlag,
utils.NoUSBFlag,
utils.NetworkIdFlag,
utils.NetworkIDFlag,
utils.TestnetFlag,
utils.RinkebyFlag,
utils.SyncModeFlag,

8
cmd/swarm/config.go
View file

@ -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 {

16
cmd/swarm/config_test.go
View file

@ -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 {

2
cmd/swarm/list.go
View file

@ -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 {

10
cmd/swarm/main.go
View file

@ -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"))

6
cmd/swarm/manifest.go
View file

@ -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{}

2
cmd/swarm/upload.go
View file

@ -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)

2
cmd/utils/customflags.go
View file

@ -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