minor fixes after rebase

Author: MaksymMalicki

blockchain/blockchain.go

@@ -867,18 +867,22 @@ func (b *Blockchain) revertHead(batch db.Batch) error {
 	if err != nil {
 		return err
 	}
+
 	stateUpdate, err := core.GetStateUpdateByBlockNum(b.database, blockNumber)
 	if err != nil {
 		return err
 	}
+
 	state, err := state.New(stateUpdate.NewRoot, b.stateDB)
 	if err != nil {
 		return err
 	}
+
 	// revert state
 	if err = state.Revert(blockNumber, stateUpdate); err != nil {
 		return err
 	}
+
 	header, err := core.GetBlockHeaderByNumber(b.database, blockNumber)
 	if err != nil {
 		return err