Merge pull request libbitcoin#1397 from evoskuil/master

Make header::proof(uint32_t) public.
evoskuil · Feb 14, 2024 · 9031fdc · 9031fdc
2 parents 7a84bec + 1725d92
commit 9031fdc
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -180,9 +180,10 @@ jobs:
 
       - name: Coveralls.io Upload
         if: ${{ matrix.coverage == 'cov' }}
-        uses: pmienk/coveralls-github-action@master
+        uses: coverallsapp/github-action@v2.2.3
         with:
-          path-to-lcov: "./coverage.info"
+          format: lcov
+          files: "./coverage.info"
           github-token: ${{ secrets.github_token }}
 
       - name: Failure display available binaries
@@ -406,9 +407,10 @@ jobs:
 
       - name: Coveralls.io Upload
         if: ${{ matrix.coverage == 'cov' }}
-        uses: pmienk/coveralls-github-action@master
+        uses: coverallsapp/github-action@v2.2.3
         with:
-          path-to-lcov: "./coverage.info"
+          format: lcov
+          files: "./coverage.info"
           github-token: ${{ secrets.github_token }}
 
       - name: Failure display available binaries
@@ -604,9 +606,10 @@ jobs:
 
       - name: Coveralls.io Upload
         if: ${{ matrix.coverage == 'cov' }}
-        uses: pmienk/coveralls-github-action@master
+        uses: coverallsapp/github-action@v2.2.3
         with:
-          path-to-lcov: "./coverage.info"
+          format: lcov
+          files: "./coverage.info"
           github-token: ${{ secrets.github_token }}
 
       - name: Failure display available binaries
@@ -701,7 +704,7 @@ jobs:
 
     steps:
       - name: Add msbuild to PATH
-        uses: microsoft/setup-msbuild@v1.1
+        uses: microsoft/setup-msbuild@v2
         with:
           msbuild-architecture: x64
 
@@ -731,7 +734,7 @@ jobs:
           }
 
       - name: Execute build
-        run: .\build.cmd .. ${{ matrix.platform }} ${{ matrix.configuration }} ${{ matrix.version }}
+        run: .\build.cmd .. ${{ matrix.platform }} ${{ matrix.configuration }} x64 ${{ matrix.version }}
 
       - name: Execute tests
         shell: powershell

diff --git a/build.cmd b/build.cmd
@@ -11,10 +11,10 @@ SET "relative_path_base=%~1"
 call cd /d "%relative_path_base%"
 SET "path_base=%cd%"
 SET "nuget_pkg_path=%path_base%\.nuget\packages"
-SET "msbuild_args=/verbosity:minimal /p:Platform=%~2 /p:Configuration=%~3"
-SET "proj_version=%~4"
+SET "msbuild_args=/verbosity:minimal /p:Platform=%~2 /p:Configuration=%~3 /p:PreferredToolArchitecture=%~4"
+SET "proj_version=%~5"
 SET "msbuild_exe=msbuild"
-IF EXIST "%~5" SET "msbuild_exe=%~5"
+IF EXIST "%~6" SET "msbuild_exe=%~6"
 
 call :pending "Build initialized..."
 IF NOT EXIST "%nuget_pkg_path%" (

diff --git a/include/bitcoin/system/chain/header.hpp b/include/bitcoin/system/chain/header.hpp
@@ -41,6 +41,7 @@ class BC_API header
 
     typedef std::shared_ptr<const header> cptr;
 
+    static uint256_t proof(uint32_t bits) NOEXCEPT;
     static constexpr size_t serialized_size() NOEXCEPT
     {
         return sizeof(version_)
@@ -136,7 +137,6 @@ class BC_API header
 
 private:
     static header from_data(reader& source) NOEXCEPT;
-    static uint256_t proof(uint32_t bits) NOEXCEPT;
 
     // Header should be stored as shared (adds 16 bytes).
     // copy: 4 * 32 + 2 * 256 + 1 = 81 bytes (vs. 16 when shared).

diff --git a/src/chain/header.cpp b/src/chain/header.cpp
@@ -251,7 +251,7 @@ hash_digest header::hash() const NOEXCEPT
     return digest;
 }
 
-// static/private
+// static
 uint256_t header::proof(uint32_t bits) NOEXCEPT
 {
     auto target = compact::expand(bits);