From ed3434f38f978cfcd037e53b74f399dd6925169c Mon Sep 17 00:00:00 2001
From: jangko <jangko128@gmail.com>
Date: Wed, 20 May 2020 11:36:09 +0700
Subject: [PATCH] fix test_witness_json wrong code arrangement

---
 stateless/test_witness_json.nim | 30 +++++++++++++++++-------------
 stateless/test_witness_keys.nim |  2 +-
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/stateless/test_witness_json.nim b/stateless/test_witness_json.nim
index 4b1a2049c..52d5c9999 100644
--- a/stateless/test_witness_json.nim
+++ b/stateless/test_witness_json.nim
@@ -1,5 +1,5 @@
 import
-  eth/common, eth/trie/db, json, os, unittest,
+  eth/common, eth/trie/db, json, os, unittest2,
   ./tree_from_witness, parseopt,
   ./witness_types, stew/byteutils
 
@@ -99,7 +99,7 @@ proc processNode(t: var Tester, x: JsonNode, storageMode: bool = false) =
 proc parseRootHash(x: string): KeccakHash =
   result.data = hexToByteArray[32](x)
 
-proc parseTester(t: var Tester, n: JsonNode) =
+proc parseTester(t: var Tester, n: JsonNode, testStatusIMPL: var TestStatus) =
   t.error = n["error"].getBool()
   t.rootHash = parseRootHash(n["rootHash"].getStr())
   t.write(n["version"])
@@ -112,13 +112,13 @@ proc parseTester(t: var Tester, n: JsonNode) =
   except ParsingError:
     check t.error == true
 
-proc parseTester(filename: string): Tester =
+proc parseTester(filename: string, testStatusIMPL: var TestStatus): Tester =
   let n = parseFile(filename)
-  parseTester(result, n)
+  parseTester(result, n, testStatusIMPL)
 
 proc runTest(filePath, fileName: string) =
   test fileName:
-    let t = parseTester(filePath)
+    let t = parseTester(filePath, testStatusIMPL)
     var db = newMemoryDB()
     try:
       var tb = initTreeBuilder(t.output, db, {wfEIP170})
@@ -129,17 +129,18 @@ proc runTest(filePath, fileName: string) =
         check root == t.rootHash
         check t.error == false
     except ParsingError, ContractCodeError:
-      debugEcho "Error detected ", getCurrentExceptionMsg()
+      echo "Exception detected ", getCurrentExceptionMsg()
       check t.error == true
 
 proc writeFuzzData(filePath, fileName: string) =
-  let t = parseTester(filePath)
+  var testStatusIMPL: TestStatus
+  let t = parseTester(filePath, testStatusIMPL)
   var db = newMemoryDB()
   var tb = initTreeBuilder(t.output, db, {wfEIP170})
   let root = tb.buildTree()
   writeFile(filename, t.output)
 
-proc witnessJsonMain*() =
+proc fuzzTool(): bool =
   var filename: string
   var numArg = 0
 
@@ -162,11 +163,14 @@ proc witnessJsonMain*() =
   if filename != "":
     echo "generate fuzz data"
     writeFuzzData(filename, "fuzz.data")
-    return
+    return true
 
-  for x in walkDirRec("stateless" / "fixtures"):
-    let y = splitPath(x)
-    runTest(x, y.tail)
+proc witnessJsonMain*() =
+  suite "test tree builder against json fixtures":
+    for x in walkDirRec("stateless" / "fixtures"):
+      let y = splitPath(x)
+      runTest(x, y.tail)
 
 when isMainModule:
-  witnessJsonMain()
+  if not fuzzTool():
+    witnessJsonMain()
diff --git a/stateless/test_witness_keys.nim b/stateless/test_witness_keys.nim
index 5458da586..93e160916 100644
--- a/stateless/test_witness_keys.nim
+++ b/stateless/test_witness_keys.nim
@@ -1,5 +1,5 @@
 import
-  randutils, random, unittest, stew/byteutils,
+  randutils, random, unittest2, stew/byteutils,
   eth/[common, rlp], eth/trie/[hexary, db, trie_defs, nibbles],
   faststreams/inputs, nimcrypto/sysrand,
   ../stateless/[witness_from_tree, tree_from_witness],