Commit 3558dd5e authored by Maran's avatar Maran

Finalize blockchain reverting test

parent 0a880108
...@@ -163,14 +163,20 @@ func (bc *BlockChain) FindCanonicalChain(blocks []*Block, commonBlockHash []byte ...@@ -163,14 +163,20 @@ func (bc *BlockChain) FindCanonicalChain(blocks []*Block, commonBlockHash []byte
} }
func (bc *BlockChain) ResetTillBlockHash(hash []byte) error { func (bc *BlockChain) ResetTillBlockHash(hash []byte) error {
lastBlock := bc.CurrentBlock lastBlock := bc.CurrentBlock
returnTo := bc.GetBlock(hash) var returnTo *Block
// Reset to Genesis if that's all the origin there is.
// TODO: REFACTOR TO FUNCTION, Used multiple times if bytes.Compare(hash, bc.genesisBlock.Hash()) == 0 {
bc.CurrentBlock = returnTo returnTo = bc.genesisBlock
bc.LastBlockHash = returnTo.Hash() bc.CurrentBlock = bc.genesisBlock
info := bc.BlockInfo(returnTo) bc.LastBlockHash = bc.genesisBlock.Hash()
bc.LastBlockNumber = info.Number bc.LastBlockNumber = 1
// END TODO } else {
returnTo = bc.GetBlock(hash)
bc.CurrentBlock = returnTo
bc.LastBlockHash = returnTo.Hash()
info := bc.BlockInfo(returnTo)
bc.LastBlockNumber = info.Number
}
bc.Ethereum.StateManager().PrepareDefault(returnTo) bc.Ethereum.StateManager().PrepareDefault(returnTo)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment