Merge pull request #294 from ethereum/evmc_upgrade

Upgrade EVMC to version 7.5.0

test/unittests/utils_test.cpp

@@ -5,40 +5,6 @@
 #include <gtest/gtest.h>
 #include <test/utils/utils.hpp>
 
-TEST(utils, hex)
-{
-    auto data = bytes{0x0, 0x1, 0xa, 0xf, 0x1f, 0xa0, 0xff, 0xf0};
-    EXPECT_EQ(hex(data), "00010a0f1fa0fff0");
-}
-
-TEST(utils, from_hex_empty)
-{
-    EXPECT_TRUE(from_hex({}).empty());
-}
-
-TEST(utils, from_hex_odd_input_length)
-{
-    EXPECT_THROW(from_hex("0"), std::length_error);
-}
-
-TEST(utils, from_hex_capital_letters)
-{
-    EXPECT_EQ(from_hex("ABCDEF"), (bytes{0xab, 0xcd, 0xef}));
-}
-
-TEST(utils, from_hex_invalid_encoding)
-{
-    EXPECT_THROW(from_hex({"\0\0", 2}), std::out_of_range);
-}
-
-TEST(utils, hex_byte)
-{
-    auto b = uint8_t{};
-    EXPECT_EQ(hex(b), "00");
-    b = 0xaa;
-    EXPECT_EQ(hex(b), "aa");
-}
-
 TEST(utils, from_hexx)
 {
     EXPECT_EQ(hex(from_hexx("")), "");

test/utils/CMakeLists.txt

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

test/utils/utils.cpp

@@ -2,47 +2,8 @@
 // Copyright 2018-2019 The evmone Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-#include <test/utils/utils.hpp>
+#include "utils.hpp"
 #include <regex>
-#include <stdexcept>
-
-bytes from_hex(std::string_view hex)
-{
-    if (hex.length() % 2 == 1)
-        throw std::length_error{"the length of the input is odd"};
-
-    bytes bs;
-    bs.reserve(hex.length() / 2);
-    int b = 0;
-    for (size_t i = 0; i < hex.size(); ++i)
-    {
-        const auto h = hex[i];
-        int v;
-        if (h >= '0' && h <= '9')
-            v = h - '0';
-        else if (h >= 'a' && h <= 'f')
-            v = h - 'a' + 10;
-        else if (h >= 'A' && h <= 'F')
-            v = h - 'A' + 10;
-        else
-            throw std::out_of_range{"not a hex digit"};
-
-        if (i % 2 == 0)
-            b = v << 4;
-        else
-            bs.push_back(static_cast<uint8_t>(b | v));
-    }
-    return bs;
-}
-
-std::string hex(bytes_view bs)
-{
-    std::string str;
-    str.reserve(bs.size() * 2);
-    for (auto b : bs)
-        str += hex(b);
-    return str;
-}
 
 bytes from_hexx(const std::string& hexx)
 {

test/utils/utils.hpp

@@ -3,28 +3,23 @@
 // SPDX-License-Identifier: Apache-2.0
 #pragma once
 
-#include <cstdint>
-#include <string>
+#include <evmc/hex.hpp>
 
-using bytes = std::basic_string<uint8_t>;
+using evmc::bytes;
+using evmc::hex;
 using bytes_view = std::basic_string_view<uint8_t>;
 
-/// Encode a byte to a hex string.
-inline std::string hex(uint8_t b) noexcept
+/// Decodes hex encoded string to bytes.
+inline bytes from_hex(std::string_view hex)
 {
-    static constexpr auto hex_chars = "0123456789abcdef";
-    return {hex_chars[b >> 4], hex_chars[b & 0xf]};
+    return evmc::from_hex(std::string{hex});
 }
 
-/// Decodes hex encoded string to bytes.
-///
-/// Exceptions:
-/// - std::length_error when the input has invalid length (must be even).
-/// - std::out_of_range when invalid hex digit encountered.
-bytes from_hex(std::string_view hex);
-
 /// Encodes bytes as hex string.
-std::string hex(bytes_view bs);
+inline std::string hex(bytes_view bs)
+{
+    return evmc::hex(bs.data(), bs.size());
+}
 
 /// Decodes the hexx encoded string.
 ///