milksad
/
rust-bitcoin-unsafe-fast
14
0
Fork 0
Code Issues Pull Requests Activity

Merge rust-bitcoin/rust-bitcoin#4284: Use `path = [bala]` for `rust-bitcoin`'s workspace members dependencies. remove `[patch.crates-io.balab]` 

9a572dabde refactor: use path dependencies for workspace members in bitcoin/Cargo.toml (Eval EXEC)

Pull request description:

  This PR want to:

  1. make all workspace members use `workspace = true` syntax to import dependencies.
  2. use `path = [balabala]` to define dependencies, instead of useing `[patch.crates-io.balabala]` , fix: https://github.com/rust-bitcoin/rust-bitcoin/issues/4283

ACKs for top commit:
  Kixunil:
    ACK 9a572dabde
  apoelstra:
    ACK 9a572dabdeb077f96b2ab66be1a80fcec3e805e3; successfully ran local tests

Tree-SHA512: 834ef881ed3fd324a9ecca440e8e591984a7e474eb6aeab86a0301cbd08b6dc96ecdc34b306ad146b11b50f7488024c289b8f8c7c6de1a2bdba7aec515b722ee
This commit is contained in:
merge-script 2025-03-27 15:01:47 +00:00
parent 459a7db038 9a572dabde
commit 158240c3c9
No known key found for this signature in database
GPG Key ID: C588D63CE41B97C1
9 changed files with 21 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Cargo.toml
View File

@ -2,26 +2,8 @@
members = ["addresses", "base58", "bitcoin", "chacha20_poly1305", "fuzz", "hashes", "internals", "io", "primitives", "units"] members = ["addresses", "base58", "bitcoin", "chacha20_poly1305", "fuzz", "hashes", "internals", "io", "primitives", "units"]
resolver = "2" resolver = "2"
[patch.crates-io.bitcoin-addresses] # Keep this patch for hashes because secp256k1 depends on bitcoin-hashes via crates.io
path = "addresses" # This allows testing changes to hashes with secp256k1
# See https://github.com/rust-bitcoin/rust-bitcoin/pull/4284#pullrequestreview-2714442229
[patch.crates-io.base58ck]
path = "base58"
[patch.crates-io.bitcoin]
path = "bitcoin"
[patch.crates-io.bitcoin_hashes] [patch.crates-io.bitcoin_hashes]
path = "hashes" path = "hashes"
[patch.crates-io.bitcoin-internals]
path = "internals"
[patch.crates-io.bitcoin-io]
path = "io"
[patch.crates-io.bitcoin-primitives]
path = "primitives"
[patch.crates-io.bitcoin-units]
path = "units"

4
base58/Cargo.toml
View File

@ -18,8 +18,8 @@ std = ["alloc", "hashes/std", "internals/std"]
alloc = ["hashes/alloc", "internals/alloc"] alloc = ["hashes/alloc", "internals/alloc"]
[dependencies] [dependencies]
hashes = { package = "bitcoin_hashes", version = "0.16.0", default-features = false } hashes = { package = "bitcoin_hashes", path = "../hashes", default-features = false }
internals = { package = "bitcoin-internals", version = "0.4.0" } internals = { package = "bitcoin-internals", path = "../internals" }
[dev-dependencies] [dev-dependencies]
hex = { package = "hex-conservative", version = "0.3.0", default-features = false, features = ["alloc"] } hex = { package = "hex-conservative", version = "0.3.0", default-features = false, features = ["alloc"] }

14
bitcoin/Cargo.toml
View File

