diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-12-19 03:26:19 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-12-19 03:26:19 +0800 |
| commit | dbbcf558e2c4ccb4556ba62d07204c25ddcb4783 (patch) | |
| tree | c80eb767d4e4d38486688997318906e5396e5c93 /cmd/geth | |
| parent | 4811409e99e87cd8862a9813422d61fc0f752d18 (diff) | |
| parent | e6fb69296e647ff305e5d9df059e5aa956303538 (diff) | |
| download | dexon-dbbcf558e2c4ccb4556ba62d07204c25ddcb4783.tar dexon-dbbcf558e2c4ccb4556ba62d07204c25ddcb4783.tar.gz dexon-dbbcf558e2c4ccb4556ba62d07204c25ddcb4783.tar.bz2 dexon-dbbcf558e2c4ccb4556ba62d07204c25ddcb4783.tar.lz dexon-dbbcf558e2c4ccb4556ba62d07204c25ddcb4783.tar.xz dexon-dbbcf558e2c4ccb4556ba62d07204c25ddcb4783.tar.zst dexon-dbbcf558e2c4ccb4556ba62d07204c25ddcb4783.zip | |
Merge pull request #2064 from fjl/remove-common-rlp
common: remove old RLP implementation, Value and ExtPackage
Diffstat (limited to 'cmd/geth')
| -rw-r--r-- | cmd/geth/chaincmd.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cmd/geth/chaincmd.go b/cmd/geth/chaincmd.go index 80f3777d6..868ee7db1 100644 --- a/cmd/geth/chaincmd.go +++ b/cmd/geth/chaincmd.go @@ -137,8 +137,7 @@ func upgradeDB(ctx *cli.Context) { glog.Infoln("Upgrading blockchain database") chain, chainDb := utils.MakeChain(ctx) - v, _ := chainDb.Get([]byte("BlockchainVersion")) - bcVersion := int(common.NewValue(v).Uint()) + bcVersion := core.GetBlockChainVersion(chainDb) if bcVersion == 0 { bcVersion = core.BlockChainVersion } @@ -154,7 +153,7 @@ func upgradeDB(ctx *cli.Context) { // Import the chain file. chain, chainDb = utils.MakeChain(ctx) - chainDb.Put([]byte("BlockchainVersion"), common.NewValue(core.BlockChainVersion).Bytes()) + core.WriteBlockChainVersion(chainDb, core.BlockChainVersion) err := utils.ImportChain(chain, exportFile) chainDb.Close() if err != nil { |