dn724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Move all submodules into one directory

Browse source
This commit is contained in:
clemahieu 2023-01-23 13:43:40 +00:00
commit ae4d91d41f
32 changed files with 142 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

38
.gitmodules vendored
View file

@ -1,31 +1,31 @@
[submodule "miniupnp"] [submodule "submodules/miniupnp"]
path = miniupnp path = submodules/miniupnp
url = https://github.com/miniupnp/miniupnp.git url = https://github.com/miniupnp/miniupnp.git
[submodule "lmdb"] [submodule "submodules/lmdb"]
path = lmdb path = submodules/lmdb
url = https://github.com/nanocurrency/lmdb.git url = https://github.com/nanocurrency/lmdb.git
branch = lmdb_0_9_23 branch = lmdb_0_9_23
[submodule "crypto/cryptopp"] [submodule "submodules/cryptopp"]
path = crypto/cryptopp path = submodules/cryptopp
url = https://github.com/weidai11/cryptopp.git url = https://github.com/weidai11/cryptopp.git
[submodule "crypto/phc-winner-argon2"] [submodule "submodules/phc-winner-argon2"]
path = crypto/phc-winner-argon2 path = submodules/phc-winner-argon2
url = https://github.com/nanocurrency/phc-winner-argon2.git url = https://github.com/nanocurrency/phc-winner-argon2.git
[submodule "gtest"] [submodule "submodules/gtest"]
path = gtest path = submodules/gtest
url = https://github.com/google/googletest.git url = https://github.com/google/googletest.git
[submodule "cpptoml"] [submodule "submodules/cpptoml"]
path = cpptoml path = submodules/cpptoml
url = https://github.com/cryptocode/cpptoml.git url = https://github.com/cryptocode/cpptoml.git
[submodule "flatbuffers"] [submodule "submodules/flatbuffers"]
path = flatbuffers path = submodules/flatbuffers
url = https://github.com/google/flatbuffers.git url = https://github.com/google/flatbuffers.git
[submodule "rocksdb"] [submodule "submodules/rocksdb"]
path = rocksdb path = submodules/rocksdb
url = https://github.com/facebook/rocksdb.git url = https://github.com/facebook/rocksdb.git
[submodule "diskhash"] [submodule "submodules/diskhash"]
path = diskhash path = submodules/diskhash
url = https://github.com/nanocurrency/diskhash.git url = https://github.com/nanocurrency/diskhash.git
[submodule "boost"] [submodule "boost"]
path = boost path = submodules/boost
url = https://github.com/boostorg/boost.git url = https://github.com/boostorg/boost.git

131
CMakeLists.txt
View file

