Undo adding of crypto lib

ethereum · Nov 4, 2024 · eb1db85 · eb1db85
1 parent f4c4529
commit eb1db85
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 21 deletions.
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -8,4 +8,3 @@ find_package(intx CONFIG REQUIRED)
 add_subdirectory(evmmax)
 add_subdirectory(evmone)
 add_subdirectory(evmone_precompiles)
-add_subdirectory(crypto)
diff --git a/lib/crypto/CMakeLists.txt b/lib/crypto/CMakeLists.txt
diff --git a/lib/evmone_precompiles/CMakeLists.txt b/lib/evmone_precompiles/CMakeLists.txt
@@ -20,6 +20,8 @@ target_sources(
     ripemd160.cpp
     secp256k1.hpp
     secp256k1.cpp
+    sha256.hpp
+    sha256.cpp
     kzg.hpp
     kzg.cpp
 )
diff --git a/lib/evmone_precompiles/kzg.hpp b/lib/evmone_precompiles/kzg.hpp
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #pragma once
-#include "../crypto/sha256.hpp"
+#include "sha256.hpp"
 #include <intx/intx.hpp>
 
 namespace evmone::crypto

diff --git a/lib/crypto/sha256.cpp → lib/evmone_precompiles/sha256.cpp b/lib/crypto/sha256.cpp → lib/evmone_precompiles/sha256.cpp
diff --git a/lib/crypto/sha256.hpp → lib/evmone_precompiles/sha256.hpp b/lib/crypto/sha256.hpp → lib/evmone_precompiles/sha256.hpp
diff --git a/test/state/CMakeLists.txt b/test/state/CMakeLists.txt
@@ -4,7 +4,7 @@
 
 add_library(evmone-state STATIC)
 add_library(evmone::state ALIAS evmone-state)
-target_link_libraries(evmone-state PUBLIC evmc::evmc_cpp PRIVATE evmone evmone::precompiles ethash::keccak evmone::crypto)
+target_link_libraries(evmone-state PUBLIC evmc::evmc_cpp PRIVATE evmone evmone::precompiles ethash::keccak)
 target_include_directories(evmone-state PRIVATE ${evmone_private_include_dir})
 target_sources(
     evmone-state PRIVATE

diff --git a/test/state/precompiles.cpp b/test/state/precompiles.cpp
@@ -5,13 +5,13 @@
 #include "precompiles.hpp"
 #include "precompiles_internal.hpp"
 #include "precompiles_stubs.hpp"
-#include <crypto/sha256.hpp>
 #include <evmone_precompiles/blake2b.hpp>
 #include <evmone_precompiles/bls.hpp>
 #include <evmone_precompiles/bn254.hpp>
 #include <evmone_precompiles/kzg.hpp>
 #include <evmone_precompiles/ripemd160.hpp>
 #include <evmone_precompiles/secp256k1.hpp>
+#include <evmone_precompiles/sha256.hpp>
 #include <intx/intx.hpp>
 #include <array>
 #include <bit>

diff --git a/test/t8n/CMakeLists.txt b/test/t8n/CMakeLists.txt
@@ -7,5 +7,6 @@ cable_add_buildinfo_library(PROJECT_NAME evmone)
 
 add_executable(evmone-t8n)
 target_link_libraries(evmone-t8n PRIVATE evmone::statetestutils nlohmann_json::nlohmann_json)
-target_link_libraries(evmone-t8n PRIVATE evmc::evmc evmone evmone-buildinfo)
+target_link_libraries(evmone-t8n PRIVATE evmc::evmc evmone evmone-buildinfo evmone::precompiles)
+target_include_directories(evmone-t8n PRIVATE ${evmone_private_include_dir})
 target_sources(evmone-t8n PRIVATE t8n.cpp)
diff --git a/test/t8n/t8n.cpp b/test/t8n/t8n.cpp
@@ -2,7 +2,6 @@
 // Copyright 2023 The evmone Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-#include "../lib/crypto/sha256.hpp"
 #include "../state/errors.hpp"
 #include "../state/ethash_difficulty.hpp"
 #include "../state/mpt_hash.hpp"
@@ -11,6 +10,7 @@
 #include "../utils/utils.hpp"
 #include <evmone/evmone.h>
 #include <evmone/version.h>
+#include <evmone_precompiles/sha256.hpp>
 #include <nlohmann/json.hpp>
 #include <filesystem>
 #include <fstream>

diff --git a/test/unittests/precompiles_kzg_test.cpp b/test/unittests/precompiles_kzg_test.cpp
@@ -2,9 +2,9 @@
 // Copyright 2024 The evmone Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-#include <crypto/sha256.hpp>
 #include <evmc/evmc.hpp>
 #include <evmone_precompiles/kzg.hpp>
+#include <evmone_precompiles/sha256.hpp>
 #include <gtest/gtest.h>
 #include <intx/intx.hpp>
 #include <span>

diff --git a/test/unittests/precompiles_sha256_test.cpp b/test/unittests/precompiles_sha256_test.cpp
@@ -2,8 +2,8 @@
 // Copyright 2024 The evmone Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-#include <crypto/sha256.hpp>
 #include <evmc/hex.hpp>
+#include <evmone_precompiles/sha256.hpp>
 #include <gtest/gtest.h>
 
 using evmone::crypto::sha256;