Merge rust-bitcoin#3220: Fix CI

d03e545 ci: fix `rev` to be `ref` when pinning bitcoin-maintainer-tools (Andrew Poelstra)
d04b6aa bitcoin: add a couple missing prelude imports (Andrew Poelstra)
30f6bd4 Add primitives to the CRATES list (Andrew Poelstra)
e1e0230 primitives: Enable alloc from serde (Tobin C. Harding)
ce36a37 primitives: Test ordered feature (Tobin C. Harding)

Pull request description:

  This is a rebase of rust-bitcoin#3195 on master (since rust-bitcoin#3200 was merged) and adds one commit which fixes a few missing imports, which it appears was missed in the other "fix CI" PRs.

ACKs for top commit:
  Kixunil:
    ACK d03e545
  tcharding:
    ACK d03e545

Tree-SHA512: 6f5dc5c2cbb42716e83e46e70dbf4d644f9e80f6b3d2e75a276e37d33d461f4a86e67eb5c32444dbd23bb9767abedc88bfe958b1beba39852c382cf73736711f

.github/workflows/rust.yml

@@ -34,7 +34,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: rust-bitcoin/rust-bitcoin-maintainer-tools
-          rev: b2ac115
+          ref: b2ac11556708cd0fb82c8139ff38b1be8d4a62e1
           path: maintainer-tools
       - name: "Select toolchain"
         uses: dtolnay/rust-toolchain@stable
@@ -58,7 +58,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: rust-bitcoin/rust-bitcoin-maintainer-tools
-          rev: b2ac115
+          ref: b2ac11556708cd0fb82c8139ff38b1be8d4a62e1
           path: maintainer-tools
       - name: "Select toolchain"
         uses: dtolnay/rust-toolchain@v1
@@ -83,7 +83,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: rust-bitcoin/rust-bitcoin-maintainer-tools
-          rev: b2ac115
+          ref: b2ac11556708cd0fb82c8139ff38b1be8d4a62e1
           path: maintainer-tools
       - name: "Select toolchain"
         uses: dtolnay/rust-toolchain@stable
@@ -109,7 +109,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: rust-bitcoin/rust-bitcoin-maintainer-tools
-          rev: b2ac115
+          ref: b2ac11556708cd0fb82c8139ff38b1be8d4a62e1
           path: maintainer-tools
       - name: "Select toolchain"
         uses: dtolnay/rust-toolchain@v1
@@ -136,7 +136,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: rust-bitcoin/rust-bitcoin-maintainer-tools
-          rev: b2ac115
+          ref: b2ac11556708cd0fb82c8139ff38b1be8d4a62e1
           path: maintainer-tools
       - name: "Select toolchain"
         uses: dtolnay/rust-toolchain@stable
@@ -160,7 +160,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: rust-bitcoin/rust-bitcoin-maintainer-tools
-          rev: b2ac115
+          ref: b2ac11556708cd0fb82c8139ff38b1be8d4a62e1
           path: maintainer-tools
       - name: "Select toolchain"
         uses: dtolnay/rust-toolchain@v1
@@ -186,7 +186,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: rust-bitcoin/rust-bitcoin-maintainer-tools
-          rev: b2ac115
+          ref: b2ac11556708cd0fb82c8139ff38b1be8d4a62e1
           path: maintainer-tools
       - name: "Select toolchain"
         uses: dtolnay/rust-toolchain@v1

bitcoin/src/blockdata/witness.rs

@@ -12,7 +12,7 @@ use io::{BufRead, Write};
 use crate::consensus::encode::{Error, MAX_VEC_SIZE};
 use crate::consensus::{Decodable, Encodable, WriteExt};
 use crate::crypto::ecdsa;
-use crate::prelude::Vec;
+use crate::prelude::{Vec, String};
 #[cfg(doc)]
 use crate::script::ScriptExt as _;
 use crate::taproot::{self, TAPROOT_ANNEX_PREFIX};

bitcoin/src/serde_utils.rs

@@ -25,7 +25,7 @@ pub mod btreemap_byte_values {
 
     use hex::FromHex;
 
-    use crate::prelude::BTreeMap;
+    use crate::prelude::{BTreeMap, Vec};
 
     pub fn serialize<S, T>(v: &BTreeMap<T, Vec<u8>>, s: S) -> Result<S::Ok, S::Error>
     where
@@ -162,7 +162,7 @@ pub mod btreemap_as_seq_byte_values {
 
     // NOTE: This module can be exactly copied to use with HashMap.
 
-    use crate::prelude::BTreeMap;
+    use crate::prelude::{BTreeMap, Vec};
 
     /// A custom key-value pair type that serialized the bytes as hex.
     #[derive(Debug, Deserialize)]

contrib/crates.sh

@@ -5,4 +5,4 @@
 # shellcheck disable=SC2034
 
 # Crates in this workspace to test (note "fuzz" is only built not tested).
-CRATES=("addresses" "base58" "bitcoin" "hashes" "internals" "io" "units" "fuzz")
+CRATES=("addresses" "base58" "bitcoin" "primitives" "hashes" "internals" "io" "units" "fuzz")

primitives/Cargo.toml

@@ -18,7 +18,7 @@ exclude = ["tests", "contrib"]
 default = ["std"]
 std = ["alloc", "internals/std", "io/std", "units/std"]
 alloc = ["internals/alloc", "io/alloc", "units/alloc"]
-serde = ["dep:serde", "internals/serde", "units/serde"]
+serde = ["dep:serde", "internals/serde", "units/serde", "alloc"]
 
 [dependencies]
 internals = { package = "bitcoin-internals", version = "0.3.0" }

primitives/contrib/test_vars.sh

@@ -5,10 +5,10 @@
 # shellcheck disable=SC2034
 
 # Test these features with "std" enabled.
-FEATURES_WITH_STD="serde"
+FEATURES_WITH_STD="ordered serde"
 
 # Test these features without "std" enabled.
-FEATURES_WITHOUT_STD="alloc serde"
+FEATURES_WITHOUT_STD="alloc ordered serde"
 
 # Run these examples.
 EXAMPLES=""