diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-07-01 23:16:44 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-07-01 23:16:44 +0800 |
| commit | 5caff3bc247cdd71f2342093d276041afe898ab3 (patch) | |
| tree | a771298f17987eba6fb05d7bac1e772121296856 /cmd | |
| parent | 507869bff10adab3d4f183aeaf3ef31715041046 (diff) | |
| parent | d6f2c0a76f6635ebeb245815c5f686c545ed527d (diff) | |
| download | go-tangerine-5caff3bc247cdd71f2342093d276041afe898ab3.tar go-tangerine-5caff3bc247cdd71f2342093d276041afe898ab3.tar.gz go-tangerine-5caff3bc247cdd71f2342093d276041afe898ab3.tar.bz2 go-tangerine-5caff3bc247cdd71f2342093d276041afe898ab3.tar.lz go-tangerine-5caff3bc247cdd71f2342093d276041afe898ab3.tar.xz go-tangerine-5caff3bc247cdd71f2342093d276041afe898ab3.tar.zst go-tangerine-5caff3bc247cdd71f2342093d276041afe898ab3.zip | |
Merge pull request #1351 from karalabe/eth61
Implement eth/61
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/geth/main.go | 3 | ||||
| -rw-r--r-- | cmd/utils/flags.go | 6 |
2 files changed, 1 insertions, 8 deletions
diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 645f51b9a..be40d5137 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -277,7 +277,6 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso utils.ExecFlag, utils.WhisperEnabledFlag, utils.VMDebugFlag, - utils.ProtocolVersionFlag, utils.NetworkIdFlag, utils.RPCCORSDomainFlag, utils.VerbosityFlag, @@ -644,7 +643,7 @@ func version(c *cli.Context) { if gitCommit != "" { fmt.Println("Git Commit:", gitCommit) } - fmt.Println("Protocol Version:", c.GlobalInt(utils.ProtocolVersionFlag.Name)) + fmt.Println("Protocol Versions:", eth.ProtocolVersions) fmt.Println("Network Id:", c.GlobalInt(utils.NetworkIdFlag.Name)) fmt.Println("Go Version:", runtime.Version()) fmt.Println("OS:", runtime.GOOS) diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 0d59980ec..6f319eb40 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -82,11 +82,6 @@ var ( Usage: "Data directory to be used", Value: DirectoryString{common.DefaultDataDir()}, } - ProtocolVersionFlag = cli.IntFlag{ - Name: "protocolversion", - Usage: "ETH protocol version (integer)", - Value: eth.ProtocolVersion, - } NetworkIdFlag = cli.IntFlag{ Name: "networkid", Usage: "Network Id (integer)", @@ -359,7 +354,6 @@ func MakeEthConfig(clientID, version string, ctx *cli.Context) *eth.Config { return ð.Config{ Name: common.MakeName(clientID, version), DataDir: ctx.GlobalString(DataDirFlag.Name), - ProtocolVersion: ctx.GlobalInt(ProtocolVersionFlag.Name), GenesisNonce: ctx.GlobalInt(GenesisNonceFlag.Name), BlockChainVersion: ctx.GlobalInt(BlockchainVersionFlag.Name), SkipBcVersionCheck: false, |