forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-18 09:53:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix merge conflict

Browse source
This commit is contained in:
Tim Williams 2018-04-15 15:48:22 -04:00 committed by greg
parent 35ef1746b6
commit 64367817a8
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/blockchain.go
View file

@ -904,14 +904,8 @@ func (bc *BlockChain) WriteBlockWithState(block *types.Block, receipts []*types.
if err := WriteBlock(batch, block); err != nil { if err := WriteBlock(batch, block); err != nil {
return NonStatTy, err return NonStatTy, err
} }
<<<<<<< HEAD
// @NOTE:SHYFT - Write block data for block explorer // @NOTE:SHYFT - Write block data for block explorer
explorerBatch := bc.blockExplorerDb.NewBatch()
if err := shyftdb.WriteBlock(explorerBatch, block); err != nil {
=======
if err := shyftdb.WriteBlock(bc.blockExplorerDb, block); err != nil { if err := shyftdb.WriteBlock(bc.blockExplorerDb, block); err != nil {
>>>>>>> f776e85... change shyftdb to point to a plain leveldb object and directoryr
return NonStatTy, err return NonStatTy, err
} }
shyftdb.GetBlock(bc.blockExplorerDb, block) shyftdb.GetBlock(bc.blockExplorerDb, block)