From f37591ca354043c5c3ed88251ae3805ddf1bb5d1 Mon Sep 17 00:00:00 2001 From: Jordan Hrycaj Date: Fri, 9 Apr 2021 17:49:45 +0100 Subject: [PATCH] need to remove vm2_defined sentinel why: subsequent development will compile sources as main without setting the vm2_enabled flag. also, the doc generator would fail an vm2 without setting the flag for the vm2 files. --- nimbus/vm2/interpreter/utils/v2utils_numeric.nim | 2 -- nimbus/vm2/interpreter/v2forks.nim | 2 -- nimbus/vm2/interpreter/v2gas_costs.nim | 2 -- nimbus/vm2/v2computation.nim | 2 -- nimbus/vm2/v2interpreter.nim | 2 -- nimbus/vm2/v2memory.nim | 2 -- nimbus/vm2/v2message.nim | 2 -- nimbus/vm2/v2precompiles.nim | 2 -- nimbus/vm2/v2state.nim | 2 -- nimbus/vm2/v2state_transactions.nim | 2 -- nimbus/vm2/v2types.nim | 2 -- 11 files changed, 22 deletions(-) diff --git a/nimbus/vm2/interpreter/utils/v2utils_numeric.nim b/nimbus/vm2/interpreter/utils/v2utils_numeric.nim index 92c65842f..ae030091d 100644 --- a/nimbus/vm2/interpreter/utils/v2utils_numeric.nim +++ b/nimbus/vm2/interpreter/utils/v2utils_numeric.nim @@ -5,8 +5,6 @@ # * 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. -when not defined(vm2_enabled): - {.fatal: "Flags \"vm2_enabled\" must be defined"} when defined(evmc_enabled): {.fatal: "Flags \"evmc_enabled\" and \"vm2_enabled\" are mutually exclusive"} diff --git a/nimbus/vm2/interpreter/v2forks.nim b/nimbus/vm2/interpreter/v2forks.nim index 98972950b..34f4893f4 100644 --- a/nimbus/vm2/interpreter/v2forks.nim +++ b/nimbus/vm2/interpreter/v2forks.nim @@ -5,8 +5,6 @@ # * 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. -when not defined(vm2_enabled): - {.fatal: "Flags \"vm2_enabled\" must be defined"} when defined(evmc_enabled): {.fatal: "Flags \"evmc_enabled\" and \"vm2_enabled\" are mutually exclusive"} diff --git a/nimbus/vm2/interpreter/v2gas_costs.nim b/nimbus/vm2/interpreter/v2gas_costs.nim index e923573fb..4615f6aba 100644 --- a/nimbus/vm2/interpreter/v2gas_costs.nim +++ b/nimbus/vm2/interpreter/v2gas_costs.nim @@ -5,8 +5,6 @@ # * 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. -when not defined(vm2_enabled): - {.fatal: "Flags \"vm2_enabled\" must be defined"} when defined(evmc_enabled): {.fatal: "Flags \"evmc_enabled\" and \"vm2_enabled\" are mutually exclusive"} diff --git a/nimbus/vm2/v2computation.nim b/nimbus/vm2/v2computation.nim index e05a89599..dcbc6fd89 100644 --- a/nimbus/vm2/v2computation.nim +++ b/nimbus/vm2/v2computation.nim @@ -5,8 +5,6 @@ # * 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. -when not defined(vm2_enabled): - {.fatal: "Flags \"vm2_enabled\" must be defined"} when defined(evmc_enabled): {.fatal: "Flags \"evmc_enabled\" and \"vm2_enabled\" are mutually exclusive"} diff --git a/nimbus/vm2/v2interpreter.nim b/nimbus/vm2/v2interpreter.nim index 0f6ccc684..edaff9765 100644 --- a/nimbus/vm2/v2interpreter.nim +++ b/nimbus/vm2/v2interpreter.nim @@ -8,8 +8,6 @@ # at your option. This file may not be copied, modified, or distributed except # according to those terms. -when not defined(vm2_enabled): - {.fatal: "Flags \"vm2_enabled\" must be defined"} when defined(evmc_enabled): {.fatal: "Flags \"evmc_enabled\" and \"vm2_enabled\" are mutually exclusive"} diff --git a/nimbus/vm2/v2memory.nim b/nimbus/vm2/v2memory.nim index cdf835e76..02ff8cf74 100644 --- a/nimbus/vm2/v2memory.nim +++ b/nimbus/vm2/v2memory.nim @@ -5,8 +5,6 @@ # * 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. -when not defined(vm2_enabled): - {.fatal: "Flags \"vm2_enabled\" must be defined"} when defined(evmc_enabled): {.fatal: "Flags \"evmc_enabled\" and \"vm2_enabled\" are mutually exclusive"} diff --git a/nimbus/vm2/v2message.nim b/nimbus/vm2/v2message.nim index 168becda5..ae6baf8fe 100644 --- a/nimbus/vm2/v2message.nim +++ b/nimbus/vm2/v2message.nim @@ -5,8 +5,6 @@ # * 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. -when not defined(vm2_enabled): - {.fatal: "Flags \"vm2_enabled\" must be defined"} when defined(evmc_enabled): {.fatal: "Flags \"evmc_enabled\" and \"vm2_enabled\" are mutually exclusive"} diff --git a/nimbus/vm2/v2precompiles.nim b/nimbus/vm2/v2precompiles.nim index f232477af..50c25a02c 100644 --- a/nimbus/vm2/v2precompiles.nim +++ b/nimbus/vm2/v2precompiles.nim @@ -8,8 +8,6 @@ # at your option. This file may not be copied, modified, or distributed except # according to those terms. -when not defined(vm2_enabled): - {.fatal: "Flags \"vm2_enabled\" must be defined"} when defined(evmc_enabled): {.fatal: "Flags \"evmc_enabled\" and \"vm2_enabled\" are mutually exclusive"} diff --git a/nimbus/vm2/v2state.nim b/nimbus/vm2/v2state.nim index ae818d26d..6367b244a 100644 --- a/nimbus/vm2/v2state.nim +++ b/nimbus/vm2/v2state.nim @@ -8,8 +8,6 @@ # at your option. This file may not be copied, modified, or distributed except # according to those terms. -when not defined(vm2_enabled): - {.fatal: "Flags \"vm2_enabled\" must be defined"} when defined(evmc_enabled): {.fatal: "Flags \"evmc_enabled\" and \"vm2_enabled\" are mutually exclusive"} diff --git a/nimbus/vm2/v2state_transactions.nim b/nimbus/vm2/v2state_transactions.nim index 2aaf4b9d6..ea893b706 100644 --- a/nimbus/vm2/v2state_transactions.nim +++ b/nimbus/vm2/v2state_transactions.nim @@ -5,8 +5,6 @@ # * 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. -when not defined(vm2_enabled): - {.fatal: "Flags \"vm2_enabled\" must be defined"} when defined(evmc_enabled): {.fatal: "Flags \"evmc_enabled\" and \"vm2_enabled\" are mutually exclusive"} diff --git a/nimbus/vm2/v2types.nim b/nimbus/vm2/v2types.nim index e030555b6..4143f9e3b 100644 --- a/nimbus/vm2/v2types.nim +++ b/nimbus/vm2/v2types.nim @@ -8,8 +8,6 @@ # at your option. This file may not be copied, modified, or distributed except # according to those terms. -when not defined(vm2_enabled): - {.fatal: "Flags \"vm2_enabled\" must be defined"} when defined(evmc_enabled): {.fatal: "Flags \"evmc_enabled\" and \"vm2_enabled\" are mutually exclusive"}