From 76c4573c3986e2d9fea475fd3e9e5514c7aa3db0 Mon Sep 17 00:00:00 2001 From: SChernykh Date: Wed, 16 Aug 2023 13:00:11 +0200 Subject: [PATCH] CI: cleanup build warnings Tests: fixed "unused const variable" warning CMakeLists.txt: fixed deprecation warnings --- .github/workflows/c-cpp.yml | 16 ++++++------- .github/workflows/test-sync.yml | 6 ++--- CMakeLists.txt | 2 +- src/block_cache.cpp | 2 +- src/block_template.cpp | 2 +- src/console_commands.cpp | 7 +++++- src/console_commands.h | 2 +- src/json_rpc_request.cpp | 2 +- src/log.cpp | 3 ++- src/log.h | 10 ++++---- src/mempool.cpp | 2 +- src/miner.cpp | 2 +- src/p2p_server.cpp | 8 ++++++- src/p2p_server.h | 2 +- src/p2pool.cpp | 3 ++- src/p2pool_api.cpp | 2 +- src/params.cpp | 2 +- src/pool_block.cpp | 2 +- src/pow_hash.cpp | 2 +- src/side_chain.cpp | 2 +- src/stratum_server.cpp | 7 +++++- src/stratum_server.h | 2 +- src/tcp_server.cpp | 7 +++++- src/tcp_server.h | 2 +- src/util.cpp | 2 +- src/zmq_reader.cpp | 2 +- tests/CMakeLists.txt | 2 +- tests/cmake/flags.cmake | 2 +- tests/src/block_template_tests.cpp | 8 +++---- tests/src/difficulty_type_tests.cpp | 4 ++-- tests/src/pool_block_tests.cpp | 36 ++++++++++++++--------------- 31 files changed, 89 insertions(+), 64 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index ccd452b..80ba8a9 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -98,7 +98,7 @@ jobs: cd external/src/libzmq mkdir build cd build - cmake .. -DCMAKE_C_FLAGS='-Os' -DCMAKE_CXX_FLAGS='-Os' -DWITH_TLS=OFF -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DWITH_PERF_TOOL=OFF + cmake .. -DCMAKE_C_FLAGS='-Os' -DCMAKE_CXX_FLAGS='-Os' -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DWITH_PERF_TOOL=OFF make -j$(nproc) - name: Build p2pool @@ -170,7 +170,7 @@ jobs: cd external/src/libzmq mkdir build cd build - cmake .. -DCMAKE_C_COMPILER=aarch64-linux-gnu-gcc -DCMAKE_CXX_COMPILER=aarch64-linux-gnu-g++ -DCMAKE_C_FLAGS='-Os' -DCMAKE_CXX_FLAGS='-Os' -DWITH_TLS=OFF -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DWITH_PERF_TOOL=OFF + cmake .. -DCMAKE_C_COMPILER=aarch64-linux-gnu-gcc -DCMAKE_CXX_COMPILER=aarch64-linux-gnu-g++ -DCMAKE_C_FLAGS='-Os' -DCMAKE_CXX_FLAGS='-Os' -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DWITH_PERF_TOOL=OFF make -j$(nproc) - name: Build p2pool @@ -233,7 +233,7 @@ jobs: cd external/src/libzmq mkdir build cd build - cmake .. -G "Unix Makefiles" -DCMAKE_C_COMPILER=${{ matrix.config.c }} -DCMAKE_CXX_COMPILER=${{ matrix.config.cxx }} -DCMAKE_C_FLAGS='-Os ${{ matrix.config.flags }}' -DCMAKE_CXX_FLAGS='-Os ${{ matrix.config.flags }}' -DWITH_TLS=OFF -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DZMQ_HAVE_IPC=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DWITH_PERF_TOOL=OFF + cmake .. -G "Unix Makefiles" -DCMAKE_C_COMPILER=${{ matrix.config.c }} -DCMAKE_CXX_COMPILER=${{ matrix.config.cxx }} -DCMAKE_C_FLAGS='-Os ${{ matrix.config.flags }}' -DCMAKE_CXX_FLAGS='-Os ${{ matrix.config.flags }}' -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DZMQ_HAVE_IPC=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DWITH_PERF_TOOL=OFF make -j$(nproc) - name: Build p2pool @@ -289,7 +289,7 @@ jobs: mkdir build cd build cmake .. -G "${{ matrix.config.vs }}" -DWITH_RANDOMX=${{ matrix.config.rx }} -DWITH_UPNP=${{ matrix.config.upnp }} - & "${{ matrix.config.msbuild }}msbuild" /m /p:Configuration=Release p2pool.vcxproj + & "${{ matrix.config.msbuild }}msbuild" -v:m /m /p:Configuration=Release p2pool.vcxproj - name: Build tests run: | @@ -297,7 +297,7 @@ jobs: mkdir build cd build cmake .. -G "${{ matrix.config.vs }}" - & "${{ matrix.config.msbuild }}msbuild" /m /p:Configuration=Debug p2pool_tests.vcxproj + & "${{ matrix.config.msbuild }}msbuild" -v:m /m /p:Configuration=Debug p2pool_tests.vcxproj - name: Run tests run: | @@ -349,7 +349,7 @@ jobs: cd external/src/libzmq mkdir build cd build - cmake .. -DCMAKE_C_FLAGS='-Os' -DCMAKE_CXX_FLAGS='-Os' -DWITH_TLS=OFF -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DWITH_PERF_TOOL=OFF + cmake .. -DCMAKE_C_FLAGS='-Os' -DCMAKE_CXX_FLAGS='-Os' -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DWITH_PERF_TOOL=OFF make -j3 - name: Build p2pool @@ -417,7 +417,7 @@ jobs: cd external/src/libzmq mkdir build cd build - cmake .. -DCMAKE_C_FLAGS='-Os -target arm64-apple-${{ matrix.os }}' -DCMAKE_CXX_FLAGS='-Os -target arm64-apple-${{ matrix.os }}' -DWITH_TLS=OFF -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DWITH_PERF_TOOL=OFF + cmake .. -DCMAKE_C_FLAGS='-Os -target arm64-apple-${{ matrix.os }}' -DCMAKE_CXX_FLAGS='-Os -target arm64-apple-${{ matrix.os }}' -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DWITH_PERF_TOOL=OFF make -j3 - name: Build p2pool @@ -473,7 +473,7 @@ jobs: cd ../../libzmq mkdir build cd build - cmake .. -DCMAKE_C_FLAGS='-Os' -DCMAKE_CXX_FLAGS='-Os' -DWITH_TLS=OFF -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DWITH_PERF_TOOL=OFF + cmake .. -DCMAKE_C_FLAGS='-Os' -DCMAKE_CXX_FLAGS='-Os' -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DWITH_PERF_TOOL=OFF make -j2 cd ../../../.. mkdir build diff --git a/.github/workflows/test-sync.yml b/.github/workflows/test-sync.yml index 95a484f..2515200 100644 --- a/.github/workflows/test-sync.yml +++ b/.github/workflows/test-sync.yml @@ -107,7 +107,7 @@ jobs: cd external/src/libzmq mkdir build cd build - cmake .. -DCMAKE_C_COMPILER=clang-17 -DCMAKE_CXX_COMPILER=clang++-17 -DCMAKE_C_FLAGS='-fsanitize=memory -fsanitize-recover -fsanitize-memory-track-origins -Os -fno-omit-frame-pointer -g' -DCMAKE_CXX_FLAGS='-nostdinc++ -nostdlib++ -fsanitize=memory -fsanitize-recover -fsanitize-memory-track-origins -Os -fno-omit-frame-pointer -g -isystem /tmp/libcxx_msan/include/c++/v1 -L/tmp/libcxx_msan/lib -lc++ -lc++abi -Wno-unused-command-line-argument' -DWITH_TLS=OFF -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DWITH_PERF_TOOL=OFF + cmake .. -DCMAKE_C_COMPILER=clang-17 -DCMAKE_CXX_COMPILER=clang++-17 -DCMAKE_C_FLAGS='-fsanitize=memory -fsanitize-recover -fsanitize-memory-track-origins -Os -fno-omit-frame-pointer -g' -DCMAKE_CXX_FLAGS='-nostdinc++ -nostdlib++ -fsanitize=memory -fsanitize-recover -fsanitize-memory-track-origins -Os -fno-omit-frame-pointer -g -isystem /tmp/libcxx_msan/include/c++/v1 -L/tmp/libcxx_msan/lib -lc++ -lc++abi -Wno-unused-command-line-argument' -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DWITH_PERF_TOOL=OFF make -j$(nproc) - name: Build p2pool @@ -295,7 +295,7 @@ jobs: mkdir build cd build cmake .. -G "Visual Studio 17 2022" -DDEV_TEST_SYNC=ON - & "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\Msbuild\\Current\\Bin\\amd64\\msbuild" /m /p:Configuration=Debug p2pool.vcxproj + & "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\Msbuild\\Current\\Bin\\amd64\\msbuild" -v:m /m /p:Configuration=Debug p2pool.vcxproj - name: Run p2pool run: | @@ -338,7 +338,7 @@ jobs: mkdir build cd build cmake .. -G "Visual Studio 17 2022" -DDEV_TEST_SYNC=ON -DDEV_TRACK_MEMORY=ON - & "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\Msbuild\\Current\\Bin\\amd64\\msbuild" /m /p:Configuration=RelWithDebInfo p2pool.vcxproj + & "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\Msbuild\\Current\\Bin\\amd64\\msbuild" -v:m /m /p:Configuration=RelWithDebInfo p2pool.vcxproj - name: Run p2pool run: | diff --git a/CMakeLists.txt b/CMakeLists.txt index 0890a1c..6e34115 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.5) project(p2pool) option(STATIC_BINARY "Build static binary" OFF) diff --git a/src/block_cache.cpp b/src/block_cache.cpp index eb4c97f..2bae7bc 100644 --- a/src/block_cache.cpp +++ b/src/block_cache.cpp @@ -20,7 +20,7 @@ #include "pool_block.h" #include "p2p_server.h" -static constexpr char log_category_prefix[] = "BlockCache "; +LOG_CATEGORY(BlockCache) static constexpr uint32_t BLOCK_SIZE = 96 * 1024; static constexpr uint32_t NUM_BLOCKS = 4608; diff --git a/src/block_template.cpp b/src/block_template.cpp index d9a9bd9..b453873 100644 --- a/src/block_template.cpp +++ b/src/block_template.cpp @@ -32,7 +32,7 @@ #include #include -static constexpr char log_category_prefix[] = "BlockTemplate "; +LOG_CATEGORY(BlockTemplate) namespace p2pool { diff --git a/src/console_commands.cpp b/src/console_commands.cpp index 89a006b..041d218 100644 --- a/src/console_commands.cpp +++ b/src/console_commands.cpp @@ -28,7 +28,7 @@ #include "p2pool_api.h" #include "params.h" -static constexpr char log_category_prefix[] = "ConsoleCommands "; +LOG_CATEGORY(ConsoleCommands) static constexpr int DEFAULT_BACKLOG = 1; @@ -123,6 +123,11 @@ void ConsoleCommands::on_shutdown() uv_close(reinterpret_cast(m_stdin_handle), nullptr); } +const char* ConsoleCommands::get_log_category() const +{ + return log_category_prefix; +} + typedef struct strconst { const char *str; size_t len; diff --git a/src/console_commands.h b/src/console_commands.h index 316ff0c..8fb121f 100644 --- a/src/console_commands.h +++ b/src/console_commands.h @@ -50,7 +50,7 @@ public: void on_shutdown() override; private: - const char* get_category() const override { return "ConsoleCommands "; } + const char* get_log_category() const override; p2pool* m_pool; diff --git a/src/json_rpc_request.cpp b/src/json_rpc_request.cpp index 1df0b91..36ca7b7 100644 --- a/src/json_rpc_request.cpp +++ b/src/json_rpc_request.cpp @@ -20,7 +20,7 @@ #include "json_rpc_request.h" #include -static constexpr char log_category_prefix[] = "JSONRPCRequest "; +LOG_CATEGORY(JSONRPCRequest) namespace p2pool { namespace JSONRPCRequest { diff --git a/src/log.cpp b/src/log.cpp index 9eb0fa2..168bb7f 100644 --- a/src/log.cpp +++ b/src/log.cpp @@ -27,7 +27,8 @@ #pragma warning(disable : 4996) #endif -static constexpr char log_category_prefix[] = "Log "; +LOG_CATEGORY(Log) + static constexpr char log_file_name[] = "p2pool.log"; namespace p2pool { diff --git a/src/log.h b/src/log.h index db7c96a..0f55d61 100644 --- a/src/log.h +++ b/src/log.h @@ -510,17 +510,19 @@ struct DummyStream } #endif +#define LOG_CATEGORY(category) static constexpr char log_category_prefix[] = #category " "; + #ifdef P2POOL_LOG_DISABLE -#define LOGINFO(level, ...) SIDE_EFFECT_CHECK(level, __VA_ARGS__) -#define LOGWARN(level, ...) SIDE_EFFECT_CHECK(level, __VA_ARGS__) -#define LOGERR(level, ...) SIDE_EFFECT_CHECK(level, __VA_ARGS__) +#define LOGINFO(level, ...) SIDE_EFFECT_CHECK(level, log_category_prefix << __VA_ARGS__) +#define LOGWARN(level, ...) SIDE_EFFECT_CHECK(level, log_category_prefix << __VA_ARGS__) +#define LOGERR(level, ...) SIDE_EFFECT_CHECK(level, log_category_prefix << __VA_ARGS__) #else #define LOG(level, severity, ...) \ do { \ - SIDE_EFFECT_CHECK(level, __VA_ARGS__); \ + SIDE_EFFECT_CHECK(level, log_category_prefix << __VA_ARGS__); \ if ((level) <= log::GLOBAL_LOG_LEVEL) { \ log::Writer CONCAT(log_wrapper_, __LINE__)(severity); \ CONCAT(log_wrapper_, __LINE__) << log::Gray() << log_category_prefix; \ diff --git a/src/mempool.cpp b/src/mempool.cpp index 39c7d53..d3b09ad 100644 --- a/src/mempool.cpp +++ b/src/mempool.cpp @@ -19,7 +19,7 @@ #include "mempool.h" #include "util.h" -static constexpr char log_category_prefix[] = "Mempool "; +LOG_CATEGORY(Mempool) namespace p2pool { diff --git a/src/miner.cpp b/src/miner.cpp index e3de9b4..5afc9ee 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -28,7 +28,7 @@ #include "p2p_server.h" #include -static constexpr char log_category_prefix[] = "Miner "; +LOG_CATEGORY(Miner) using namespace std::chrono; diff --git a/src/p2p_server.cpp b/src/p2p_server.cpp index c6be892..452b4e1 100644 --- a/src/p2p_server.cpp +++ b/src/p2p_server.cpp @@ -31,7 +31,8 @@ #include #include -static constexpr char log_category_prefix[] = "P2PServer "; +LOG_CATEGORY(P2PServer) + static constexpr char saved_peer_list_file_name[] = "p2pool_peers.txt"; static const char* seed_nodes[] = { "seeds.p2pool.io", ""}; static const char* seed_nodes_mini[] = { "seeds-mini.p2pool.io", "" }; @@ -1049,6 +1050,11 @@ const PoolBlock* P2PServer::find_block(const hash& id) const return m_pool->side_chain().find_block(id); } +const char* P2PServer::get_log_category() const +{ + return log_category_prefix; +} + void P2PServer::on_timer() { if (m_pool->stopped()) { diff --git a/src/p2p_server.h b/src/p2p_server.h index ec415f8..4d2013d 100644 --- a/src/p2p_server.h +++ b/src/p2p_server.h @@ -178,7 +178,7 @@ public: const PoolBlock* find_block(const hash& id) const; private: - const char* get_category() const override { return "P2PServer "; } + const char* get_log_category() const override; p2pool* m_pool; BlockCache* m_cache; diff --git a/src/p2pool.cpp b/src/p2pool.cpp index da9cf9f..5419e85 100644 --- a/src/p2pool.cpp +++ b/src/p2pool.cpp @@ -40,7 +40,8 @@ #include #include -constexpr char log_category_prefix[] = "P2Pool "; +LOG_CATEGORY(P2Pool) + constexpr int BLOCK_HEADERS_REQUIRED = 720; constexpr uint64_t SEEDHASH_EPOCH_BLOCKS = 2048; diff --git a/src/p2pool_api.cpp b/src/p2pool_api.cpp index 9935517..5b7c18c 100644 --- a/src/p2pool_api.cpp +++ b/src/p2pool_api.cpp @@ -24,7 +24,7 @@ #include #endif -static constexpr char log_category_prefix[] = "P2Pool API "; +LOG_CATEGORY(P2Pool API) namespace p2pool { diff --git a/src/params.cpp b/src/params.cpp index e9f22a2..de5ed45 100644 --- a/src/params.cpp +++ b/src/params.cpp @@ -20,7 +20,7 @@ #include "stratum_server.h" #include "p2p_server.h" -constexpr char log_category_prefix[] = "P2Pool "; +LOG_CATEGORY(Params) void p2pool_usage(); diff --git a/src/pool_block.cpp b/src/pool_block.cpp index 6e9b051..24089f3 100644 --- a/src/pool_block.cpp +++ b/src/pool_block.cpp @@ -22,7 +22,7 @@ #include "pow_hash.h" #include "crypto.h" -static constexpr char log_category_prefix[] = "PoolBlock "; +LOG_CATEGORY(PoolBlock) #include "pool_block_parser.inl" diff --git a/src/pow_hash.cpp b/src/pow_hash.cpp index aa67116..39922d9 100644 --- a/src/pow_hash.cpp +++ b/src/pow_hash.cpp @@ -29,7 +29,7 @@ #include #include -static constexpr char log_category_prefix[] = "RandomX_Hasher "; +LOG_CATEGORY(RandomX_Hasher) namespace p2pool { diff --git a/src/side_chain.cpp b/src/side_chain.cpp index 37fc865..7be1a7a 100644 --- a/src/side_chain.cpp +++ b/src/side_chain.cpp @@ -40,7 +40,7 @@ #include #include -static constexpr char log_category_prefix[] = "SideChain "; +LOG_CATEGORY(SideChain) static constexpr uint64_t MIN_DIFFICULTY = 100000; static constexpr size_t UNCLE_BLOCK_DEPTH = 3; diff --git a/src/stratum_server.cpp b/src/stratum_server.cpp index bcf3b33..bfc0bcb 100644 --- a/src/stratum_server.cpp +++ b/src/stratum_server.cpp @@ -23,7 +23,7 @@ #include "params.h" #include "p2pool_api.h" -static constexpr char log_category_prefix[] = "StratumServer "; +LOG_CATEGORY(StratumServer) static constexpr int DEFAULT_BACKLOG = 128; static constexpr uint64_t DEFAULT_BAN_TIME = 600; @@ -544,6 +544,11 @@ void StratumServer::reset_share_counters() m_totalFailedShares = 0; } +const char* StratumServer::get_log_category() const +{ + return log_category_prefix; +} + void StratumServer::print_stratum_status() const { uint64_t hashes_15m, hashes_1h, hashes_24h, total_hashes; diff --git a/src/stratum_server.h b/src/stratum_server.h index bf60611..ec2946c 100644 --- a/src/stratum_server.h +++ b/src/stratum_server.h @@ -97,7 +97,7 @@ public: void reset_share_counters(); private: - const char* get_category() const override { return "StratumServer "; } + const char* get_log_category() const override; void print_stratum_status() const; void update_auto_diff(StratumClient* client, const uint64_t timestamp, const uint64_t hashes); diff --git a/src/tcp_server.cpp b/src/tcp_server.cpp index 89ebe3a..31c6e5e 100644 --- a/src/tcp_server.cpp +++ b/src/tcp_server.cpp @@ -573,13 +573,18 @@ bool TCPServer::send_internal(Client* client, Callback return true; } +const char* TCPServer::get_log_category() const +{ + return log_category_prefix; +} + void TCPServer::loop(void* data) { TCPServer* server = static_cast(data); server->m_loopThreadRunning.exchange(true); ON_SCOPE_LEAVE([server]() { server->m_loopThreadRunning.exchange(false); }); - log_category_prefix = server->get_category(); + log_category_prefix = server->get_log_category(); LOGINFO(1, "event loop started"); server_event_loop_thread = data; diff --git a/src/tcp_server.h b/src/tcp_server.h index 5a734e8..e255051 100644 --- a/src/tcp_server.h +++ b/src/tcp_server.h @@ -143,7 +143,7 @@ private: std::vector m_listenSockets; protected: - virtual const char* get_category() const { return "TCPServer "; } + virtual const char* get_log_category() const; std::vector m_callbackBuf; int m_defaultBacklog; diff --git a/src/util.cpp b/src/util.cpp index dda71ad..45831df 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -40,7 +40,7 @@ #include #endif -static constexpr char log_category_prefix[] = "Util "; +LOG_CATEGORY(Util) namespace p2pool { diff --git a/src/zmq_reader.cpp b/src/zmq_reader.cpp index 336e2e7..cd41008 100644 --- a/src/zmq_reader.cpp +++ b/src/zmq_reader.cpp @@ -20,7 +20,7 @@ #include "json_parsers.h" #include -static constexpr char log_category_prefix[] = "ZMQReader "; +LOG_CATEGORY(ZMQReader) namespace p2pool { diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 3b131b0..5a0f720 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.5) project(p2pool_tests) option(STATIC_LIBS "Use locally built libuv and libzmq static libs" OFF) diff --git a/tests/cmake/flags.cmake b/tests/cmake/flags.cmake index 7fa99ee..dd283a7 100644 --- a/tests/cmake/flags.cmake +++ b/tests/cmake/flags.cmake @@ -27,7 +27,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES GNU) endif() elseif (CMAKE_CXX_COMPILER_ID MATCHES MSVC) set(GENERAL_FLAGS "") - set(WARNING_FLAGS "/Wall /sdl") + set(WARNING_FLAGS "/W4 /sdl") set(SECURITY_FLAGS "/GS /guard:cf") set(OPTIMIZATION_FLAGS "/O2 /Oi /Ob2 /Ot /DNDEBUG /GL") diff --git a/tests/src/block_template_tests.cpp b/tests/src/block_template_tests.cpp index dcf987e..761ecf3 100644 --- a/tests/src/block_template_tests.cpp +++ b/tests/src/block_template_tests.cpp @@ -74,8 +74,8 @@ TEST(block_template, update) ASSERT_EQ(diff, 300346053753ULL); ASSERT_EQ(sidechain_diff, sidechain.difficulty()); ASSERT_EQ(seed_hash, data.seed_hash); - ASSERT_EQ(nonce_offset, 39); - ASSERT_EQ(template_id, 1); + ASSERT_EQ(nonce_offset, 39U); + ASSERT_EQ(template_id, 1U); hash blobs_hash; keccak(blobs.data(), static_cast(blobs.size()), blobs_hash.h); @@ -105,8 +105,8 @@ TEST(block_template, update) ASSERT_EQ(diff, 300346053753ULL); ASSERT_EQ(sidechain_diff, sidechain.difficulty()); ASSERT_EQ(seed_hash, data.seed_hash); - ASSERT_EQ(nonce_offset, 39); - ASSERT_EQ(template_id, 2); + ASSERT_EQ(nonce_offset, 39U); + ASSERT_EQ(template_id, 2U); keccak(blobs.data(), static_cast(blobs.size()), blobs_hash.h); ASSERT_EQ(blobs_hash, H("c74d295a9cb7e808030284e2169a6f05b685a11c6c577a774d5eb8fad175d5cd")); diff --git a/tests/src/difficulty_type_tests.cpp b/tests/src/difficulty_type_tests.cpp index a74240c..cd6d738 100644 --- a/tests/src/difficulty_type_tests.cpp +++ b/tests/src/difficulty_type_tests.cpp @@ -567,8 +567,8 @@ TEST(difficulty_type, check_pow) for (int i = 0; i < 1000; ++i) { // Random difficulty between 300G and 400G - difficulty_type diff{ 300000000000ull + (r() % 100000000000ull), 0 }; - hash h; + diff.lo = 300000000000ull + (r() % 100000000000ull); + diff.hi = 0; // All zeros memset(h.h, 0, HASH_SIZE); diff --git a/tests/src/pool_block_tests.cpp b/tests/src/pool_block_tests.cpp index 28e416d..0b8e6a6 100644 --- a/tests/src/pool_block_tests.cpp +++ b/tests/src/pool_block_tests.cpp @@ -57,28 +57,28 @@ TEST(pool_block, deserialize) int outputs_offset, outputs_blob_size; const std::vector mainchain_data = b.serialize_mainchain_data(&header_size, &miner_tx_size, &outputs_offset, &outputs_blob_size); - ASSERT_EQ(mainchain_data.size(), 1757); - ASSERT_EQ(header_size, 43); - ASSERT_EQ(miner_tx_size, 1457); + ASSERT_EQ(mainchain_data.size(), 1757U); + ASSERT_EQ(header_size, 43U); + ASSERT_EQ(miner_tx_size, 1457U); ASSERT_EQ(outputs_offset, 54); ASSERT_EQ(outputs_blob_size, 1371); - ASSERT_EQ(b.m_majorVersion, 16); - ASSERT_EQ(b.m_minorVersion, 16); - ASSERT_EQ(b.m_timestamp, 1679221824); - ASSERT_EQ(b.m_nonce, 1247); - ASSERT_EQ(b.m_txinGenHeight, 2845298); - ASSERT_EQ(b.m_outputs.size(), 35); - ASSERT_EQ(b.m_extraNonceSize, 4); - ASSERT_EQ(b.m_extraNonce, 1482827308); - ASSERT_EQ(b.m_transactions.size(), 9); - ASSERT_EQ(b.m_uncles.size(), 0); - ASSERT_EQ(b.m_sidechainHeight, 4674483); - ASSERT_EQ(b.m_difficulty.lo, 1854596983); - ASSERT_EQ(b.m_difficulty.hi, 0); + ASSERT_EQ(b.m_majorVersion, 16U); + ASSERT_EQ(b.m_minorVersion, 16U); + ASSERT_EQ(b.m_timestamp, 1679221824U); + ASSERT_EQ(b.m_nonce, 1247U); + ASSERT_EQ(b.m_txinGenHeight, 2845298U); + ASSERT_EQ(b.m_outputs.size(), 35U); + ASSERT_EQ(b.m_extraNonceSize, 4U); + ASSERT_EQ(b.m_extraNonce, 1482827308U); + ASSERT_EQ(b.m_transactions.size(), 9U); + ASSERT_EQ(b.m_uncles.size(), 0U); + ASSERT_EQ(b.m_sidechainHeight, 4674483U); + ASSERT_EQ(b.m_difficulty.lo, 1854596983U); + ASSERT_EQ(b.m_difficulty.hi, 0U); ASSERT_EQ(b.m_cumulativeDifficulty.lo, 7172845253120126ull); - ASSERT_EQ(b.m_cumulativeDifficulty.hi, 0); - ASSERT_EQ(b.m_depth, 0); + ASSERT_EQ(b.m_cumulativeDifficulty.hi, 0U); + ASSERT_EQ(b.m_depth, 0U); ASSERT_EQ(b.m_verified, false); ASSERT_EQ(b.m_invalid, false); ASSERT_EQ(b.m_broadcasted, false);