Skip to content

Commit 302ff20

Browse files
committed
Merge #649: Use range dependency for hashes v0.12.0 - v0.13.0
9364214 Use range dependency for hashes v0.12.0 - v0.13.0 (Tobin C. Harding) Pull request description: There are zero code changes required to support v.0.13.0 so we elect to use a range dependency to make the upgrade path for downstream users more pleasant. Upgrade the dependency of `hashes` to be either v0.12.0 or v0.13.0 Use v0.13.0 in the recent/minimal lockfiles. ACKs for top commit: apoelstra: ACK 9364214 Tree-SHA512: c411acbd6025a751920fe2c432bf8c9ab78e891a3b32170f85873732c595777e075bd8b1277bf7b156e941a3caf532af71af36e99f88aa36dadbd66c61384166
2 parents 83a2245 + 9364214 commit 302ff20

File tree

3 files changed

+27
-13
lines changed

3 files changed

+27
-13
lines changed

Cargo-minimal.lock

+13-6
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,19 @@ dependencies = [
1818
]
1919

2020
[[package]]
21-
name = "bitcoin-private"
22-
version = "0.1.0"
21+
name = "bitcoin-internals"
22+
version = "0.2.0"
2323
source = "registry+https://github.com/rust-lang/crates.io-index"
24-
checksum = "73290177011694f38ec25e165d0387ab7ea749a4b81cd4c80dae5988229f7a57"
24+
checksum = "9425c3bf7089c983facbae04de54513cce73b41c7f9ff8c845b54e7bc64ebbfb"
2525

2626
[[package]]
2727
name = "bitcoin_hashes"
28-
version = "0.12.0"
28+
version = "0.13.0"
2929
source = "registry+https://github.com/rust-lang/crates.io-index"
30-
checksum = "5d7066118b13d4b20b23645932dfb3a81ce7e29f95726c2036fa33cd7b092501"
30+
checksum = "1930a4dabfebb8d7d9992db18ebe3ae2876f0a305fab206fd168df931ede293b"
3131
dependencies = [
32-
"bitcoin-private",
32+
"bitcoin-internals",
33+
"hex-conservative",
3334
]
3435

3536
[[package]]
@@ -103,6 +104,12 @@ version = "1.2.0"
103104
source = "registry+https://github.com/rust-lang/crates.io-index"
104105
checksum = "ee6c0438de3ca4d8cac2eec62b228e2f8865cfe9ebefea720406774223fa2d2e"
105106

107+
[[package]]
108+
name = "hex-conservative"
109+
version = "0.1.1"
110+
source = "registry+https://github.com/rust-lang/crates.io-index"
111+
checksum = "30ed443af458ccb6d81c1e7e661545f94d3176752fb1df2f543b902a1e0f51e2"
112+
106113
[[package]]
107114
name = "itoa"
108115
version = "0.3.0"

Cargo-recent.lock

+13-6
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,19 @@ dependencies = [
1212
]
1313

1414
[[package]]
15-
name = "bitcoin-private"
16-
version = "0.1.0"
15+
name = "bitcoin-internals"
16+
version = "0.2.0"
1717
source = "registry+https://github.com/rust-lang/crates.io-index"
18-
checksum = "73290177011694f38ec25e165d0387ab7ea749a4b81cd4c80dae5988229f7a57"
18+
checksum = "9425c3bf7089c983facbae04de54513cce73b41c7f9ff8c845b54e7bc64ebbfb"
1919

2020
[[package]]
2121
name = "bitcoin_hashes"
22-
version = "0.12.0"
22+
version = "0.13.0"
2323
source = "registry+https://github.com/rust-lang/crates.io-index"
24-
checksum = "5d7066118b13d4b20b23645932dfb3a81ce7e29f95726c2036fa33cd7b092501"
24+
checksum = "1930a4dabfebb8d7d9992db18ebe3ae2876f0a305fab206fd168df931ede293b"
2525
dependencies = [
26-
"bitcoin-private",
26+
"bitcoin-internals",
27+
"hex-conservative",
2728
]
2829

2930
[[package]]
@@ -79,6 +80,12 @@ version = "1.8.2"
7980
source = "registry+https://github.com/rust-lang/crates.io-index"
8081
checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
8182

83+
[[package]]
84+
name = "hex-conservative"
85+
version = "0.1.1"
86+
source = "registry+https://github.com/rust-lang/crates.io-index"
87+
checksum = "30ed443af458ccb6d81c1e7e661545f94d3176752fb1df2f543b902a1e0f51e2"
88+
8289
[[package]]
8390
name = "js-sys"
8491
version = "0.3.61"

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ serde = { version = "1.0.103", default-features = false, optional = true }
4040

4141
# You likely only want to enable these if you explicitly do not want to use "std", otherwise enable
4242
# the respective -std feature e.g., hashes-std
43-
hashes = { package = "bitcoin_hashes", version = "0.12", default-features = false, optional = true }
43+
hashes = { package = "bitcoin_hashes", version = ">= 0.12, <= 0.13", default-features = false, optional = true }
4444
rand = { version = "0.8", default-features = false, optional = true }
4545

4646
[dev-dependencies]

0 commit comments

Comments
 (0)