EVM: Remove vm_forks everywhere, use common forks list instead

The common forks list was already used, redirected via `vm_forks` for
historical compatibility.  Remove the old `vm_forks` now and divert all imports
to the common forks list outside the EVM.

Signed-off-by: Jamie Lokier <jamie@shareable.org>

nimbus/vm/computation.nim

@@ -8,8 +8,8 @@
 import
   chronicles, strformat, macros, options, times,
   sets, eth/[common, keys],
-  ../constants, ../errors,
+  ../constants, ../errors, ../forks,
-  ./interpreter/[opcode_values, gas_meter, gas_costs, vm_forks],
+  ./interpreter/[opcode_values, gas_meter, gas_costs],
   ./code_stream, ./memory, ./message, ./stack, ./types, ./state,
   ../db/[accounts_cache, db_chain],
   ../utils/header, ./precompiles,

nimbus/vm/interpreter.nim

@@ -15,13 +15,6 @@ export
   vmo.Op
 
 
-# see vm_forks
-import
-  ./interpreter/vm_forks as vmf
-export
-  vmf.Fork
-
-
 # see vm_message
 import
   ./message as vmm

nimbus/vm/interpreter/gas_costs.nim

@@ -8,7 +8,7 @@
 import
   math, eth/common/eth_types,
   ./utils/[macros_gen_opcodes, utils_numeric],
-  ./opcode_values, ./vm_forks, ../../errors
+  ./opcode_values, ../../forks, ../../errors
 
 when defined(evmc_enabled):
   import evmc/evmc

nimbus/vm/interpreter/opcodes_impl.nim

@@ -9,9 +9,9 @@ import
   strformat, times, sets, sequtils, options,
   chronicles, stint, nimcrypto, stew/ranges/ptr_arith, eth/common,
   ./utils/[macros_procs_opcodes, utils_numeric],
-  ./gas_meter, ./gas_costs, ./opcode_values, ./vm_forks,
+  ./gas_meter, ./gas_costs, ./opcode_values,
   ../memory, ../stack, ../code_stream, ../computation, ../state, ../types,
-  ../../errors, ../../constants,
+  ../../errors, ../../constants, ../../forks,
   ../../db/[db_chain, accounts_cache]
 
 when defined(evmc_enabled):

nimbus/vm/interpreter/vm_forks.nim

@@ -1,2 +0,0 @@
-import ../../forks
-export Fork

nimbus/vm/interpreter_dispatch.nim

@@ -8,8 +8,8 @@
 import
   tables, macros,
   chronicles,
-  ./interpreter/[opcode_values, opcodes_impl, vm_forks, gas_costs, gas_meter, utils/macros_gen_opcodes],
+  ./interpreter/[opcode_values, opcodes_impl, gas_costs, gas_meter, utils/macros_gen_opcodes],
-  ./code_stream, ./types, ../errors, ./precompiles, ./stack,
+  ./code_stream, ./types, ../errors, ../forks, ./precompiles, ./stack,
   terminal # Those are only needed for logging
 
 logScope:

nimbus/vm/precompiles.nim

@@ -1,6 +1,6 @@
 import
-  ./types,
+  ./types, ../forks,
-  ./interpreter/[gas_meter, gas_costs, utils/utils_numeric, vm_forks],
+  ./interpreter/[gas_meter, gas_costs, utils/utils_numeric],
   ../errors, stint, eth/[keys, common], chronicles, tables, macros,
   math, nimcrypto, bncurve/[fields, groups], ./blake2b_f, ./blscurve
 

nimbus/vm/state.nim

@@ -11,7 +11,7 @@
 import
   macros, strformat, tables, sets, options,
   eth/[common, keys, rlp], nimcrypto/keccak,
-  ./interpreter/[vm_forks, gas_costs], ../errors,
+  ./interpreter/gas_costs, ../errors, ../forks,
   ../constants, ../db/[db_chain, accounts_cache],
   ../utils, json, ./transaction_tracer, ./types,
   ../config, ../../stateless/[witness_from_tree, witness_types]

nimbus/vm/types.nim

@@ -11,8 +11,8 @@
 import
   tables, eth/common,
   options, json, sets,
-  ./memory, ./stack, ./code_stream,
+  ./memory, ./stack, ./code_stream, ../forks,
-  ./interpreter/[gas_costs, opcode_values, vm_forks],
+  ./interpreter/[gas_costs, opcode_values],
   # TODO - will be hidden at a lower layer
   ../db/[db_chain, accounts_cache]
 

tests/macro_assembler.nim

@@ -6,7 +6,7 @@ import
 import
   options, json, os, eth/trie/[db, hexary],
   ../nimbus/db/[db_chain, accounts_cache],
-  ../nimbus/vm_internals,
+  ../nimbus/vm_internals, ../nimbus/forks,
   ../nimbus/transaction/call_evm
 
 export byteutils

tests/test_generalstate_json.nim

@@ -14,7 +14,8 @@ import
   ../nimbus/transaction,
   ../nimbus/[vm_state, vm_types, utils],
   ../nimbus/vm_internals,
-  ../nimbus/db/[db_chain, accounts_cache]
+  ../nimbus/db/[db_chain, accounts_cache],
+  ../nimbus/forks
 
 type
   Tester = object