Refactor: remove .sh dependency for tests

nim.cfg

@@ -1,9 +1,7 @@
--p:"../src"
-
 # TODO FIXME
 # Default compiler on Mac is Clang.
 # Currently it does not compile due to "Flexible array member with non-trivial destruction"
-# See https://github.com/status-im/nimbus/issues/2
+# See https://github.com/status-im/nimbus/issues/2 and https://github.com/status-im/nim-ttmath/issues/10
 # As a workaround, forces GCC-7 on Mac
 # GCC-7 is available through Homebrew
 

nimbus.nimble

@@ -7,10 +7,20 @@ description   = "An Ethereum 2.0 Sharding Client for Resource-Restricted Devices
 license       = "Apache License 2.0"
 skipDirs      = @["tests"]
 
-requires "nim >= 0.17.0",
+requires "nim >= 0.18.1",
          "https://github.com/status-im/nim-keccak-tiny.git >= 0.1.0",
-         "https://github.com/alehander42/nim-rlp.git#fix-ordinal",
-         "https://github.com/status-im/nim-ttmath >= 0.5.0"
-
+         "https://github.com/alehander42/nim-rlp#fix-ordinal", #TODO switching to the Status repo throws: "Error: undeclared identifier: 'Range'"
+         "https://github.com/status-im/nim-ttmath#master"
 
+proc test(name: string, lang = "cpp") =
+  if not dirExists "build":
+    mkDir "build"
+  if not dirExists "nimcache":
+    mkDir "nimcache"
+  --run
+  --nimcache: "nimcache"
+  switch("out", ("./build/" & name))
+  setCommand lang, "tests/" & name & ".nim"
 
+task test, "Run tests":
+  test "all_tests"

tests/all_tests.nim

@@ -0,0 +1,5 @@
+import  ./test_code_stream,
+        ./test_gas_meter,
+        ./test_memory,
+        ./test_stack
+

tests/build_test.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-nim cpp tests/code_stream_test.nim
-nim cpp tests/gas_meter_test.nim
-nim cpp tests/memory_test.nim
-nim cpp tests/stack_test.nim

tests/test.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-./tests/code_stream_test
-./tests/gas_meter_test
-./tests/memory_test
-./tests/stack_test
-

tests/test_code_stream.nim

@@ -1,4 +1,5 @@
-import unittest, strutils, sequtils, opcode_values, vm / code_stream
+import  unittest, strutils, sequtils,
+        ../src/opcode_values, ../src/vm/code_stream
 
 suite "parse bytecode":
   test "accepts bytes":

tests/test_gas_meter.nim

@@ -1,4 +1,6 @@
-import unittest, macros, strformat, strutils, sequtils, constants, opcode_values, errors, logging, vm / gas_meter, ttmath
+import  unittest, macros, strformat, strutils, sequtils,
+        ttmath,
+        ../src/[constants, opcode_values, errors, logging, vm/gas_meter]
 
 # TODO: quicktest
 # PS: parametrize can be easily immitated, but still quicktests would be even more useful

tests/test_memory.nim

@@ -1,4 +1,6 @@
-import unittest, macros, strformat, strutils, sequtils, constants, opcode_values, errors, vm / memory, ttmath
+import  unittest, macros, strformat, strutils, sequtils,
+        ttmath,
+        ../src/[constants, opcode_values, errors, vm/memory]
 
 proc memory32: Memory =
   result = newMemory()

tests/test_stack.nim

@@ -1,4 +1,7 @@
-import unittest, macros, strformat, strutils, sequtils, constants, opcode_values, errors, vm / [stack, value], ttmath, utils / [bytes, padding], utils_numeric
+import  unittest, macros, strformat, strutils, sequtils,
+        ttmath,
+        ../src/[constants, opcode_values, errors, utils_numeric, vm/stack, vm/value, utils/bytes, utils/padding]
+
 
 template testPush(value: untyped, expected: untyped): untyped =
   var stack = newStack()