Upgrade EVMC hex utilities (v10.0.0-alpha.6)

Author: chfast

evmc

@@ -30,7 +30,7 @@ add_library(evmone
     vm.cpp
     vm.hpp
 )
-target_link_libraries(evmone PUBLIC evmc::evmc intx::intx PRIVATE evmc::instructions evmc::hex ethash::keccak)
+target_link_libraries(evmone PUBLIC evmc::evmc intx::intx PRIVATE evmc::instructions ethash::keccak)
 target_include_directories(evmone PUBLIC
     $<BUILD_INTERFACE:${include_dir}>$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
 )

lib/evmone/CMakeLists.txt

@@ -286,14 +286,11 @@ std::tuple<int, std::vector<BenchmarkCase>> parseargs(int argc, char** argv)
     if (!code_hex_file.empty())
     {
         std::ifstream file{code_hex_file};
-        std::string code_hex{
-            std::istreambuf_iterator<char>{file}, std::istreambuf_iterator<char>{}};
-        code_hex.erase(std::remove_if(code_hex.begin(), code_hex.end(),
-                           [](auto x) { return std::isspace(x); }),
-            code_hex.end());
-
-        BenchmarkCase b{code_hex_file, from_hex(code_hex)};
-        b.inputs.emplace_back("", from_hex(input_hex), from_hex(expected_output_hex));
+        BenchmarkCase b{code_hex_file,
+            from_spaced_hex(std::istreambuf_iterator<char>{file}, std::istreambuf_iterator<char>{})
+                .value()};
+        b.inputs.emplace_back(
+            "", from_hex(input_hex).value(), from_hex(expected_output_hex).value());
 
         return {0, {std::move(b)}};
     }

test/bench/bench.cpp

@@ -57,7 +57,7 @@ TEST(eof, read_valid_eof1_header)
 
     for (const auto& test_case : test_cases)
     {
-        const auto code = from_hex(test_case.code);
+        const auto code = from_spaced_hex(test_case.code).value();
         const auto header = read_valid_eof1_header(bytes_view(code).begin());
         EXPECT_EQ(header.code_size, test_case.code_size) << test_case.code;
         EXPECT_EQ(header.data_size, test_case.data_size) << test_case.code;

test/unittests/eof_test.cpp

@@ -67,7 +67,7 @@ class evm : public testing::TestWithParam<evmc::VM*>
     /// The `gas_used` field  will be updated accordingly.
     void execute(int64_t gas, bytes_view code, std::string_view input_hex = {}) noexcept
     {
-        const auto input = from_hex(input_hex);
+        const auto input = from_hex(input_hex).value();
         msg.input_data = input.data();
         msg.input_size = input.size();
         msg.gas = gas;

test/unittests/evm_fixture.hpp

@@ -10,7 +10,7 @@ add_library(testutils STATIC
     utils.hpp
 )
 
-target_link_libraries(testutils PRIVATE evmc::instructions evmc::hex)
+target_link_libraries(testutils PRIVATE evmc::instructions)
 target_include_directories(testutils PUBLIC ${PROJECT_SOURCE_DIR})
 
 add_library(testutils-dump STATIC dump.cpp dump.hpp)

test/utils/CMakeLists.txt

@@ -25,7 +25,7 @@ struct bytecode : bytes
 
     template <typename T,
         typename = typename std::enable_if_t<std::is_convertible_v<T, std::string_view>>>
-    bytecode(T hex) : bytes{from_hex(hex)}
+    bytecode(T hex) : bytes{from_spaced_hex(hex).value()}
     {}
 
     bytecode(uint64_t n) : bytes{push(n)} {}
@@ -111,7 +111,7 @@ inline bytecode push(bytes_view data)
 
 inline bytecode push(std::string_view hex_data)
 {
-    return push(from_hex(hex_data));
+    return push(from_spaced_hex(hex_data).value());
 }
 
 inline bytecode push(const intx::uint256& value)

test/utils/bytecode.hpp

@@ -30,5 +30,5 @@ bytes from_hexx(const std::string& hexx)
         hex.replace(pos, length, replacement);
         position_correction += replacement.length() - length;
     }
-    return from_hex(hex);
+    return from_spaced_hex(hex).value();
 }

test/utils/utils.cpp

@@ -1,5 +1,5 @@
 // evmone: Fast Ethereum Virtual Machine implementation
-// Copyright 2018-2019 The evmone Authors.
+// Copyright 2018 The evmone Authors.
 // SPDX-License-Identifier: Apache-2.0
 #pragma once
 
@@ -8,11 +8,13 @@
 using evmc::bytes;
 using evmc::bytes_view;
 using evmc::from_hex;
+using evmc::from_spaced_hex;
 using evmc::hex;
 
+
 inline bytes operator""_hex(const char* s, size_t size)
 {
-    return from_hex({s, size});
+    return from_spaced_hex({s, size}).value();
 }
 
 /// Decodes the hexx encoded string.