Pure c files moved to third_party dir (#2348)

* Moved keccak to third_party dir * Adding third_party dir to included in clang-tidy script --------- Co-authored-by: kamilsa <[email protected]>
qdrvm · Jan 23, 2025 · 565f2fe · 565f2fe
1 parent f004e3a
commit 565f2fe
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -203,9 +203,12 @@ include(cmake/install.cmake)
 include_directories($<INSTALL_INTERFACE:${CMAKE_INSTALL_FULL_INCLUDEDIR}/kagome>
     $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/core>
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/core> # for generated file
+    $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/third_party>
+    $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/third_party> # for generated file
 )
 
 add_subdirectory(core)
+add_subdirectory(third_party)
 
 kagome_install_setup(
     HEADER_DIRS

diff --git a/core/crypto/CMakeLists.txt b/core/crypto/CMakeLists.txt
@@ -143,6 +143,5 @@ kagome_install(elliptic_curves)
 add_subdirectory(bip39)
 add_subdirectory(blake2)
 add_subdirectory(key_store)
-add_subdirectory(keccak)
 add_subdirectory(sha)
 add_subdirectory(twox)
diff --git a/core/crypto/hasher/hasher_impl.cpp b/core/crypto/hasher/hasher_impl.cpp
@@ -10,9 +10,9 @@
 
 #include "crypto/blake2/blake2b.h"
 #include "crypto/blake2/blake2s.h"
-#include "crypto/keccak/keccak.h"
 #include "crypto/sha/sha256.hpp"
 #include "crypto/twox/twox.hpp"
+#include "keccak/keccak.h"
 
 namespace kagome::crypto {
   using common::Hash128;

diff --git a/core/crypto/keccak/keccak.hpp b/core/crypto/keccak/keccak.hpp
@@ -8,7 +8,7 @@
 
 #include "common/blob.hpp"
 #include "common/buffer.hpp"
-#include "crypto/keccak/keccak.h"
+#include "keccak/keccak.h"
 
 namespace kagome::crypto {
   inline common::Hash256 keccak(common::BufferView buf) {

diff --git a/core/primitives/strobe.hpp b/core/primitives/strobe.hpp
@@ -15,7 +15,7 @@
 #include <boost/assert.hpp>
 
 #include "common/buffer_view.hpp"
-#include "crypto/keccak/keccak.h"
+#include "keccak/keccak.h"
 #include "primitives/math.hpp"
 
 namespace kagome::primitives {

diff --git a/housekeeping/clang-tidy-diff.sh b/housekeeping/clang-tidy-diff.sh
@@ -25,6 +25,7 @@ clang-tidy-diff.py \
   -- \
     --std=c++20 \
     -I core \
+    -I third_party \
     -I $BUILD_DIR/core \
     -I $BUILD_DIR/pb/authority_discovery_proto/generated \
     -I $BUILD_DIR/pb/light_api_proto/generated \

diff --git a/test/core/crypto/keccak/keccak_test.cpp b/test/core/crypto/keccak/keccak_test.cpp
@@ -7,7 +7,7 @@
 #include <gtest/gtest.h>
 
 #include "common/blob.hpp"
-#include "crypto/keccak/keccak.h"
+#include "keccak/keccak.h"
 
 TEST(Keccak, Correctness) {
   auto keccak_res =

diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(keccak)
diff --git a/core/crypto/keccak/CMakeLists.txt → third_party/keccak/CMakeLists.txt b/core/crypto/keccak/CMakeLists.txt → third_party/keccak/CMakeLists.txt
diff --git a/core/crypto/keccak/keccak.c → third_party/keccak/keccak.c b/core/crypto/keccak/keccak.c → third_party/keccak/keccak.c
@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "crypto/keccak/keccak.h"
+#include "keccak.h"
 #include "macro/endianness_utils.hpp"
 
 #define SHA3_ASSERT(x)

diff --git a/core/crypto/keccak/keccak.h → third_party/keccak/keccak.h b/core/crypto/keccak/keccak.h → third_party/keccak/keccak.h