From d3380f6cf06069d0168383358f623086c37e1542 Mon Sep 17 00:00:00 2001
From: andri lim <jangko128@gmail.com>
Date: Tue, 11 Dec 2018 08:16:21 +0700
Subject: [PATCH] fix test

---
 nimbus/p2p/chain.nim   |  2 +-
 tests/test_vm_json.nim | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/nimbus/p2p/chain.nim b/nimbus/p2p/chain.nim
index 03797530a..1c2a073b5 100644
--- a/nimbus/p2p/chain.nim
+++ b/nimbus/p2p/chain.nim
@@ -130,7 +130,7 @@ method persistBlocks*(c: Chain, headers: openarray[BlockHeader], bodies: openarr
 
     let receiptRoot = calcReceiptRoot(receipts)
     if headers[i].receiptRoot != receiptRoot:
-      debug "wrong receipt in block", blockNumber = headers[i].blockNumber, receiptRoot, valid=headers[i].receiptRoot
+      debug "wrong receiptRoot in block", blockNumber = headers[i].blockNumber, actual=receiptRoot, expected=headers[i].receiptRoot
     assert(headers[i].receiptRoot == receiptRoot)
 
     discard c.db.persistHeaderToDb(headers[i])
diff --git a/tests/test_vm_json.nim b/tests/test_vm_json.nim
index c56466982..32a67df43 100644
--- a/tests/test_vm_json.nim
+++ b/tests/test_vm_json.nim
@@ -16,6 +16,9 @@ import
   ../nimbus/vm/interpreter,
   ../nimbus/db/[db_chain, state_db]
 
+proc hashLogEntries(logs: seq[Log]): string =
+  toLowerAscii("0x" & $keccak256.digest(rlp.encode(logs)))
+
 proc testFixture(fixtures: JsonNode, testStatusIMPL: var TestStatus)
 
 suite "vm json tests":
@@ -69,12 +72,11 @@ proc testFixture(fixtures: JsonNode, testStatusIMPL: var TestStatus) =
     if computation.isError:
       echo "Computation error: ", computation.error.info
 
-    let logEntries = computation.getLogEntries()
+    let logEntries = vmState.getAndClearLogEntries()
     if not fixture{"logs"}.isNil:
-      discard
-      # TODO hashLogEntries let actualLogsHash = hashLogEntries(logEntries)
-      # let expectedLogsHash = fixture{"logs"}.getStr
-      # check(expectedLogsHash == actualLogsHash)
+      let actualLogsHash = hashLogEntries(logEntries)
+      let expectedLogsHash = toLowerAscii(fixture{"logs"}.getStr)
+      check(expectedLogsHash == actualLogsHash)
     elif logEntries.len > 0:
       checkpoint(&"Got log entries: {logEntries}")
       fail()