cleanup unused code

stateless/test_witness_keys.nim

@@ -1,6 +1,6 @@
 import
   randutils, stew/byteutils, random,
-  eth/[common, rlp], eth/trie/[hexary, db, trie_defs],
+  eth/[common, rlp], eth/trie/[hexary, db],
   faststreams/input_stream,
   ../stateless/[witness_from_tree, tree_from_witness]
 
@@ -23,7 +23,7 @@ proc runTest(keyBytes: int, valBytes: int, numPairs: int) =
   var witness = wb.getBranchRecurse(keys[0])
   var input = memoryInput(witness)
 
-  var db = newMemoryDB()  
+  var db = newMemoryDB()
   var tb = initTreeBuilder(input, db)
   var root = tb.treeNode()
   debugEcho "root: ", root.data.toHex
@@ -41,10 +41,10 @@ proc main() =
   runTest(11, 40, 10)
   runTest(20, 1, 15)
   runTest(25, 10, 20)
-  
+
   randomize()
   for i in 0..<30:
     runTest(rand(1..30), rand(1..50), rand(1..30))
-    
+
 
 main()

stateless/tree_from_witness.nim

@@ -11,23 +11,20 @@ type
     data*: array[32, byte]
 
   TreeBuilder = object
-    #data: seq[byte]
-    #pos: int
     input: InputStream
     db: DB
     root: KeccakHash
 
-# InputStream is unstable, so we hack our own inputstream
 proc initTreeBuilder*(input: InputStream, db: DB): TreeBuilder =
   result.input = input
   result.db = db
   result.root = emptyRlpHash
 
-#proc initTreeBuilder*(input: openArray[byte], db: DB): TreeBuilder =
-#  result.data = @input
-#  result.db = db
-#  result.root = emptyRlpHash
-
+proc initTreeBuilder*(input: openArray[byte], db: DB): TreeBuilder =
+  result.input = memoryInput(input)
+  result.db = db
+  result.root = emptyRlpHash
+  
 func rootHash*(t: TreeBuilder): KeccakHash {.inline.} =
   t.root
 
@@ -47,24 +44,6 @@ template peek(t: TreeBuilder): byte =
 template read(t: var TreeBuilder, len: int): auto =
   t.input.read(len)
 
-#[proc readByte(t: var TreeBuilder): byte =
-  if t.pos < t.data.len:
-    result = t.data[t.pos]
-    inc t.pos
-
-template len(t: TreeBuilder): int =
-  t.data.len
-
-proc peek(t: TreeBuilder): byte =
-  if t.pos + 1 < t.data.len:
-    result = t.data[t.pos + 1]
-
-template read(t: var TreeBuilder, len: int): auto =
-  let pos = t.pos
-  inc(t.pos, len)
-  toOpenArray(t.data, pos, pos + len - 1)
-]#
-
 proc readU32(t: var TreeBuilder): uint32 =
   result = fromBytesBE(uint32, t.read(4))