Merge #80: ci: update cargo-rbmt and adopt toolchain mgmt

tcharding · tcharding · commit 30b5b7270881 · 2026-03-18T14:46:00.000+11:00
730ea44 ci: consolidate job definitions (Nick Johnson) c10fdec api: adopt new cargo-rbmt api files location (Nick Johnson) d7b18af ci: update cargo-rbmt and adopt toolchain mgmt (Nick Johnson) 7fd658c Remove debug println statements from miniscript finalizer (Nick Johnson) Pull request description: The CI job was using a floating version of the cargo-rbmt install action (e.g. `setup-rbmt@master`) and the tool is still way too unstable for that, causing CI to die. Bumping the version and pinning it here. This new version of cargo-rbmt includes the toolchain management, so the justfile and CI job have been simplified. It also has the new spot for the API files which doesn't include the package name. The new version of cargo-rbmt also includes the [random subset of features to test feature](rust-bitcoin/rust-bitcoin-maintainer-tools#94), which I believe exposed an issue in the v2 code (addressed in the first commit). ACKs for top commit: tcharding: ACK 730ea44 Tree-SHA512: 41bb32f9d23dace7198ab799a9bd2cd81fdaa452c30a93bf7afd467034ca022c7c5275044229e8a3aa31642e94fd07776c2d69a380a21d60507d8764f736b983
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -13,114 +13,27 @@ on:   # yamllint disable-line rule:truthy
 name: Continuous Integration
 
 jobs:
-  Stable:                       # 2 jobs, one per lock file.
-    name: Test - stable toolchain
+  Test:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
+        toolchain: [stable, nightly, msrv]
         dep: [minimal, recent]
     steps:
       - uses: actions/checkout@v6
-      - uses: rust-bitcoin/rust-bitcoin-maintainer-tools/.github/actions/setup-rbmt@master
-        id: setup
+      - uses: rust-bitcoin/rust-bitcoin-maintainer-tools/.github/actions/setup-rbmt@18e7f1788abfc14f5fb76204a3deab43b03ba39c
       - name: "Run tests"
-        run: cargo +${{ steps.setup.outputs.stable-version }} rbmt test stable --lock-file ${{ matrix.dep }}
+        run: cargo rbmt --lock-file ${{ matrix.dep }} test --toolchain ${{ matrix.toolchain }}
 
-  Nightly:                      # 2 jobs, one per lock file.
-    name: Test - nightly toolchain
+  Check:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        dep: [minimal, recent]
-    steps:
-      - uses: actions/checkout@v6
-      - uses: rust-bitcoin/rust-bitcoin-maintainer-tools/.github/actions/setup-rbmt@master
-        id: setup
-      - name: "Run tests"
-        run: cargo +${{ steps.setup.outputs.nightly-version }} rbmt test nightly --lock-file ${{ matrix.dep }}
-
-  MSRV:                         # 2 jobs, one per lock file.
-    name: Test - MSRV toolchain
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        dep: [minimal, recent]
-    steps:
-      - uses: actions/checkout@v6
-      - uses: rust-bitcoin/rust-bitcoin-maintainer-tools/.github/actions/setup-rbmt@master
-        with:
-          toolchains: "1.74.0"
-      - name: "Run tests"
-        run: cargo +1.74.0 rbmt test msrv --lock-file ${{ matrix.dep }}
-
-  Lint:
-    name: Lint - nightly toolchain
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v6
-      - uses: rust-bitcoin/rust-bitcoin-maintainer-tools/.github/actions/setup-rbmt@master
-        id: setup
-      - name: "Run lint"
-        run: cargo +${{ steps.setup.outputs.nightly-version }} rbmt lint
-
-  API:
-    name: API check
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v6
-      - uses: rust-bitcoin/rust-bitcoin-maintainer-tools/.github/actions/setup-rbmt@master
-        id: setup
-      - name: "Run API check"
-        run: cargo +${{ steps.setup.outputs.nightly-version }} rbmt api
-
-  Docs:
-    name: Docs - stable toolchain
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v6
-      - uses: rust-bitcoin/rust-bitcoin-maintainer-tools/.github/actions/setup-rbmt@master
-        id: setup
-      - name: "Build docs"
-        run: cargo +${{ steps.setup.outputs.stable-version }} rbmt docs
-
-  Docsrs:
-    name: Docs - nightly toolchain
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v6
-      - uses: rust-bitcoin/rust-bitcoin-maintainer-tools/.github/actions/setup-rbmt@master
-        id: setup
-      - name: "Build docs.rs docs"
-        run: cargo +${{ steps.setup.outputs.nightly-version }} rbmt docsrs
-
-  Format:                       #  1 job, run cargo fmt directly.
-    name: Format - nightly toolchain
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v6
-      - uses: rust-bitcoin/rust-bitcoin-maintainer-tools/.github/actions/setup-rbmt@master
-        id: setup
-      - name: "Check formatting"
-        run: cargo +${{ steps.setup.outputs.nightly-version }} fmt --all -- --check
-
-  Integration:                  # 1 job, run bitcoin core integration tests using rbmt.
-    name: Integration - against bitcoind
-    runs-on: ubuntu-latest
+        command: [lint, api, docs, docsrs, integration, "fmt --check"]
     steps:
       - uses: actions/checkout@v6
