diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 9d3b275..4f02067 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -33,7 +33,7 @@ jobs: - name: Install dependencies shell: alpine.sh --root {0} run: | - apk add git cmake gcc g++ make linux-headers + apk add git cmake gcc g++ make linux-headers xz - name: Checkout repository uses: actions/checkout@v4 @@ -95,7 +95,7 @@ jobs: shell: alpine.sh {0} run: | cd tests/build - gunzip *.gz + unxz *.xz ./p2pool_tests - name: List directory @@ -130,7 +130,7 @@ jobs: run: | sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test sudo apt update - sudo apt install -y git build-essential cmake libuv1-dev libzmq3-dev libgss-dev libcurl4-openssl-dev libidn2-0-dev ${{ matrix.config.c }} ${{ matrix.config.cpp }} + sudo apt install -y git build-essential cmake libuv1-dev libzmq3-dev libgss-dev libcurl4-openssl-dev libidn2-0-dev xz-utils ${{ matrix.config.c }} ${{ matrix.config.cpp }} - name: Checkout repository uses: actions/checkout@v4 @@ -162,7 +162,7 @@ jobs: - name: Run tests run: | cd tests/build - gunzip *.gz + unxz *.xz ./p2pool_tests - name: Archive binary @@ -186,7 +186,7 @@ jobs: run: | sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test sudo apt update - sudo apt install -y git build-essential cmake libgss-dev gcc-12 g++-12 + sudo apt install -y git build-essential cmake libgss-dev gcc-12 g++-12 xz-utils sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 100 --slave /usr/bin/g++ g++ /usr/bin/g++-12 --slave /usr/bin/gcov gcov /usr/bin/gcov-12 - name: Checkout repository @@ -242,7 +242,7 @@ jobs: - name: Run tests run: | cd tests/build - gunzip *.gz + unxz *.xz ./p2pool_tests - name: Archive binary @@ -265,7 +265,7 @@ jobs: - name: Install dependencies run: | sudo apt update - sudo apt install -y git build-essential cmake + sudo apt install -y git build-essential cmake xz-utils - name: Checkout repository uses: actions/checkout@v4 @@ -320,7 +320,7 @@ jobs: - name: Run tests run: | cd tests/build - gunzip *.gz + unxz *.xz ./p2pool_tests - name: Archive binary @@ -349,7 +349,7 @@ jobs: - name: Install dependencies run: | sudo apt update - sudo apt install -y git build-essential cmake gcc-riscv64-linux-gnu g++-riscv64-linux-gnu binutils-riscv64-linux-gnu + sudo apt install -y git build-essential cmake gcc-riscv64-linux-gnu g++-riscv64-linux-gnu binutils-riscv64-linux-gnu xz-utils sudo cp /usr/riscv64-linux-gnu/lib/* /home/runner/rootfs/alpine-latest-riscv64/lib - name: Checkout repository @@ -411,7 +411,7 @@ jobs: - name: Prepare test data run: | cd tests/build - gunzip *.gz + unxz *.xz - name: Run tests shell: alpine.sh {0} @@ -500,7 +500,7 @@ jobs: - name: Run tests run: | cd tests/build - gunzip *.gz + unxz *.xz ./p2pool_tests.exe - name: Archive binary @@ -571,7 +571,7 @@ jobs: shell: cmd run: | cd tests/build/Debug - 7z x *.gz + 7z x *.xz call "${{ matrix.config.vspath }}\\VC\\Auxiliary\\Build\\vcvarsall.bat" amd64 p2pool_tests.exe @@ -640,7 +640,7 @@ jobs: - name: Run tests run: | cd tests/build - gunzip *.gz + unxz *.xz ./p2pool_tests - name: Archive binary @@ -708,7 +708,7 @@ jobs: - name: Run tests run: | cd tests/build - gunzip *.gz + unxz *.xz ./p2pool_tests - name: Archive binary @@ -779,7 +779,7 @@ jobs: cd build cmake .. -DCMAKE_BUILD_TYPE=Release -DSTATIC_LIBS=ON make -j4 p2pool_tests - gunzip *.gz + unxz *.xz ./p2pool_tests - name: Archive binary @@ -830,7 +830,7 @@ jobs: mkdir build && cd build cmake .. -DCMAKE_BUILD_TYPE=Release make -j4 p2pool_tests - gunzip *.gz + unxz *.xz ./p2pool_tests - name: Archive binary diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index b7dda21..bb40129 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -20,7 +20,7 @@ jobs: - name: Install dependencies run: | sudo apt update - sudo apt install -y cmake libuv1-dev libzmq3-dev libgss-dev libcurl4-openssl-dev libidn2-0-dev lcov + sudo apt install -y cmake libuv1-dev libzmq3-dev libgss-dev libcurl4-openssl-dev libidn2-0-dev lcov xz-utils - name: Install clang run: | @@ -44,7 +44,7 @@ jobs: - name: Run tests run: | cd tests/build - gunzip *.gz + unxz *.xz LLVM_PROFILE_FILE="p2pool_tests.profraw" ./p2pool_tests - name: Merge profile data diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 5296e35..59bf471 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -217,6 +217,6 @@ add_executable(${CMAKE_PROJECT_NAME} ${HEADERS} ${SOURCES}) target_link_libraries(${CMAKE_PROJECT_NAME} debug ${ZMQ_LIBRARY_DEBUG} debug ${UV_LIBRARY_DEBUG} debug ${CURL_LIBRARY_DEBUG} optimized ${ZMQ_LIBRARY} optimized ${UV_LIBRARY} optimized ${CURL_LIBRARY} ${LIBS}) add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_SOURCE_DIR}/src/crypto_tests.txt" $) add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_SOURCE_DIR}/src/block.dat" $) -add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_SOURCE_DIR}/src/sidechain_dump.dat.gz" $) -add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_SOURCE_DIR}/src/sidechain_dump_mini.dat.gz" $) -add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_SOURCE_DIR}/src/sidechain_dump_nano.dat.gz" $) +add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_SOURCE_DIR}/src/sidechain_dump.dat.xz" $) +add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_SOURCE_DIR}/src/sidechain_dump_mini.dat.xz" $) +add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_SOURCE_DIR}/src/sidechain_dump_nano.dat.xz" $) diff --git a/tests/src/block_template_tests.cpp b/tests/src/block_template_tests.cpp index a181469..5719ce3 100644 --- a/tests/src/block_template_tests.cpp +++ b/tests/src/block_template_tests.cpp @@ -238,7 +238,7 @@ TEST(block_template, submit_sidechain_block) } ASSERT_EQ(sidechain.difficulty(), 219467); - ASSERT_EQ(sidechain.blocksById().size(), 4487); + ASSERT_EQ(sidechain.blocksById().size(), 4491); ASSERT_TRUE(sidechain.precalcFinished()); const PoolBlock* tip = sidechain.chainTip(); diff --git a/tests/src/pool_block_tests.cpp b/tests/src/pool_block_tests.cpp index d5a7728..df1a28b 100644 --- a/tests/src/pool_block_tests.cpp +++ b/tests/src/pool_block_tests.cpp @@ -140,26 +140,20 @@ TEST(pool_block, verify) uint32_t m_expectedSharesNextBlock; bool m_shuffle; } tests[6] = { - { "default", "sidechain_dump.dat", 3258121, 9443762, 30, false }, - { "default", "sidechain_dump.dat", 3258121, 9443762, 30, true }, - { "mini", "sidechain_dump_mini.dat", 3258121, 8912067, 593, false }, - { "mini", "sidechain_dump_mini.dat", 3258121, 8912067, 593, true }, - { "nano", "sidechain_dump_nano.dat", 3438036, 116651, 131, false }, - { "nano", "sidechain_dump_nano.dat", 3438036, 116651, 131, true }, + { "default", "sidechain_dump.dat", 3456189, 11704382, 53, false }, + { "default", "sidechain_dump.dat", 3456189, 11704382, 53, true }, + { "mini", "sidechain_dump_mini.dat", 3456189, 11207082, 578, false }, + { "mini", "sidechain_dump_mini.dat", 3456189, 11207082, 578, true }, + { "nano", "sidechain_dump_nano.dat", 3456189, 188542, 115, false }, + { "nano", "sidechain_dump_nano.dat", 3456189, 188542, 115, true }, }; for (const STest& t : tests) { SideChain sidechain(nullptr, NetworkType::Mainnet, t.m_poolName); - if (strcmp(t.m_poolName, "nano") == 0) { - // Difficulty of block 3436544 - sidechain.m_testMainChainDiff = difficulty_type(568969201978ULL, 0ULL); - } - else { - // Difficulty of block 3256320 - sidechain.m_testMainChainDiff = difficulty_type(374140388237ULL, 0ULL); - } + // Difficulty of block 3454976 + sidechain.m_testMainChainDiff = difficulty_type(625461936742ULL, 0ULL); std::ifstream f(t.m_fileName, std::ios::binary | std::ios::ate); ASSERT_EQ(f.good() && f.is_open(), true); diff --git a/tests/src/sidechain_dump.dat.gz b/tests/src/sidechain_dump.dat.gz deleted file mode 100644 index 5a2a382..0000000 Binary files a/tests/src/sidechain_dump.dat.gz and /dev/null differ diff --git a/tests/src/sidechain_dump.dat.xz b/tests/src/sidechain_dump.dat.xz new file mode 100644 index 0000000..10a3f43 Binary files /dev/null and b/tests/src/sidechain_dump.dat.xz differ diff --git a/tests/src/sidechain_dump_mini.dat.gz b/tests/src/sidechain_dump_mini.dat.xz similarity index 61% rename from tests/src/sidechain_dump_mini.dat.gz rename to tests/src/sidechain_dump_mini.dat.xz index 0b23f60..19574f9 100644 Binary files a/tests/src/sidechain_dump_mini.dat.gz and b/tests/src/sidechain_dump_mini.dat.xz differ diff --git a/tests/src/sidechain_dump_nano.dat.gz b/tests/src/sidechain_dump_nano.dat.gz deleted file mode 100644 index 32de24c..0000000 Binary files a/tests/src/sidechain_dump_nano.dat.gz and /dev/null differ diff --git a/tests/src/sidechain_dump_nano.dat.xz b/tests/src/sidechain_dump_nano.dat.xz new file mode 100644 index 0000000..61a1212 Binary files /dev/null and b/tests/src/sidechain_dump_nano.dat.xz differ