cpp: Move output stream operators to evmc::evmc_cpp

include/evmc/evmc.hpp

@@ -9,6 +9,7 @@
 
 #include <functional>
 #include <initializer_list>
+#include <ostream>
 #include <utility>
 
 /// EVMC C++ API - wrappers and bindings for C++
@@ -337,6 +338,28 @@ constexpr bytes32 operator""_bytes32() noexcept
 
 using namespace literals;
 
+
+inline const char* to_string(evmc_status_code status_code) noexcept
+{
+    return evmc_status_code_to_string(status_code);
+}
+
+inline std::ostream& operator<<(std::ostream& os, evmc_status_code status_code)
+{
+    return os << to_string(status_code);
+}
+
+inline const char* to_string(evmc_revision rev) noexcept
+{
+    return evmc_revision_to_string(rev);
+}
+
+inline std::ostream& operator<<(std::ostream& os, evmc_revision rev)
+{
+    return os << to_string(rev);
+}
+
+
 /// Alias for evmc_make_result().
 constexpr auto make_result = evmc_make_result;
 

test/unittests/CMakeLists.txt

@@ -36,7 +36,6 @@ target_link_libraries(
     evmc::instructions
     evmc::evmc_cpp
     evmc::tool-commands
-    evmc::tool-utils
     evmc::hex
     GTest::gtest_main
 )

tools/CMakeLists.txt

@@ -4,5 +4,4 @@
 
 add_subdirectory(commands)
 add_subdirectory(evmc)
-add_subdirectory(utils)
 add_subdirectory(vmtester)

tools/commands/CMakeLists.txt

@@ -6,4 +6,4 @@ add_library(tool-commands STATIC commands.hpp run.cpp)
 add_library(evmc::tool-commands ALIAS tool-commands)
 target_compile_features(tool-commands PUBLIC cxx_std_17)
 target_include_directories(tool-commands PUBLIC ${PROJECT_SOURCE_DIR})
-target_link_libraries(tool-commands PRIVATE evmc::tool-utils evmc::mocked_host evmc::hex)
+target_link_libraries(tool-commands PRIVATE evmc::evmc_cpp evmc::mocked_host evmc::hex)

tools/commands/run.cpp

@@ -3,8 +3,8 @@
 // Licensed under the Apache License, Version 2.0.
 
 #include "tools/commands/commands.hpp"
-#include "tools/utils/utils.hpp"
 #include <evmc/hex.hpp>
+#include <evmc/evmc.hpp>
 #include <evmc/mocked_host.hpp>
 #include <chrono>
 #include <ostream>