diff options
author | Felix Lange <fjl@twurst.com> | 2015-03-18 20:36:48 +0800 |
---|---|---|
committer | Felix Lange <fjl@twurst.com> | 2015-03-18 20:36:48 +0800 |
commit | b5b83db450974f70f4bc25f280cc6ec9193f8e19 (patch) | |
tree | 88127007dcf407a6b991562e455a1be6accd04a0 /core/chain_manager.go | |
parent | c298148a7f0890cd5ed62d2a91cc81431b2731f1 (diff) | |
download | go-tangerine-b5b83db450974f70f4bc25f280cc6ec9193f8e19.tar go-tangerine-b5b83db450974f70f4bc25f280cc6ec9193f8e19.tar.gz go-tangerine-b5b83db450974f70f4bc25f280cc6ec9193f8e19.tar.bz2 go-tangerine-b5b83db450974f70f4bc25f280cc6ec9193f8e19.tar.lz go-tangerine-b5b83db450974f70f4bc25f280cc6ec9193f8e19.tar.xz go-tangerine-b5b83db450974f70f4bc25f280cc6ec9193f8e19.tar.zst go-tangerine-b5b83db450974f70f4bc25f280cc6ec9193f8e19.zip |
core: use package rlp to encode blocks
This also changes the chain export format so there is no
enclosing list around the blocks, which enables streaming export.
Diffstat (limited to 'core/chain_manager.go')
-rw-r--r-- | core/chain_manager.go | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/core/chain_manager.go b/core/chain_manager.go index 5316a3423..060805428 100644 --- a/core/chain_manager.go +++ b/core/chain_manager.go @@ -3,6 +3,7 @@ package core import ( "bytes" "fmt" + "io" "math/big" "sync" @@ -254,22 +255,20 @@ func (bc *ChainManager) ResetWithGenesisBlock(gb *types.Block) { bc.currentBlock = bc.genesisBlock } -func (self *ChainManager) Export() []byte { +// Export writes the active chain to the given writer. +func (self *ChainManager) Export(w io.Writer) error { self.mu.RLock() defer self.mu.RUnlock() - chainlogger.Infof("exporting %v blocks...\n", self.currentBlock.Header().Number) - - blocks := make([]*types.Block, int(self.currentBlock.NumberU64())+1) for block := self.currentBlock; block != nil; block = self.GetBlock(block.Header().ParentHash) { - blocks[block.NumberU64()] = block + if err := block.EncodeRLP(w); err != nil { + return err + } } - - return common.Encode(blocks) + return nil } func (bc *ChainManager) insert(block *types.Block) { - //encodedBlock := common.Encode(block) bc.blockDb.Put([]byte("LastBlock"), block.Hash().Bytes()) bc.currentBlock = block bc.lastBlockHash = block.Hash() @@ -279,10 +278,9 @@ func (bc *ChainManager) insert(block *types.Block) { } func (bc *ChainManager) write(block *types.Block) { - encodedBlock := common.Encode(block.RlpDataForStorage()) - + enc, _ := rlp.EncodeToBytes((*types.StorageBlock)(block)) key := append(blockHashPre, block.Hash().Bytes()...) - bc.blockDb.Put(key, encodedBlock) + bc.blockDb.Put(key, enc) } // Accessors @@ -324,13 +322,12 @@ func (self *ChainManager) GetBlock(hash common.Hash) *types.Block { if len(data) == 0 { return nil } - var block types.Block + var block types.StorageBlock if err := rlp.Decode(bytes.NewReader(data), &block); err != nil { - fmt.Println(err) + chainlogger.Errorf("invalid block RLP for hash %x: %v", hash, err) return nil } - - return &block + return (*types.Block)(&block) } func (self *ChainManager) GetBlockByNumber(num uint64) *types.Block { |