-      - uses: rust-bitcoin/rust-bitcoin-maintainer-tools/.github/actions/setup-rbmt@master
-      - name: "Run integration tests"
-        run: cargo rbmt integration
+      - uses: rust-bitcoin/rust-bitcoin-maintainer-tools/.github/actions/setup-rbmt@18e7f1788abfc14f5fb76204a3deab43b03ba39c
+      - name: "Run ${{ matrix.command }}"
+        run: cargo rbmt ${{ matrix.command }}
diff --git a/.github/workflows/update-toolchains.yml b/.github/workflows/update-toolchains.yml
@@ -14,9 +14,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
-      - uses: rust-bitcoin/rust-bitcoin-maintainer-tools/.github/actions/update-nightly@320a06a6647c90ac97452b20fad5b689905a9791
+      - uses: rust-bitcoin/rust-bitcoin-maintainer-tools/.github/actions/update-nightly@18e7f1788abfc14f5fb76204a3deab43b03ba39c
         with:
           token: ${{ secrets.RBMT_PRS }}
-      - uses: rust-bitcoin/rust-bitcoin-maintainer-tools/.github/actions/update-stable@320a06a6647c90ac97452b20fad5b689905a9791
+      - uses: rust-bitcoin/rust-bitcoin-maintainer-tools/.github/actions/update-stable@18e7f1788abfc14f5fb76204a3deab43b03ba39c
         with:
           token: ${{ secrets.RBMT_PRS }}
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,7 +10,7 @@ keywords = [ "psbt", "bip-174", "bip174", "bip-370", "bip370"]
 readme = "README.md"
 edition = "2021"
 rust-version = "1.74.0"
-exclude = ["tests", "contrib"]
+exclude = ["api", "tests", "contrib"]
 
 [package.metadata.docs.rs]
 all-features = true
diff --git a/api/all-features.txt b/api/all-features.txt
diff --git a/api/no-features.txt b/api/no-features.txt
diff --git a/justfile b/justfile
@@ -7,6 +7,7 @@ _default:
 # Install rbmt (Rust Bitcoin Maintainer Tools).
 @_install-rbmt:
   cargo install --quiet --git https://github.com/rust-bitcoin/rust-bitcoin-maintainer-tools.git --rev $(cat {{justfile_directory()}}/rbmt-version) cargo-rbmt
+  RBMT_LOG_LEVEL=quiet cargo rbmt toolchains > /dev/null
 
 # Cargo check everything.
 check:
@@ -40,26 +41,24 @@ docsrs *flags:
 # Update the recent and minimal lock files using rbmt.
 [group('tools')]
 @update-lock-files: _install-rbmt
-  rustup run {{NIGHTLY_VERSION}} cargo rbmt lock
+  cargo rbmt lock
 
 # Ensure the exposed API files in api/ are up-to-date.
 [group('tools')]
 check-api: _install-rbmt
-  cargo +{{NIGHTLY_VERSION}} rbmt api
-
-# Run CI tasks with rbmt.
-[group('ci')]
-@ci task toolchain="stable" lock="recent": _install-rbmt
-  RBMT_LOG_LEVEL=quiet rustup run {{toolchain}} cargo rbmt --lock-file {{lock}} {{task}}
+  cargo rbmt api
 
 # Test crate.
 [group('ci')]
-ci-test: (ci "test stable")
+ci-test toolchain="stable" lock="recent": _install-rbmt
+  cargo rbmt --lock-file {{lock}} test --toolchain {{toolchain}}
 
 # Lint crate.
 [group('ci')]
-ci-lint: (ci "lint" NIGHTLY_VERSION)
+ci-lint: _install-rbmt
+  cargo rbmt lint
 
 # Bitcoin core integration tests.
 [group('ci')]
-ci-integration: (ci "integration")
+ci-integration: _install-rbmt
+  cargo rbmt integration
diff --git a/rbmt-version b/rbmt-version
@@ -1 +1 @@
-257e19f400ab1bfa51c2051b5551d92f75b5f738
+18e7f1788abfc14f5fb76204a3deab43b03ba39c
diff --git a/src/v2/miniscript/finalize.rs b/src/v2/miniscript/finalize.rs
@@ -126,8 +126,6 @@ impl Finalizer {
         };
 
         let witness = Witness::from_slice(&witness);
-        println!("{:#?}", script_sig);
-        println!("{:#?}", witness);
         Ok((script_sig, witness))
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-257e19f400ab1bfa51c2051b5551d92f75b5f738`
	`1`	`+18e7f1788abfc14f5fb76204a3deab43b03ba39c`
Original file line number	Diff line number	Diff line change
`@@ -126,8 +126,6 @@ impl Finalizer {`
`126`	`126`	`};`
`127`	`127`
`128`	`128`	`let witness = Witness::from_slice(&witness);`
`129`		`- println!("{:#?}", script_sig);`
`130`		`- println!("{:#?}", witness);`
`131`	`129`	`Ok((script_sig, witness))`
`132`	`130`	`}`
`133`	`131`