forked from cerc-io/ipld-eth-server
Update dependencies
- uses newer version of go-ethereum required for go1.11
This commit is contained in:
@@ -36,5 +36,5 @@ func (l LevelDatabase) GetBlockReceipts(blockHash []byte, blockNumber int64) typ
|
||||
func (l LevelDatabase) GetHeadBlockNumber() int64 {
|
||||
h := l.reader.GetHeadBlockHash()
|
||||
n := l.reader.GetBlockNumber(h)
|
||||
return int64(n)
|
||||
return int64(*n)
|
||||
}
|
||||
|
||||
@@ -2,42 +2,42 @@ package level
|
||||
|
||||
import (
|
||||
"github.com/ethereum/go-ethereum/common"
|
||||
"github.com/ethereum/go-ethereum/core"
|
||||
"github.com/ethereum/go-ethereum/core/rawdb"
|
||||
"github.com/ethereum/go-ethereum/core/types"
|
||||
)
|
||||
|
||||
type Reader interface {
|
||||
GetBlock(hash common.Hash, number uint64) *types.Block
|
||||
GetBlockNumber(hash common.Hash) uint64
|
||||
GetBlockNumber(hash common.Hash) *uint64
|
||||
GetBlockReceipts(hash common.Hash, number uint64) types.Receipts
|
||||
GetCanonicalHash(number uint64) common.Hash
|
||||
GetHeadBlockHash() common.Hash
|
||||
}
|
||||
|
||||
type LevelDatabaseReader struct {
|
||||
reader core.DatabaseReader
|
||||
reader rawdb.DatabaseReader
|
||||
}
|
||||
|
||||
func NewLevelDatabaseReader(reader core.DatabaseReader) *LevelDatabaseReader {
|
||||
func NewLevelDatabaseReader(reader rawdb.DatabaseReader) *LevelDatabaseReader {
|
||||
return &LevelDatabaseReader{reader: reader}
|
||||
}
|
||||
|
||||
func (ldbr *LevelDatabaseReader) GetBlock(hash common.Hash, number uint64) *types.Block {
|
||||
return core.GetBlock(ldbr.reader, hash, number)
|
||||
return rawdb.ReadBlock(ldbr.reader, hash, number)
|
||||
}
|
||||
|
||||
func (ldbr *LevelDatabaseReader) GetBlockNumber(hash common.Hash) uint64 {
|
||||
return core.GetBlockNumber(ldbr.reader, hash)
|
||||
func (ldbr *LevelDatabaseReader) GetBlockNumber(hash common.Hash) *uint64 {
|
||||
return rawdb.ReadHeaderNumber(ldbr.reader, hash)
|
||||
}
|
||||
|
||||
func (ldbr *LevelDatabaseReader) GetBlockReceipts(hash common.Hash, number uint64) types.Receipts {
|
||||
return core.GetBlockReceipts(ldbr.reader, hash, number)
|
||||
return rawdb.ReadReceipts(ldbr.reader, hash, number)
|
||||
}
|
||||
|
||||
func (ldbr *LevelDatabaseReader) GetCanonicalHash(number uint64) common.Hash {
|
||||
return core.GetCanonicalHash(ldbr.reader, number)
|
||||
return rawdb.ReadCanonicalHash(ldbr.reader, number)
|
||||
}
|
||||
|
||||
func (ldbr *LevelDatabaseReader) GetHeadBlockHash() common.Hash {
|
||||
return core.GetHeadBlockHash(ldbr.reader)
|
||||
return rawdb.ReadHeadBlockHash(ldbr.reader)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user