From cd4c23e9ba8869665f995ef7bcbdb64de1ed0faf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Wed, 30 Nov 2016 12:40:01 +0200 Subject: [PATCH] les, light: fix weird merge errors --- les/handler_test.go | 2 +- light/odr_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/les/handler_test.go b/les/handler_test.go index 37c5dd2268..5242a685da 100644 --- a/les/handler_test.go +++ b/les/handler_test.go @@ -316,7 +316,7 @@ func testGetProofs(t *testing.T, protocol int) { for i := uint64(0); i <= bc.CurrentBlock().NumberU64(); i++ { header := bc.GetHeaderByNumber(i) root := header.Root - trie, _ := trie.New(root, db) + trie, _ := trie.New(root, db, 0) for _, acc := range accounts { req := ProofReq{ diff --git a/light/odr_test.go b/light/odr_test.go index 50255a7f32..1bb99515b8 100644 --- a/light/odr_test.go +++ b/light/odr_test.go @@ -73,7 +73,7 @@ func (odr *testOdr) Retrieve(ctx context.Context, req OdrRequest) error { case *ReceiptsRequest: req.Receipts = core.GetBlockReceipts(odr.sdb, req.Hash, core.GetBlockNumber(odr.sdb, req.Hash)) 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) case *CodeRequest: req.Data, _ = odr.sdb.Get(req.Hash[:])