Merge pull request #2064 from fjl/remove-common-rlp

common: remove old RLP implementation, Value and ExtPackage
This commit is contained in:
Jeffrey Wilcke
2015-12-18 20:26:19 +01:00
17 changed files with 96 additions and 1235 deletions

View File

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