Merge pull request #297 from ethereum/evmc

Upgrade EVMC to 8.0.0-alpha.1
ethereum · Apr 13, 2021 · 7eeb4fe · 7eeb4fe
2 parents 57093be + b7cd0c8
commit 7eeb4fe
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 41 deletions.
diff --git a/circle.yml b/circle.yml
@@ -256,30 +256,6 @@ jobs:
       - upload_coverage:
           flags: consensus
 
-  state-tests:
-    environment:
-      TESTS_REV: ac8cf2cd8ba326d67101183060272e7f7b1eaa92
-      ALETH_REV: 1.8.0
-    docker:
-      - image: cimg/base:stable
-    steps:
-      - unpack_package
-      - run:
-          name: "Download Aleth"
-          background: true
-          command: curl -L https://github.com/ethereum/aleth/releases/download/v$ALETH_REV/aleth-$ALETH_REV-linux-x86_64.tar.gz | tar xz
-      - download_consensus_tests:
-          rev: ac8cf2cd8ba326d67101183060272e7f7b1eaa92
-      - run:
-          name: "Fixup consensus tests"
-          command: |
-            mkdir -p ~/tests/GeneralStateTests/stEWASMTests
-            mkdir -p ~/tests/src/GeneralStateTestsFiller/stEWASMTests
-      - run:
-          name: "Run State Tests"
-          command: bin/testeth -t GeneralStateTests -- --testpath ~/tests --vm ~/package/lib/libevmone.so
-
-
   gcc-min:
     executor: linux-gcc-7
     steps:
@@ -385,9 +361,6 @@ workflows:
             tags:
               only: /^v[0-9].*/
       - consensus-tests
-      - state-tests:
-          requires:
-            - release-linux
       - gcc-min
       - gcc-latest-coverage
       - clang-latest-ubsan

diff --git a/evmc b/evmc
diff --git a/test/utils/utils.hpp b/test/utils/utils.hpp
@@ -6,20 +6,9 @@
 #include <evmc/hex.hpp>
 
 using evmc::bytes;
+using evmc::bytes_view;
+using evmc::from_hex;
 using evmc::hex;
-using bytes_view = std::basic_string_view<uint8_t>;
-
-/// Decodes hex encoded string to bytes.
-inline bytes from_hex(std::string_view hex)
-{
-    return evmc::from_hex(std::string{hex});
-}
-
-/// Encodes bytes as hex string.
-inline std::string hex(bytes_view bs)
-{
-    return evmc::hex(bs.data(), bs.size());
-}
 
 /// Decodes the hexx encoded string.
 ///
+6 −1		.bumpversion.cfg
+3 −0		CHANGELOG.md
+1 −1		CMakeLists.txt
+2 −2		README.md
+1 −1		bindings/rust/evmc-declare-tests/Cargo.toml
+2 −2		bindings/rust/evmc-declare/Cargo.toml
+1 −1		bindings/rust/evmc-sys/Cargo.toml
+2 −2		bindings/rust/evmc-vm/Cargo.toml
+10 −19		circle.yml
+1 −1		docs/EVMC.md
+1 −1		examples/example-rust-vm/Cargo.toml
+1 −1		examples/example-rust-vm/src/lib.rs
+1 −1		go.mod
+1 −1		include/evmc/evmc.h
+7 −3		include/evmc/hex.hpp
+1 −1		lib/CMakeLists.txt
+1 −1		lib/hex/CMakeLists.txt
+7 −7		lib/hex/hex.cpp
+1 −1		test/gomod/README
+1 −1		test/gomod/use_evmc_test.go
+3 −3		test/unittests/hex_test.cpp
+1 −1		tools/commands/CMakeLists.txt
+1 −1		tools/commands/run.cpp
+1 −1		tools/utils/CMakeLists.txt