aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2016-09-15 19:09:47 +0800
committerPéter Szilágyi <peterke@gmail.com>2016-09-15 19:09:47 +0800
commit30860491ba9f1fae2eb9e7dac1c35b679b20fbe9 (patch)
treea390e1e5c7acf90acf4ee6a1a1edd8fb524385a2
parent0f6f83a709c465b5e140743fc7cfe6d83faf9f20 (diff)
downloadgo-tangerine-30860491ba9f1fae2eb9e7dac1c35b679b20fbe9.tar
go-tangerine-30860491ba9f1fae2eb9e7dac1c35b679b20fbe9.tar.gz
go-tangerine-30860491ba9f1fae2eb9e7dac1c35b679b20fbe9.tar.bz2
go-tangerine-30860491ba9f1fae2eb9e7dac1c35b679b20fbe9.tar.lz
go-tangerine-30860491ba9f1fae2eb9e7dac1c35b679b20fbe9.tar.xz
go-tangerine-30860491ba9f1fae2eb9e7dac1c35b679b20fbe9.tar.zst
go-tangerine-30860491ba9f1fae2eb9e7dac1c35b679b20fbe9.zip
cmd, eth: drop the blockchain version from cli/eth configs
-rw-r--r--cmd/geth/main.go1
-rw-r--r--cmd/geth/usage.go1
-rw-r--r--cmd/utils/flags.go6
-rw-r--r--eth/backend.go7
4 files changed, 3 insertions, 12 deletions
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
index b5e454d87..a7b332d0f 100644
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@@ -133,7 +133,6 @@ participating.
utils.BootnodesFlag,
utils.DataDirFlag,
utils.KeyStoreDirFlag,
- utils.BlockchainVersionFlag,
utils.OlympicFlag,
utils.FastSyncFlag,
utils.CacheFlag,
diff --git a/cmd/geth/usage.go b/cmd/geth/usage.go
index b08de247b..dc1788aad 100644
--- a/cmd/geth/usage.go
+++ b/cmd/geth/usage.go
@@ -74,7 +74,6 @@ var AppHelpFlagGroups = []flagGroup{
utils.FastSyncFlag,
utils.LightKDFFlag,
utils.CacheFlag,
- utils.BlockchainVersionFlag,
},
},
{
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index a1f098f29..3ab556a8f 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -146,11 +146,6 @@ var (
Usage: "Megabytes of memory allocated to internal caching (min 16MB / database forced)",
Value: 128,
}
- BlockchainVersionFlag = cli.IntFlag{
- Name: "blockchainversion",
- Usage: "Blockchain version (integer)",
- Value: core.BlockChainVersion,
- }
FastSyncFlag = cli.BoolFlag{
Name: "fast",
Usage: "Enable fast syncing through state downloads",
@@ -681,7 +676,6 @@ func RegisterEthService(ctx *cli.Context, stack *node.Node, extra []byte) {
Etherbase: MakeEtherbase(stack.AccountManager(), ctx),
ChainConfig: MustMakeChainConfig(ctx),
FastSync: ctx.GlobalBool(FastSyncFlag.Name),
- BlockChainVersion: ctx.GlobalInt(BlockchainVersionFlag.Name),
DatabaseCache: ctx.GlobalInt(CacheFlag.Name),
DatabaseHandles: MakeDatabaseHandles(),
NetworkId: ctx.GlobalInt(NetworkIdFlag.Name),
diff --git a/eth/backend.go b/eth/backend.go
index e1d123a02..c4a883c9e 100644
--- a/eth/backend.go
+++ b/eth/backend.go
@@ -70,7 +70,6 @@ type Config struct {
Genesis string // Genesis JSON to seed the chain database with
FastSync bool // Enables the state download based fast synchronisation algorithm
- BlockChainVersion int
SkipBcVersionCheck bool // e.g. blockchain export
DatabaseCache int
DatabaseHandles int
@@ -180,10 +179,10 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) {
if !config.SkipBcVersionCheck {
bcVersion := core.GetBlockChainVersion(chainDb)
- if bcVersion != config.BlockChainVersion && bcVersion != 0 {
- return nil, fmt.Errorf("Blockchain DB version mismatch (%d / %d). Run geth upgradedb.\n", bcVersion, config.BlockChainVersion)
+ if bcVersion != core.BlockChainVersion && bcVersion != 0 {
+ return nil, fmt.Errorf("Blockchain DB version mismatch (%d / %d). Run geth upgradedb.\n", bcVersion, core.BlockChainVersion)
}
- core.WriteBlockChainVersion(chainDb, config.BlockChainVersion)
+ core.WriteBlockChainVersion(chainDb, core.BlockChainVersion)
}
// load the genesis block or write a new one if no genesis