From 46bcd9a92c747bd6f2f6f7377d39f3949469203c Mon Sep 17 00:00:00 2001 From: Péter Szilágyi Date: Tue, 28 Feb 2017 13:41:02 +0200 Subject: core, eth: drop database block splitting upgrader --- core/database_util.go | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'core') diff --git a/core/database_util.go b/core/database_util.go index 23240b35e..68263f8d8 100644 --- a/core/database_util.go +++ b/core/database_util.go @@ -539,24 +539,6 @@ func DeleteReceipt(db ethdb.Database, hash common.Hash) { db.Delete(append(receiptsPrefix, hash.Bytes()...)) } -// [deprecated by the header/block split, remove eventually] -// GetBlockByHashOld returns the old combined block corresponding to the hash -// or nil if not found. This method is only used by the upgrade mechanism to -// access the old combined block representation. It will be dropped after the -// network transitions to eth/63. -func GetBlockByHashOld(db ethdb.Database, hash common.Hash) *types.Block { - data, _ := db.Get(append(oldBlockHashPrefix, hash[:]...)) - if len(data) == 0 { - return nil - } - var block types.StorageBlock - if err := rlp.Decode(bytes.NewReader(data), &block); err != nil { - log.Error(fmt.Sprintf("invalid block RLP for hash %x: %v", hash, err)) - return nil - } - return (*types.Block)(&block) -} - // returns a formatted MIP mapped key by adding prefix, canonical number and level // // ex. fn(98, 1000) = (prefix || 1000 || 0) -- cgit