forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-26 14:46:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

les, light: fix weird merge errors

Browse source
This commit is contained in:
Péter Szilágyi 2016-11-30 12:40:01 +02:00
parent f8be5d9367
commit cd4c23e9ba
No known key found for this signature in database
GPG key ID: 119A76381CCB7DD2
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
les/handler_test.go
View file

@ -316,7 +316,7 @@ func testGetProofs(t *testing.T, protocol int) {
for i := uint64(0); i <= bc.CurrentBlock().NumberU64(); i++ { for i := uint64(0); i <= bc.CurrentBlock().NumberU64(); i++ {
header := bc.GetHeaderByNumber(i) header := bc.GetHeaderByNumber(i)
root := header.Root root := header.Root
trie, _ := trie.New(root, db) trie, _ := trie.New(root, db, 0)
for _, acc := range accounts { for _, acc := range accounts {
req := ProofReq{ req := ProofReq{

2
light/odr_test.go
View file

@ -73,7 +73,7 @@ func (odr *testOdr) Retrieve(ctx context.Context, req OdrRequest) error {
case *ReceiptsRequest: case *ReceiptsRequest:
req.Receipts = core.GetBlockReceipts(odr.sdb, req.Hash, core.GetBlockNumber(odr.sdb, req.Hash)) req.Receipts = core.GetBlockReceipts(odr.sdb, req.Hash, core.GetBlockNumber(odr.sdb, req.Hash))
case *TrieRequest: case *TrieRequest:
t, _ := trie.New(req.Id.Root, odr.sdb) t, _ := trie.New(req.Id.Root, odr.sdb, 0)
req.Proof = t.Prove(req.Key) req.Proof = t.Prove(req.Key)
case *CodeRequest: case *CodeRequest:
req.Data, _ = odr.sdb.Get(req.Hash[:]) req.Data, _ = odr.sdb.Get(req.Hash[:])