merge vm_memory, vm_interpreter, and vm_utils_numeric => vm_internals

why:
  currently used for tests only

nimbus/vm_internals.nim

@@ -8,11 +8,25 @@
 # at your option. This file may not be copied, modified, or distributed except
 # according to those terms.
 
-# At the moment, this header file interface is only used for testing, so it
-# might be worth merging it into a vm_internals.nim (or so) header file.
+# At the moment, this header file interface is only used for testing.
+
+import
+  ./vm/memory as vmm
+export
+  vmm.Memory,
+  vmm.extend,
+  vmm.len,
+  vmm.newMemory,
+  vmm.read,
+  vmm.write
+
+when defined(evmc_enabled):
+  export
+    vmm.readPtr
+
+
 import
   ./vm/interpreter/utils/utils_numeric as vmn
-
 export
   vmn.GasNatural,
   vmn.calcMemSize,
@@ -26,5 +40,12 @@ export
   vmn.setSign,
   vmn.toInt,
   vmn.wordCount
-  
+
+
+# Wrapping the wrapper -- lol
+import
+  ./vm/interpreter as vmi
+export
+  vmi
+
 # End

nimbus/vm_interpreter.nim

@@ -1,21 +0,0 @@
-# Nimbus
-# Copyright (c) 2018 Status Research & Development GmbH
-# Licensed under either of
-#  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
-#    http://www.apache.org/licenses/LICENSE-2.0)
-#  * MIT license ([LICENSE-MIT](LICENSE-MIT) or
-#    http://opensource.org/licenses/MIT)
-# at your option. This file may not be copied, modified, or distributed except
-# according to those terms.
-
-# Wrapper for a wrapper -- lol
-
-# At the moment, this header file interface is only used for testing, so it
-# might be worth merging it into a vm_internals.nim (or so) header file.
-import
-  ./vm/interpreter as vmi
-
-export
-  vmi
-
-# End

nimbus/vm_memory.nim

@@ -1,30 +0,0 @@
-# Nimbus
-# Copyright (c) 2018 Status Research & Development GmbH
-# Licensed under either of
-#  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
-#    http://www.apache.org/licenses/LICENSE-2.0)
-#  * MIT license ([LICENSE-MIT](LICENSE-MIT) or
-#    http://opensource.org/licenses/MIT)
-# at your option. This file may not be copied, modified, or distributed except
-# according to those terms.
-
-# Wrapper for a wrapper -- lol
-
-# At the moment, this header file interface is only used for testing, so it
-# might be worth merging it into a vm_internals.nim (or so) header file.
-import
-  ./vm/memory as vmm
-
-export
-  vmm.Memory,
-  vmm.extend,
-  vmm.len,
-  vmm.newMemory,
-  vmm.read,
-  vmm.write
-
-when defined(evmc_enabled):
-  export
-    vmm.readPtr
-
-# End

tests/macro_assembler.nim

@@ -7,8 +7,8 @@ import
   options, json, os, eth/trie/[db, hexary],
   ../nimbus/[transaction, utils],
   ../nimbus/db/[db_chain, accounts_cache],
-  ../nimbus/[vm_computation, vm_state_transactions, vm_types2,
-             vm_message, vm_memory, vm_state, vm_types]
+  ../nimbus/[vm_state_transactions, vm_types2,
+             vm_message, vm_internals, vm_state, vm_types]
 
 export vm_types2, byteutils
 {.experimental: "dynamicBindSym".}

tests/test_code_stream.nim

@@ -6,7 +6,7 @@
 # at your option. This file may not be copied, modified, or distributed except according to those terms.
 
 import  unittest2, sequtils,
-        ../nimbus/vm_interpreter
+        ../nimbus/vm_internals
 
 proc codeStreamMain*() =
   suite "parse bytecode":

tests/test_gas_meter.nim

@@ -8,7 +8,7 @@
 import
   unittest2, macros, strformat,
   eth/common/eth_types,
-  ../nimbus/[vm_types, errors, vm_interpreter]
+  ../nimbus/[vm_types, errors, vm_internals]
 
 # TODO: quicktest
 # PS: parametrize can be easily immitated, but still quicktests would be even more useful

tests/test_generalstate_json.nim

@@ -13,7 +13,7 @@ import
   ../nimbus/p2p/executor, test_config,
   ../nimbus/transaction,
   ../nimbus/[vm_state, vm_types, utils],
-  ../nimbus/vm_interpreter,
+  ../nimbus/vm_internals,
   ../nimbus/db/[db_chain, accounts_cache]
 
 type

tests/test_memory.nim

@@ -8,7 +8,7 @@
 import
   unittest2, sequtils,
   eth/common/eth_types,
-  ../nimbus/[errors, vm_memory]
+  ../nimbus/[errors, vm_internals]
 
 proc memory32: Memory =
   result = newMemory()

tests/test_misc.nim

@@ -1,7 +1,7 @@
 import
   unittest2, stew/byteutils,
   eth/common/eth_types,
-  ../nimbus/vm_utils_numeric
+  ../nimbus/vm_internals
 
 func toAddress(n: int): EthAddress =
   result[19] = n.byte

tests/test_stack.nim

@@ -8,7 +8,7 @@
 import
   unittest2,
   eth/common/eth_types,
-  ../nimbus/[constants, errors, vm_interpreter]
+  ../nimbus/[constants, errors, vm_internals]
 
 
 template testPush(value: untyped, expected: untyped): untyped =

tests/test_vm_json.nim

@@ -8,7 +8,7 @@
 import
   unittest2, strformat, strutils, tables, json, os, times, sequtils,
   stew/byteutils, eth/[rlp, common], eth/trie/db,
-  ./test_helpers, ./test_allowed_to_fail, ../nimbus/vm_interpreter,
+  ./test_helpers, ./test_allowed_to_fail, ../nimbus/vm_internals,
   ../nimbus/[constants, vm_state, vm_types, utils],
   ../nimbus/db/[db_chain]