@ -346,7 +346,7 @@ endif()
include_directories(${CMAKE_SOURCE_DIR}) include_directories(${CMAKE_SOURCE_DIR})
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules") list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules")
set(Boost_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/boost/libs/config/include) set(Boost_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/submodules/boost/libs/config/include)
set(BOOST_MODULE_LIBS set(BOOST_MODULE_LIBS
algorithm algorithm
align align
@ -434,7 +434,7 @@ set(BOOST_MODULE_LIBS
add_definitions(-DBOOST_ALL_NO_LIB) # Disable automatic boost linking add_definitions(-DBOOST_ALL_NO_LIB) # Disable automatic boost linking
foreach(lib IN LISTS BOOST_MODULE_LIBS) foreach(lib IN LISTS BOOST_MODULE_LIBS)
add_subdirectory(boost/libs/${lib} EXCLUDE_FROM_ALL) add_subdirectory(submodules/boost/libs/${lib} EXCLUDE_FROM_ALL)
endforeach() endforeach()
include_directories(${BOOST_LIBRARY_INCLUDES}) include_directories(${BOOST_LIBRARY_INCLUDES})
add_library(Boost::stacktrace ALIAS boost_stacktrace_basic) add_library(Boost::stacktrace ALIAS boost_stacktrace_basic)
@ -451,12 +451,13 @@ target_link_libraries(boost_property_tree INTERFACE Boost::multi_index)
# diskhash # diskhash
if(NOT CMAKE_SYSTEM_NAME STREQUAL "Windows") if(NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
add_library(diskhash STATIC ${CMAKE_SOURCE_DIR}/diskhash/src/diskhash.c) add_library(diskhash STATIC
include_directories(diskhash/src) ${CMAKE_SOURCE_DIR}/submodules/diskhash/src/diskhash.c)
include_directories(submodules/diskhash/src)
endif() endif()
# RocksDB # RocksDB
include_directories(rocksdb/include) include_directories(submodules/rocksdb/include)
set(USE_RTTI set(USE_RTTI
ON ON
CACHE BOOL "") CACHE BOOL "")
@ -492,7 +493,7 @@ set(FAIL_ON_WARNINGS
CACHE BOOL "") # Ignore unreachable code warning in merging_iterator.cc CACHE BOOL "") # Ignore unreachable code warning in merging_iterator.cc
# RocksDB v7.8.3 on Windows # RocksDB v7.8.3 on Windows
# https://github.com/facebook/rocksdb/issues/11072 # https://github.com/facebook/rocksdb/issues/11072
add_subdirectory(rocksdb EXCLUDE_FROM_ALL) add_subdirectory(submodules/rocksdb EXCLUDE_FROM_ALL)
include_directories(cpptoml/include) include_directories(cpptoml/include)
add_subdirectory(crypto/ed25519-donna) add_subdirectory(crypto/ed25519-donna)
@ -503,7 +504,7 @@ add_subdirectory(nano/ipc_flatbuffers_test)
set(UPNPC_BUILD_SHARED set(UPNPC_BUILD_SHARED
OFF OFF
CACHE BOOL "") CACHE BOOL "")
add_subdirectory(miniupnp/miniupnpc EXCLUDE_FROM_ALL) add_subdirectory(submodules/miniupnp/miniupnpc EXCLUDE_FROM_ALL)
set(BUILD_SHARED set(BUILD_SHARED
OFF OFF
@ -521,13 +522,14 @@ if(WIN32)
elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64"
AND (NANO_SIMD_OPTIMIZATIONS OR RAIBLOCKS_SIMD_OPTIMIZATIONS)) AND (NANO_SIMD_OPTIMIZATIONS OR RAIBLOCKS_SIMD_OPTIMIZATIONS))
set(CRYPTOPP_EXTRA set(CRYPTOPP_EXTRA
crypto/cryptopp/crc_simd.cpp crypto/cryptopp/gcm_simd.cpp submodules/cryptopp/crc_simd.cpp submodules/cryptopp/gcm_simd.cpp
crypto/cryptopp/gf2n_simd.cpp crypto/cryptopp/neon_simd.cpp) submodules/cryptopp/gf2n_simd.cpp submodules/cryptopp/neon_simd.cpp)
add_definitions(-DCRYPTOPP_NO_CPU_FEATURE_PROBES) add_definitions(-DCRYPTOPP_NO_CPU_FEATURE_PROBES)
endif() endif()
# Some Clang cannot handle mixed asm with positional arguments, where the body # Some Clang cannot handle mixed asm with positional arguments, where the body
# is Intel style with no prefix and the templates are AT&T style. See: # is Intel style with no prefix and the templates are AT&T style. See:
# crypto/cryptopp/config.h Also see https://bugs.llvm.org/show_bug.cgi?id=39895 # submodules/cryptopp/config.h Also see
# https://bugs.llvm.org/show_bug.cgi?id=39895
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
add_definitions(-DCRYPTOPP_DISABLE_MIXED_ASM -DCRYPTOPP_DISABLE_ASM) add_definitions(-DCRYPTOPP_DISABLE_MIXED_ASM -DCRYPTOPP_DISABLE_ASM)
message( message(
@ -542,68 +544,71 @@ add_definitions(-DCRYPTOPP_DISABLE_CLMUL)
set(CRYPTOPP_LIBRARY cryptopp) set(CRYPTOPP_LIBRARY cryptopp)
add_library( add_library(
cryptopp cryptopp
crypto/cryptopp/algparam.cpp submodules/cryptopp/algparam.cpp
crypto/cryptopp/allocate.cpp submodules/cryptopp/allocate.cpp
crypto/cryptopp/asn.cpp submodules/cryptopp/asn.cpp
crypto/cryptopp/basecode.cpp submodules/cryptopp/basecode.cpp
crypto/cryptopp/cpu.cpp submodules/cryptopp/cpu.cpp
crypto/cryptopp/cryptlib.cpp submodules/cryptopp/cryptlib.cpp
crypto/cryptopp/default.cpp submodules/cryptopp/default.cpp
crypto/cryptopp/des.cpp submodules/cryptopp/des.cpp
crypto/cryptopp/dessp.cpp submodules/cryptopp/dessp.cpp
crypto/cryptopp/dll.cpp submodules/cryptopp/dll.cpp
crypto/cryptopp/ec2n.cpp submodules/cryptopp/ec2n.cpp
crypto/cryptopp/ecp.cpp submodules/cryptopp/ecp.cpp
crypto/cryptopp/filters.cpp submodules/cryptopp/filters.cpp
crypto/cryptopp/fips140.cpp submodules/cryptopp/fips140.cpp
crypto/cryptopp/gcm.cpp submodules/cryptopp/gcm.cpp
crypto/cryptopp/gf2n.cpp submodules/cryptopp/gf2n.cpp
crypto/cryptopp/gfpcrypt.cpp submodules/cryptopp/gfpcrypt.cpp
crypto/cryptopp/hex.cpp submodules/cryptopp/hex.cpp
crypto/cryptopp/hmac.cpp submodules/cryptopp/hmac.cpp
crypto/cryptopp/hrtimer.cpp submodules/cryptopp/hrtimer.cpp
crypto/cryptopp/integer.cpp submodules/cryptopp/integer.cpp
crypto/cryptopp/iterhash.cpp submodules/cryptopp/iterhash.cpp
crypto/cryptopp/misc.cpp submodules/cryptopp/misc.cpp
crypto/cryptopp/modes.cpp submodules/cryptopp/modes.cpp
crypto/cryptopp/mqueue.cpp submodules/cryptopp/mqueue.cpp
crypto/cryptopp/nbtheory.cpp submodules/cryptopp/nbtheory.cpp
crypto/cryptopp/oaep.cpp submodules/cryptopp/oaep.cpp
crypto/cryptopp/osrng.cpp submodules/cryptopp/osrng.cpp
crypto/cryptopp/pubkey.cpp submodules/cryptopp/pubkey.cpp
crypto/cryptopp/queue.cpp submodules/cryptopp/queue.cpp
crypto/cryptopp/randpool.cpp submodules/cryptopp/randpool.cpp
crypto/cryptopp/rdtables.cpp submodules/cryptopp/rdtables.cpp
crypto/cryptopp/rijndael.cpp submodules/cryptopp/rijndael.cpp
crypto/cryptopp/rijndael_simd.cpp submodules/cryptopp/rijndael_simd.cpp
crypto/cryptopp/rng.cpp submodules/cryptopp/rng.cpp
crypto/cryptopp/sha.cpp submodules/cryptopp/sha.cpp
crypto/cryptopp/sha_simd.cpp submodules/cryptopp/sha_simd.cpp
crypto/cryptopp/simple.cpp submodules/cryptopp/simple.cpp
crypto/cryptopp/sse_simd.cpp submodules/cryptopp/sse_simd.cpp
${CRYPTOPP_EXTRA}) ${CRYPTOPP_EXTRA})
if(WIN32 OR CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86|x86(_64)?)$") if(WIN32 OR CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86|x86(_64)?)$")
set(ARGON_CORE crypto/phc-winner-argon2/src/opt.c) set(ARGON_CORE submodules/phc-winner-argon2/src/opt.c)
else() else()
set(ARGON_CORE crypto/phc-winner-argon2/src/ref.c) set(ARGON_CORE submodules/phc-winner-argon2/src/ref.c)
endif() endif()
add_library( add_library(
argon2 argon2
crypto/phc-winner-argon2/src/argon2.c submodules/phc-winner-argon2/src/argon2.c
crypto/phc-winner-argon2/include/argon2.h submodules/phc-winner-argon2/include/argon2.h
crypto/phc-winner-argon2/src/core.c submodules/phc-winner-argon2/src/core.c
crypto/phc-winner-argon2/src/thread.c submodules/phc-winner-argon2/src/thread.c
crypto/phc-winner-argon2/src/encoding.c submodules/phc-winner-argon2/src/encoding.c
${ARGON_CORE}) ${ARGON_CORE})
target_include_directories(argon2 PUBLIC crypto/phc-winner-argon2/include) target_include_directories(argon2 PUBLIC submodules/phc-winner-argon2/include)
target_include_directories(argon2 PUBLIC crypto/phc-winner-argon2/src) target_include_directories(argon2 PUBLIC submodules/phc-winner-argon2/src)
target_include_directories(argon2 PUBLIC crypto/blake2) target_include_directories(argon2 PUBLIC crypto/blake2)
add_library(lmdb lmdb/libraries/liblmdb/lmdb.h lmdb/libraries/liblmdb/mdb.c add_library(
lmdb/libraries/liblmdb/midl.c) lmdb
submodules/lmdb/libraries/liblmdb/lmdb.h
submodules/lmdb/libraries/liblmdb/mdb.c
submodules/lmdb/libraries/liblmdb/midl.c)
if(WIN32) if(WIN32)
target_link_libraries(lmdb ntdll) target_link_libraries(lmdb ntdll)
@ -657,13 +662,13 @@ if(NANO_TEST OR RAIBLOCKS_TEST)
# FIXME: This fixes googletest GOOGLETEST_VERSION requirement # FIXME: This fixes googletest GOOGLETEST_VERSION requirement
set(GOOGLETEST_VERSION 1.11.0) set(GOOGLETEST_VERSION 1.11.0)
add_subdirectory(gtest/googletest) add_subdirectory(submodules/gtest/googletest)
# FIXME: This fixes gtest include directories without modifying gtest's # FIXME: This fixes gtest include directories without modifying gtest's
# CMakeLists.txt. Ideally we should use GTest::GTest and GTest::Main as # CMakeLists.txt. Ideally we should use GTest::GTest and GTest::Main as
# dependencies but it requires building gtest differently # dependencies but it requires building gtest differently
set_target_properties( set_target_properties(
gtest PROPERTIES INTERFACE_INCLUDE_DIRECTORIES gtest PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
"${CMAKE_SOURCE_DIR}/gtest/googletest/include") "${CMAKE_SOURCE_DIR}/submodules/gtest/googletest/include")
add_subdirectory(nano/test_common) add_subdirectory(nano/test_common)
add_subdirectory(nano/core_test) add_subdirectory(nano/core_test)
@ -709,6 +714,8 @@ if(NANO_GUI OR RAIBLOCKS_GUI)
find_package(Qt5 COMPONENTS Core Gui Widgets Test ${PLATFORM_QT_PACKAGES}) find_package(Qt5 COMPONENTS Core Gui Widgets Test ${PLATFORM_QT_PACKAGES})
add_library(qt nano/qt/qt.cpp nano/qt/qt.hpp) add_library(qt nano/qt/qt.cpp nano/qt/qt.hpp)
include_directories(${CMAKE_SOURCE_DIR}/submodules)
include_directories(${CMAKE_SOURCE_DIR}/submodules/cpptoml/include)
target_link_libraries( target_link_libraries(
qt qt

11
coverage/CMakeLists.txt
View file

@ -26,11 +26,12 @@ add_custom_target(
COMMAND echo "REMOVING FLUFF FROM REPORT" COMMAND echo "REMOVING FLUFF FROM REPORT"
COMMAND COMMAND
${LCOV_PATH} --remove lcov.info.raw '/usr/*' '/tmp/*' ${LCOV_PATH} --remove lcov.info.raw '/usr/*' '/tmp/*'
'${PROJECT_SOURCE_DIR}/cpptoml/*' '${PROJECT_SOURCE_DIR}/crypto/*' '${PROJECT_SOURCE_DIR}/submodules/cpptoml/*'
'${PROJECT_SOURCE_DIR}/flatbuffers/*' '${PROJECT_SOURCE_DIR}/gtest/*' '${PROJECT_SOURCE_DIR}/crypto/*'
'${PROJECT_SOURCE_DIR}/rocksdb/*' '${PROJECT_SOURCE_DIR}/valgrind/*' '${PROJECT_SOURCE_DIR}/submodules/flatbuffers/*'
'${PROJECT_SOURCE_DIR}/nano/core_test/*' '${PROJECT_SOURCE_DIR}/diskhash/*' '${PROJECT_SOURCE_DIR}/gtest/*' '${PROJECT_SOURCE_DIR}/submodules/rocksdb/*'
'${PROJECT_SOURCE_DIR}/nano/load_test/*' '${PROJECT_SOURCE_DIR}/valgrind/*' '${PROJECT_SOURCE_DIR}/nano/core_test/*'
'${PROJECT_SOURCE_DIR}/diskhash/*' '${PROJECT_SOURCE_DIR}/nano/load_test/*'
'${PROJECT_SOURCE_DIR}/nano/ipc_flatbuffers_test/*' '${PROJECT_SOURCE_DIR}/nano/ipc_flatbuffers_test/*'
'${PROJECT_SOURCE_DIR}/nano/ipc_flatbuffers_lib/*' '${PROJECT_SOURCE_DIR}/nano/ipc_flatbuffers_lib/*'
'${PROJECT_SOURCE_DIR}/nano/nano_node/*' '${PROJECT_SOURCE_DIR}/nano/nano_node/*'

4
nano/core_test/CMakeLists.txt
View file

@ -68,3 +68,7 @@ target_link_libraries(
libminiupnpc-static libminiupnpc-static
Boost::log_setup Boost::log_setup
Boost::log) Boost::log)
include_directories(${CMAKE_SOURCE_DIR}/submodules)
include_directories(${CMAKE_SOURCE_DIR}/submodules/cpptoml/include)
include_directories(${CMAKE_SOURCE_DIR}/submodules/gtest/googletest/include)

4
nano/crypto_lib/random_pool.cpp
View file

@ -1,7 +1,7 @@
#include <nano/crypto_lib/random_pool.hpp> #include <nano/crypto_lib/random_pool.hpp>
#include <crypto/cryptopp/misc.h> #include <submodules/cryptopp/misc.h>
#include <crypto/cryptopp/osrng.h> #include <submodules/cryptopp/osrng.h>
void nano::random_pool::generate_block (unsigned char * output, size_t size) void nano::random_pool::generate_block (unsigned char * output, size_t size)
{ {

2
nano/crypto_lib/random_pool_shuffle.hpp
View file

@ -2,7 +2,7 @@
#include <nano/crypto_lib/random_pool.hpp> #include <nano/crypto_lib/random_pool.hpp>
#include <crypto/cryptopp/osrng.h> #include <cryptopp/osrng.h>
namespace nano namespace nano
{ {

2
nano/ipc_flatbuffers_lib/CMakeLists.txt
View file

@ -21,7 +21,7 @@ mark_as_advanced(
FLATBUFFERS_PACKAGE_DEBIAN FLATBUFFERS_PACKAGE_DEBIAN
FLATBUFFERS_PACKAGE_REDHAT FLATBUFFERS_PACKAGE_REDHAT
FLATBUFFERS_STATIC_FLATC) FLATBUFFERS_STATIC_FLATC)
add_subdirectory(../../flatbuffers add_subdirectory(../../submodules/flatbuffers
${CMAKE_CURRENT_BINARY_DIR}/flatbuffers-build EXCLUDE_FROM_ALL) ${CMAKE_CURRENT_BINARY_DIR}/flatbuffers-build EXCLUDE_FROM_ALL)
# Generate Flatbuffers files into the ipc_flatbuffers_lib library, which will be # Generate Flatbuffers files into the ipc_flatbuffers_lib library, which will be

5
nano/lib/CMakeLists.txt
View file

@ -84,6 +84,11 @@ add_library(
work.hpp work.hpp
work.cpp) work.cpp)
include_directories(${CMAKE_SOURCE_DIR}/submodules)
include_directories(${CMAKE_SOURCE_DIR}/submodules/cpptoml/include)
include_directories(
${CMAKE_SOURCE_DIR}/submodules/nano-pow-server/deps/cpptoml/include)
target_link_libraries( target_link_libraries(
nano_lib nano_lib
ed25519 ed25519

4
nano/lib/blockbuilders.cpp
View file

@ -1,9 +1,9 @@
#include <nano/lib/blockbuilders.hpp> #include <nano/lib/blockbuilders.hpp>
#include <crypto/cryptopp/osrng.h>
#include <unordered_map> #include <unordered_map>
#include <cryptopp/osrng.h>
namespace namespace
{ {
template <typename BLOCKTYPE> template <typename BLOCKTYPE>

4
nano/lib/blocks.cpp
View file

@ -5,13 +5,13 @@
#include <nano/lib/threading.hpp> #include <nano/lib/threading.hpp>
#include <nano/secure/common.hpp> #include <nano/secure/common.hpp>
#include <crypto/cryptopp/words.h>
#include <boost/endian/conversion.hpp> #include <boost/endian/conversion.hpp>
#include <boost/property_tree/json_parser.hpp> #include <boost/property_tree/json_parser.hpp>
#include <bitset> #include <bitset>
#include <cryptopp/words.h>
/** Compare blocks, first by type, then content. This is an optimization over dynamic_cast, which is very slow on some platforms. */ /** Compare blocks, first by type, then content. This is an optimization over dynamic_cast, which is very slow on some platforms. */
namespace namespace
{ {

5
nano/lib/numbers.cpp
View file

@ -5,10 +5,9 @@
#include <nano/lib/utility.hpp> #include <nano/lib/utility.hpp>
#include <nano/secure/common.hpp> #include <nano/secure/common.hpp>
#include <crypto/cryptopp/aes.h>
#include <crypto/cryptopp/modes.h>
#include <crypto/ed25519-donna/ed25519.h> #include <crypto/ed25519-donna/ed25519.h>
#include <cryptopp/aes.h>
#include <cryptopp/modes.h>
namespace namespace
{ {

4
nano/load_test/CMakeLists.txt
View file

@ -1,3 +1,7 @@
add_executable(load_test entry.cpp) add_executable(load_test entry.cpp)
target_link_libraries(load_test boost_process node secure test_common gtest) target_link_libraries(load_test boost_process node secure test_common gtest)
include_directories(${CMAKE_SOURCE_DIR}/submodules)
include_directories(${CMAKE_SOURCE_DIR}/submodules/cpptoml/include)
include_directories(${CMAKE_SOURCE_DIR}/submodules/gtest/googletest/include)

1
nano/nano_node/CMakeLists.txt
View file

@ -8,6 +8,7 @@ target_link_libraries(
secure secure
argon2 argon2
${PLATFORM_LIBS}) ${PLATFORM_LIBS})
include_directories(${CMAKE_SOURCE_DIR}/submodules)
target_compile_definitions( target_compile_definitions(
nano_node PRIVATE -DTAG_VERSION_STRING=${TAG_VERSION_STRING} nano_node PRIVATE -DTAG_VERSION_STRING=${TAG_VERSION_STRING}

6
nano/node/CMakeLists.txt
View file

@ -254,3 +254,9 @@ target_compile_definitions(
# This ensures that any changes to Flatbuffers source files will cause a # This ensures that any changes to Flatbuffers source files will cause a
# regeneration of any C++ header files. # regeneration of any C++ header files.
add_dependencies(node ipc_flatbuffers_lib) add_dependencies(node ipc_flatbuffers_lib)
include_directories(${CMAKE_SOURCE_DIR}/submodules)
include_directories(${CMAKE_SOURCE_DIR}/submodules/cpptoml/include)
include_directories(${CMAKE_SOURCE_DIR}/submodules/lmdb)
include_directories(
${CMAKE_SOURCE_DIR}/submodules/nano-pow-server/deps/cpptoml/include)

4
nano/node/nodeconfig.cpp
View file

@ -6,10 +6,10 @@
#include <nano/node/nodeconfig.hpp> #include <nano/node/nodeconfig.hpp>
#include <nano/node/transport/transport.hpp> #include <nano/node/transport/transport.hpp>
#include <crypto/cryptopp/words.h>
#include <boost/format.hpp> #include <boost/format.hpp>
#include <cryptopp/words.h>
namespace namespace
{ {
char const * preconfigured_peers_key = "preconfigured_peers"; char const * preconfigured_peers_key = "preconfigured_peers";

3
nano/rpc_test/CMakeLists.txt
View file

@ -7,3 +7,6 @@ target_compile_definitions(
PUBLIC -DACTIVE_NETWORK=${ACTIVE_NETWORK} PUBLIC -DACTIVE_NETWORK=${ACTIVE_NETWORK}
PRIVATE -DTAG_VERSION_STRING=${TAG_VERSION_STRING} PRIVATE -DTAG_VERSION_STRING=${TAG_VERSION_STRING}
-DGIT_COMMIT_HASH=${GIT_COMMIT_HASH}) -DGIT_COMMIT_HASH=${GIT_COMMIT_HASH})
include_directories(${CMAKE_SOURCE_DIR}/submodules)
include_directories(${CMAKE_SOURCE_DIR}/submodules/gtest/googletest/include)

2
nano/secure/CMakeLists.txt
View file

@ -66,3 +66,5 @@ target_link_libraries(
target_compile_definitions(secure PUBLIC -DQT_NO_KEYWORDS target_compile_definitions(secure PUBLIC -DQT_NO_KEYWORDS
-DBOOST_ASIO_HAS_STD_ARRAY=1) -DBOOST_ASIO_HAS_STD_ARRAY=1)
include_directories(${CMAKE_SOURCE_DIR}/submodules)

3
nano/secure/common.cpp
View file

@ -5,8 +5,6 @@
#include <nano/secure/common.hpp> #include <nano/secure/common.hpp>
#include <nano/secure/store.hpp> #include <nano/secure/store.hpp>
#include <crypto/cryptopp/words.h>
#include <boost/endian/conversion.hpp> #include <boost/endian/conversion.hpp>
#include <boost/property_tree/json_parser.hpp> #include <boost/property_tree/json_parser.hpp>
#include <boost/variant/get.hpp> #include <boost/variant/get.hpp>
@ -15,6 +13,7 @@
#include <queue> #include <queue>
#include <crypto/ed25519-donna/ed25519.h> #include <crypto/ed25519-donna/ed25519.h>
#include <cryptopp/words.h>
size_t constexpr nano::send_block::size; size_t constexpr nano::send_block::size;
size_t constexpr nano::receive_block::size; size_t constexpr nano::receive_block::size;

2
nano/secure/ledger.cpp
View file

@ -6,7 +6,7 @@
#include <nano/secure/ledger.hpp> #include <nano/secure/ledger.hpp>
#include <nano/secure/store.hpp> #include <nano/secure/store.hpp>
#include <crypto/cryptopp/words.h> #include <cryptopp/words.h>
namespace namespace
{ {

6
nano/secure/network_filter.hpp
View file

@ -3,11 +3,11 @@
#include <nano/lib/numbers.hpp> #include <nano/lib/numbers.hpp>
#include <crypto/cryptopp/seckey.h>
#include <crypto/cryptopp/siphash.h>
#include <mutex> #include <mutex>
#include <cryptopp/seckey.h>
#include <cryptopp/siphash.h>
namespace nano namespace nano
{ {
/** /**

2
nano/slow_test/CMakeLists.txt
View file

@ -2,3 +2,5 @@ add_executable(slow_test entry.cpp node.cpp vote_cache.cpp vote_processor.cpp)
target_link_libraries(slow_test secure node test_common gtest target_link_libraries(slow_test secure node test_common gtest
libminiupnpc-static) libminiupnpc-static)
include_directories(${CMAKE_SOURCE_DIR}/submodules)

4
nano/test_common/CMakeLists.txt
View file

@ -14,3 +14,7 @@ add_library(
testutil.cpp) testutil.cpp)
target_link_libraries(test_common node gtest Boost::log_setup Boost::log) target_link_libraries(test_common node gtest Boost::log_setup Boost::log)
include_directories(${CMAKE_SOURCE_DIR}/submodules)
include_directories(${CMAKE_SOURCE_DIR}/submodules/gtest/googletest/include)
include_directories(${CMAKE_SOURCE_DIR}/submodules/lmdb)

0
boost → submodules/boost
View file

0
cpptoml → submodules/cpptoml
View file

0
crypto/cryptopp → submodules/cryptopp
View file

0
diskhash → submodules/diskhash
View file

0
flatbuffers → submodules/flatbuffers
View file

0
gtest → submodules/gtest
View file

0
lmdb → submodules/lmdb
View file

0
miniupnp → submodules/miniupnp
View file

0
crypto/phc-winner-argon2 → submodules/phc-winner-argon2
View file

0
rocksdb → submodules/rocksdb
View file