@ -25,15 +25,15 @@ secp-recovery = ["secp256k1/recovery"]
arbitrary = ["dep:arbitrary", "units/arbitrary", "primitives/arbitrary"] arbitrary = ["dep:arbitrary", "units/arbitrary", "primitives/arbitrary"]
[dependencies] [dependencies]
base58 = { package = "base58ck", version = "0.2.0", default-features = false, features = ["alloc"] } base58 = { package = "base58ck", path = "../base58", default-features = false, features = ["alloc"] }
bech32 = { version = "0.11.0", default-features = false, features = ["alloc"] } bech32 = { version = "0.11.0", default-features = false, features = ["alloc"] }
hashes = { package = "bitcoin_hashes", version = "0.16.0", default-features = false, features = ["alloc", "hex"] } hashes = { package = "bitcoin_hashes", path = "../hashes", default-features = false, features = ["alloc", "hex"] }
hex = { package = "hex-conservative", version = "0.3.0", default-features = false, features = ["alloc"] } hex = { package = "hex-conservative", version = "0.3.0", default-features = false, features = ["alloc"] }
internals = { package = "bitcoin-internals", version = "0.4.0", features = ["alloc", "hex"] } internals = { package = "bitcoin-internals", path = "../internals", features = ["alloc", "hex"] }
io = { package = "bitcoin-io", version = "0.2.0", default-features = false, features = ["alloc", "hashes"] } io = { package = "bitcoin-io", path = "../io", default-features = false, features = ["alloc", "hashes"] }
primitives = { package = "bitcoin-primitives", version = "0.101.0", default-features = false, features = ["alloc"] } primitives = { package = "bitcoin-primitives", path = "../primitives", default-features = false, features = ["alloc"] }
secp256k1 = { version = "0.30.0", default-features = false, features = ["hashes", "alloc", "rand"] } secp256k1 = { version = "0.30.0", default-features = false, features = ["hashes", "alloc", "rand"] }
units = { package = "bitcoin-units", version = "0.2.0", default-features = false, features = ["alloc"] } units = { package = "bitcoin-units", path = "../units", default-features = false, features = ["alloc"] }
arbitrary = { version = "1.4", optional = true } arbitrary = { version = "1.4", optional = true }
base64 = { version = "0.22.0", optional = true } base64 = { version = "0.22.0", optional = true }
@ -42,7 +42,7 @@ bitcoinconsensus = { version = "0.106.0", default-features = false, optional = t
serde = { version = "1.0.103", default-features = false, features = [ "derive", "alloc" ], optional = true } serde = { version = "1.0.103", default-features = false, features = [ "derive", "alloc" ], optional = true }
[dev-dependencies] [dev-dependencies]
internals = { package = "bitcoin-internals", version = "0.4.0", features = ["test-serde"] } internals = { package = "bitcoin-internals", path = "../internals", features = ["test-serde"] }
serde_json = "1.0.0" serde_json = "1.0.0"
serde_test = "1.0.19" serde_test = "1.0.19"
bincode = "1.3.1" bincode = "1.3.1"

14
bitcoin/embedded/Cargo.toml
View File

@ -27,20 +27,6 @@ codegen-units = 1 # better optimizations
debug = true # symbols are nice and they don't increase the size on Flash debug = true # symbols are nice and they don't increase the size on Flash
lto = true # better optimizations lto = true # better optimizations
[patch.crates-io.base58ck]
path = "../../base58"
[patch.crates-io.bitcoin_hashes] [patch.crates-io.bitcoin_hashes]
path = "../../hashes" path = "../../hashes"
[patch.crates-io.bitcoin-internals]
path = "../../internals"
[patch.crates-io.bitcoin-io]
path = "../../io"
[patch.crates-io.bitcoin-primitives]
path = "../../primitives"
[patch.crates-io.bitcoin-units]
path = "../../units"

2
hashes/Cargo.toml
View File

@ -22,7 +22,7 @@ serde = ["dep:serde", "hex"]
small-hash = [] small-hash = []
[dependencies] [dependencies]
internals = { package = "bitcoin-internals", version = "0.4.0" } internals = { package = "bitcoin-internals", path = "../internals" }
hex = { package = "hex-conservative", version = "0.3.0", default-features = false, optional = true } hex = { package = "hex-conservative", version = "0.3.0", default-features = false, optional = true }
serde = { version = "1.0", default-features = false, optional = true } serde = { version = "1.0", default-features = false, optional = true }

9
hashes/embedded/Cargo.toml
View File

@ -34,12 +34,3 @@ lto = true # better optimizations
[patch.crates-io.bitcoin_hashes] [patch.crates-io.bitcoin_hashes]
path = "../../hashes" path = "../../hashes"
[patch.crates-io.bitcoin-internals]
path = "../../internals"
[patch.crates-io.bitcoin-io]
path = "../../io"
[patch.crates-io.bitcoin-units]
path = "../../units"

6
io/Cargo.toml
View File

@ -19,12 +19,12 @@ std = ["alloc", "hashes?/std"]
alloc = ["hashes?/alloc"] alloc = ["hashes?/alloc"]
[dependencies] [dependencies]
internals = { package = "bitcoin-internals", version = "0.4.0" } internals = { package = "bitcoin-internals", path = "../internals" }
hashes = { package = "bitcoin_hashes", version = "0.16.0", default-features = false, optional = true } hashes = { package = "bitcoin_hashes", path = "../hashes", default-features = false, optional = true }
[dev-dependencies] [dev-dependencies]
hashes = { package = "bitcoin_hashes", version = "0.16.0", default-features = false, features = ["hex"] } hashes = { package = "bitcoin_hashes", path = "../hashes", default-features = false, features = ["hex"] }
[package.metadata.docs.rs] [package.metadata.docs.rs]
all-features = true all-features = true

6
primitives/Cargo.toml
View File

@ -22,10 +22,10 @@ serde = ["dep:serde", "hashes/serde", "internals/serde", "units/serde", "alloc"]
arbitrary = ["dep:arbitrary", "units/arbitrary"] arbitrary = ["dep:arbitrary", "units/arbitrary"]
[dependencies] [dependencies]
hashes = { package = "bitcoin_hashes", version = "0.16.0", default-features = false, features = ["hex"] } hashes = { package = "bitcoin_hashes", path = "../hashes", default-features = false, features = ["hex"] }
hex = { package = "hex-conservative", version = "0.3.0", default-features = false } hex = { package = "hex-conservative", version = "0.3.0", default-features = false }
internals = { package = "bitcoin-internals", version = "0.4.0", features = ["hex"] } internals = { package = "bitcoin-internals", path = "../internals", features = ["hex"] }
units = { package = "bitcoin-units", version = "0.2.0", default-features = false } units = { package = "bitcoin-units", path = "../units", default-features = false }
arbitrary = { version = "1.4", optional = true } arbitrary = { version = "1.4", optional = true }
serde = { version = "1.0.103", default-features = false, features = ["derive", "alloc"], optional = true } serde = { version = "1.0.103", default-features = false, features = ["derive", "alloc"], optional = true }

4
units/Cargo.toml
View File

@ -18,13 +18,13 @@ std = ["alloc", "internals/std"]
alloc = ["internals/alloc","serde?/alloc"] alloc = ["internals/alloc","serde?/alloc"]
[dependencies] [dependencies]
internals = { package = "bitcoin-internals", version = "0.4.0" } internals = { package = "bitcoin-internals", path = "../internals" }
serde = { version = "1.0.103", default-features = false, features = ["derive"], optional = true } serde = { version = "1.0.103", default-features = false, features = ["derive"], optional = true }
arbitrary = { version = "1.4", optional = true } arbitrary = { version = "1.4", optional = true }
[dev-dependencies] [dev-dependencies]
internals = { package = "bitcoin-internals", version = "0.4.0", features = ["test-serde"] } internals = { package = "bitcoin-internals", path = "../internals", features = ["test-serde"] }
bincode = "1.3.1" bincode = "1.3.1"
serde_test = "1.0" serde_test = "1.0"
serde_json = "1.0" serde_json = "1.0"