From 30860491ba9f1fae2eb9e7dac1c35b679b20fbe9 Mon Sep 17 00:00:00 2001 From: Péter Szilágyi Date: Thu, 15 Sep 2016 14:09:47 +0300 Subject: cmd, eth: drop the blockchain version from cli/eth configs --- eth/backend.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'eth') 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 -- cgit