test: Move compile-time checks from vmtester to unittests

test/unittests/test_helpers.cpp

@@ -2,13 +2,34 @@
 // Copyright 2019 The EVMC Authors.
 // Licensed under the Apache License, Version 2.0.
 
+#include <evmc/helpers.h>
 #include <evmc/helpers.hpp>
 
 #include <gtest/gtest.h>
 
 #include <map>
 #include <unordered_map>
 
+
+// Compile time checks:
+
+static_assert(sizeof(evmc_bytes32) == 32, "evmc_bytes32 is too big");
+static_assert(sizeof(evmc_address) == 20, "evmc_address is too big");
+static_assert(sizeof(evmc_result) <= 64, "evmc_result does not fit cache line");
+static_assert(sizeof(evmc_instance) <= 64, "evmc_instance does not fit cache line");
+static_assert(offsetof(evmc_message, value) % 8 == 0, "evmc_message.value not aligned");
+
+// Check enums match int size.
+// On GCC/clang the underlying type should be unsigned int, on MSVC int
+static_assert(sizeof(evmc_call_kind) == sizeof(int),
+              "Enum `evmc_call_kind` is not the size of int");
+static_assert(sizeof(evmc_revision) == sizeof(int), "Enum `evmc_revision` is not the size of int");
+
+static constexpr size_t optionalDataSize =
+    sizeof(evmc_result) - offsetof(evmc_result, create_address);
+static_assert(optionalDataSize == sizeof(evmc_result_optional_storage), "");
+
+
 TEST(helpers, maps)
 {
     std::map<evmc_address, bool> addresses;

test/vmtester/tests.cpp

@@ -1,6 +1,6 @@
 // EVMC: Ethereum Client-VM Connector API
-// Copyright 2018 The EVMC Authors.
-// Licensed under the Apache License, Version 2.0. See the LICENSE file.
+// Copyright 2019 The EVMC Authors.
+// Licensed under the Apache License, Version 2.0.
 
 #include "../../examples/example_host.h"
 #include "vmtester.hpp"
@@ -10,25 +10,6 @@
 #include <array>
 #include <cstring>
 
-// Compile time checks:
-
-static_assert(sizeof(evmc_bytes32) == 32, "evmc_bytes32 is too big");
-static_assert(sizeof(evmc_address) == 20, "evmc_address is too big");
-static_assert(sizeof(evmc_result) <= 64, "evmc_result does not fit cache line");
-static_assert(sizeof(evmc_instance) <= 64, "evmc_instance does not fit cache line");
-static_assert(offsetof(evmc_message, value) % 8 == 0, "evmc_message.value not aligned");
-
-// Check enums match int size.
-// On GCC/clang the underlying type should be unsigned int, on MSVC int
-static_assert(sizeof(evmc_call_kind) == sizeof(int),
-              "Enum `evmc_call_kind` is not the size of int");
-static_assert(sizeof(evmc_revision) == sizeof(int), "Enum `evmc_revision` is not the size of int");
-
-static constexpr size_t optionalDataSize =
-    sizeof(evmc_result) - offsetof(evmc_result, create_address);
-static_assert(optionalDataSize == sizeof(evmc_result_optional_storage), "");
-
-
 TEST_F(evmc_vm_test, abi_version_match)
 {
     ASSERT_EQ(vm->abi_version, EVMC_ABI_VERSION);