Skip to content

Commit

Permalink
chore(Cargo.toml): 🪄 remove explicit default-features = true
Browse files Browse the repository at this point in the history
in #3748, we migrated to using cargo's workspace dependencies feature.
this has been excellent, workspace dependencies rock. 🎸

one wrinkle in the [script] used to migrate all of our constituent
crates' manifests over was that it provided an explicit
`default-features` attribute, even when `True`.

default features are, by their nature, enabled by default. a
dependency need only provide this attribute when _disabling_ default
features, in order to e.g. explicitly provide a list of `#[cfg(..)]`
features to conditionally compile into a library/binary.

via the magic of vim macros and the quickfix list, this commit
mechanically removes any occurrences of `default-features = true` in our
dependency tree.

[script]: #3748 (comment)
  • Loading branch information
cratelyn committed Jun 27, 2024
1 parent a402222 commit 43db187
Show file tree
Hide file tree
Showing 36 changed files with 177 additions and 179 deletions.
23 changes: 11 additions & 12 deletions crates/bench/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@ ark-serialize = {workspace = true}
ark-snark = {workspace = true}
ark-std = {workspace = true, default-features = false}
bech32 = {workspace = true}
decaf377 = {workspace = true, features = ["r1cs"], default-features = true}
decaf377 = {workspace = true, features = ["r1cs"]}
num-bigint = {workspace = true}
once_cell = {workspace = true}
penumbra-asset = {workspace = true, default-features = true}
penumbra-keys = {workspace = true, default-features = true}
penumbra-num = {workspace = true, default-features = true}
penumbra-asset = {workspace = true}
penumbra-keys = {workspace = true}
penumbra-num = {workspace = true}
rand = {workspace = true}
rand_core = {workspace = true, features = ["getrandom"]}
serde = {workspace = true, features = ["derive"]}
Expand All @@ -79,17 +79,16 @@ criterion = {workspace = true, features = ["html_reports"]}
decaf377-fmd = {workspace = true}
decaf377-ka = {workspace = true}
decaf377-rdsa = {workspace = true}
penumbra-dex = {workspace = true, default-features = true}
penumbra-fee = {workspace = true, default-features = true}
penumbra-governance = {workspace = true, default-features = true}
penumbra-sct = {workspace = true, default-features = true}
penumbra-shielded-pool = {workspace = true, default-features = true}
penumbra-stake = {workspace = true, default-features = true}
penumbra-tct = {workspace = true, features = ["r1cs"], default-features = true}
penumbra-dex = {workspace = true}
penumbra-fee = {workspace = true}
penumbra-governance = {workspace = true}
penumbra-sct = {workspace = true}
penumbra-shielded-pool = {workspace = true}
penumbra-stake = {workspace = true}
penumbra-tct = {workspace = true, features = ["r1cs"]}

[dev-dependencies.penumbra-proof-params]
workspace = true
default-features = true
features = [
"bundled-proving-keys",
"download-proving-keys",
Expand Down
17 changes: 8 additions & 9 deletions crates/bin/pcli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ clap = {workspace = true, features = ["derive", "env"]}
colored = "2.1.0"
colored_json = "4.1"
comfy-table = "5"
decaf377 = {workspace = true, default-features = true}
decaf377 = {workspace = true}
decaf377-rdsa = {workspace = true}
dialoguer = "0.10.4"
time = "0.3"
Expand All @@ -54,8 +54,8 @@ futures = {workspace = true}
hex = {workspace = true}
http-body = {workspace = true}
humantime = {workspace = true}
ibc-proto = {workspace = true, default-features = true}
ibc-types = {workspace = true, features = ["std", "with_serde"], default-features = true}
ibc-proto = {workspace = true}
ibc-types = {workspace = true, features = ["std", "with_serde"]}
indicatif = {workspace = true}
jmt = {workspace = true}
ndarray = "0.15.6"
Expand All @@ -73,13 +73,13 @@ penumbra-ibc = {workspace = true, default-features = false}
penumbra-keys = {workspace = true, default-features = false}
penumbra-num = {workspace = true, default-features = false}
penumbra-proof-setup = {workspace = true}
penumbra-proof-params = { workspace = true, default-features = true }
penumbra-proto = {workspace = true, features = ["rpc", "box-grpc"], default-features = true}
penumbra-proof-params = { workspace = true }
penumbra-proto = {workspace = true, features = ["rpc", "box-grpc"]}
penumbra-sct = {workspace = true, default-features = false}
penumbra-shielded-pool = {workspace = true, default-features = false}
penumbra-stake = {workspace = true, default-features = false}
penumbra-tct = {workspace = true, default-features = true}
penumbra-transaction = {workspace = true, default-features = true}
penumbra-tct = {workspace = true}
penumbra-transaction = {workspace = true}
penumbra-view = {workspace = true}
penumbra-wallet = {workspace = true}
pin-project = {workspace = true}
Expand All @@ -93,7 +93,7 @@ serde_json = {workspace = true}
serde_with = {workspace = true, features = ["hex"]}
sha2 = {workspace = true}
simple-base64 = "0.23"
tendermint = {workspace = true, features = ["rust-crypto"], default-features = true}
tendermint = {workspace = true, features = ["rust-crypto"]}
tokio = {workspace = true, features = ["full"]}
tokio-stream = {workspace = true}
tokio-util = {workspace = true}
Expand All @@ -113,7 +113,6 @@ regex = {workspace = true}
tempfile = {workspace = true}

[dev-dependencies.penumbra-proof-params]
default-features = true
workspace = true
features = [
"bundled-proving-keys",
Expand Down
14 changes: 7 additions & 7 deletions crates/bin/pclientd/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ http-body = {workspace = true}
metrics = {workspace = true}
parking_lot = {workspace = true}
penumbra-app = {workspace = true}
penumbra-asset = {workspace = true, default-features = true}
penumbra-asset = {workspace = true}
penumbra-custody = {workspace = true}
penumbra-keys = {workspace = true, default-features = true}
penumbra-proto = {workspace = true, features = ["rpc"], default-features = true}
penumbra-tct = {workspace = true, default-features = true}
penumbra-transaction = {workspace = true, default-features = true}
penumbra-keys = {workspace = true}
penumbra-proto = {workspace = true, features = ["rpc"]}
penumbra-tct = {workspace = true}
penumbra-transaction = {workspace = true}
penumbra-view = {workspace = true}
prost = {workspace = true}
rand = {workspace = true}
Expand All @@ -57,9 +57,9 @@ url = {workspace = true, features = ["serde"]}
assert_cmd = {workspace = true}
base64 = {workspace = true}
ibc-proto = {workspace = true, default-features = false, features = ["server"]}
ibc-types = {workspace = true, default-features = true}
ibc-types = {workspace = true}
penumbra-proof-params = {workspace = true, features = [
"bundled-proving-keys",
"download-proving-keys",
], default-features = true}
]}
tempfile = {workspace = true}
40 changes: 20 additions & 20 deletions crates/bin/pd/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ anyhow = "1"

[dependencies]
anyhow = { workspace = true }
ark-ff = { workspace = true, default-features = true }
ark-ff = { workspace = true }
async-stream = { workspace = true }
async-trait = { workspace = true }
axum = "0.6"
Expand All @@ -43,9 +43,9 @@ blake2b_simd = { workspace = true }
bytes = { workspace = true }
chrono = { workspace = true, default-features = false, features = ["serde"] }
clap = { workspace = true, features = ["derive", "env"] }
cnidarium = { workspace = true, features = ["migration", "rpc"], default-features = true }
cnidarium = { workspace = true, features = ["migration", "rpc"] }
csv = "1.1"
decaf377 = { workspace = true, features = ["parallel"], default-features = true }
decaf377 = { workspace = true, features = ["parallel"] }
decaf377-rdsa = { workspace = true }
directories = { workspace = true }
ed25519-consensus = { workspace = true }
Expand All @@ -55,7 +55,7 @@ futures = { workspace = true }
hex = { workspace = true }
http = { workspace = true }
ibc-proto = { workspace = true, default-features = false, features = ["server"] }
ibc-types = { workspace = true, default-features = true }
ibc-types = { workspace = true }
ics23 = { workspace = true }
jmt = { workspace = true }
metrics = { workspace = true }
Expand All @@ -67,25 +67,25 @@ mime_guess = "2"
once_cell = { workspace = true }
pbjson-types = { workspace = true }
penumbra-app = { workspace = true }
penumbra-asset = { workspace = true, default-features = true }
penumbra-asset = { workspace = true }
penumbra-auto-https = { path = "../../util/auto-https" }
penumbra-compact-block = { workspace = true, default-features = true }
penumbra-compact-block = { workspace = true }
penumbra-custody = { workspace = true }
penumbra-auction = { workspace = true, features = ["parallel"], default-features = true }
penumbra-dex = { workspace = true, features = ["parallel"], default-features = true }
penumbra-fee = { workspace = true, default-features = true }
penumbra-governance = { workspace = true, features = ["parallel"], default-features = true }
penumbra-ibc = { workspace = true, features = ["rpc"], default-features = true }
penumbra-keys = { workspace = true, default-features = true }
penumbra-num = { workspace = true, default-features = true }
penumbra-proto = { workspace = true, default-features = true }
penumbra-sct = { workspace = true, default-features = true }
penumbra-shielded-pool = { workspace = true, features = ["parallel"], default-features = true }
penumbra-stake = { workspace = true, features = ["parallel"], default-features = true }
penumbra-tct = { workspace = true, default-features = true }
penumbra-auction = { workspace = true, features = ["parallel"] }
penumbra-dex = { workspace = true, features = ["parallel"] }
penumbra-fee = { workspace = true }
penumbra-governance = { workspace = true, features = ["parallel"] }
penumbra-ibc = { workspace = true, features = ["rpc"] }
penumbra-keys = { workspace = true }
penumbra-num = { workspace = true }
penumbra-proto = { workspace = true }
penumbra-sct = { workspace = true }
penumbra-shielded-pool = { workspace = true, features = ["parallel"] }
penumbra-stake = { workspace = true, features = ["parallel"] }
penumbra-tct = { workspace = true }
penumbra-tendermint-proxy = { path = "../../util/tendermint-proxy" }
penumbra-tower-trace = { path = "../../util/tower-trace" }
penumbra-transaction = { workspace = true, default-features = true }
penumbra-transaction = { workspace = true }
pin-project = { workspace = true }
pin-project-lite = { workspace = true }
prost = { workspace = true }
Expand Down Expand Up @@ -128,7 +128,7 @@ zip = "0.6"
penumbra-proof-params = { workspace = true, features = [
"bundled-proving-keys",
"download-proving-keys",
], default-features = true }
] }
assert_cmd = { workspace = true }
predicates = "2.1"
prost-reflect = "0.13.1"
48 changes: 24 additions & 24 deletions crates/core/app/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ bech32 = { workspace = true }
bincode = { workspace = true }
bitvec = { workspace = true }
blake2b_simd = { workspace = true }
cnidarium = { workspace = true, features = ["migration", "rpc"], default-features = true }
cnidarium-component = { workspace = true, default-features = true }
decaf377 = { workspace = true, default-features = true }
cnidarium = { workspace = true, features = ["migration", "rpc"] }
cnidarium-component = { workspace = true }
decaf377 = { workspace = true }
decaf377-rdsa = { workspace = true }
futures = { workspace = true }
hex = { workspace = true }
Expand All @@ -35,29 +35,29 @@ jmt = { workspace = true }
metrics = { workspace = true }
once_cell = { workspace = true }
parking_lot = { workspace = true }
penumbra-asset = { workspace = true, default-features = true }
penumbra-auction = { workspace = true, default-features = true }
penumbra-community-pool = { workspace = true, default-features = true }
penumbra-compact-block = { workspace = true, default-features = true }
penumbra-dex = { workspace = true, default-features = true }
penumbra-distributions = { workspace = true, default-features = true }
penumbra-fee = { workspace = true, default-features = true }
penumbra-funding = { workspace = true, default-features = true }
penumbra-governance = { workspace = true, default-features = true }
penumbra-ibc = { workspace = true, features = ["component", "rpc"], default-features = true }
penumbra-keys = { workspace = true, default-features = true }
penumbra-num = { workspace = true, default-features = true }
penumbra-proof-params = { workspace = true, default-features = true }
penumbra-proto = { workspace = true, features = ["cnidarium"], default-features = true }
penumbra-sct = { workspace = true, default-features = true }
penumbra-shielded-pool = { workspace = true, features = ["component"], default-features = true }
penumbra-stake = { workspace = true, default-features = true }
penumbra-tct = { workspace = true, default-features = true }
penumbra-asset = { workspace = true }
penumbra-auction = { workspace = true }
penumbra-community-pool = { workspace = true }
penumbra-compact-block = { workspace = true }
penumbra-dex = { workspace = true }
penumbra-distributions = { workspace = true }
penumbra-fee = { workspace = true }
penumbra-funding = { workspace = true }
penumbra-governance = { workspace = true }
penumbra-ibc = { workspace = true, features = ["component", "rpc"] }
penumbra-keys = { workspace = true }
penumbra-num = { workspace = true }
penumbra-proof-params = { workspace = true }
penumbra-proto = { workspace = true, features = ["cnidarium"] }
penumbra-sct = { workspace = true }
penumbra-shielded-pool = { workspace = true, features = ["component"] }
penumbra-stake = { workspace = true }
penumbra-tct = { workspace = true }
penumbra-tendermint-proxy = { path = "../../util/tendermint-proxy" }
penumbra-test-subscriber = { workspace = true }
penumbra-tower-trace = { path = "../../util/tower-trace" }
penumbra-transaction = { workspace = true, features = ["parallel"], default-features = true }
penumbra-txhash = { workspace = true, default-features = true }
penumbra-transaction = { workspace = true, features = ["parallel"] }
penumbra-txhash = { workspace = true }
prost = { workspace = true }
rand_chacha = { workspace = true }
regex = { workspace = true }
Expand Down Expand Up @@ -85,7 +85,7 @@ url = { workspace = true }
[dev-dependencies]
axum-server = { workspace = true }
camino = { workspace = true }
decaf377-fmd = { workspace = true, default-features = true }
decaf377-fmd = { workspace = true }
ed25519-consensus = { workspace = true }
penumbra-mock-client = { workspace = true }
penumbra-mock-consensus = { workspace = true }
Expand Down
6 changes: 3 additions & 3 deletions crates/core/asset/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ base64 = {workspace = true}
bech32 = {workspace = true}
blake2b_simd = {workspace = true}
bytes = {workspace = true}
decaf377 = {workspace = true, features = ["r1cs"], default-features = true}
decaf377 = {workspace = true, features = ["r1cs"]}
decaf377-fmd = {workspace = true}
decaf377-rdsa = {workspace = true}
derivative = {workspace = true}
Expand All @@ -34,8 +34,8 @@ hex = {workspace = true}
ibig = {workspace = true}
num-bigint = {workspace = true}
once_cell = {workspace = true}
penumbra-num = {workspace = true, default-features = true}
penumbra-proto = {workspace = true, default-features = true}
penumbra-num = {workspace = true}
penumbra-proto = {workspace = true}
poseidon377 = {workspace = true, features = ["r1cs"]}
rand = {workspace = true}
rand_core = {workspace = true, features = ["getrandom"]}
Expand Down
10 changes: 5 additions & 5 deletions crates/core/component/auction/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ bitvec = {workspace = true}
cnidarium = {workspace = true, default-features = false, optional = true}
cnidarium-component = {workspace = true, default-features = false, optional = true}
blake2b_simd = {workspace = true}
decaf377 = {workspace = true, features = ["r1cs"], default-features = true}
decaf377 = {workspace = true, features = ["r1cs"]}
decaf377-rdsa = {workspace = true}
futures = {workspace = true, optional = true}
hex = {workspace = true}
Expand All @@ -58,12 +58,12 @@ once_cell = {workspace = true}
penumbra-asset = {workspace = true, default-features = false}
penumbra-keys = {workspace = true, default-features = false}
penumbra-num = {workspace = true, default-features = false}
penumbra-proof-params = {workspace = true, default-features = true}
penumbra-proto = {workspace = true, default-features = true}
penumbra-proof-params = {workspace = true}
penumbra-proto = {workspace = true}
penumbra-sct = {workspace = true, default-features = false}
penumbra-dex = {workspace = true, default-features = false}
penumbra-shielded-pool = {workspace = true, default-features = false}
penumbra-tct = {workspace = true, default-features = true}
penumbra-tct = {workspace = true}
penumbra-txhash = {workspace = true, default-features = false}
rand_chacha = {workspace = true}
rand_core = {workspace = true}
Expand All @@ -72,7 +72,7 @@ serde = {workspace = true, features = ["derive"]}
serde_with = {workspace = true}
sha2 = {workspace = true}
tap = {workspace = true}
tendermint = {workspace = true, default-features = true}
tendermint = {workspace = true}
tokio = {workspace = true, features = ["full", "tracing"], optional = true}
tonic = {workspace = true, optional = true}
tracing = {workspace = true}
Expand Down
4 changes: 2 additions & 2 deletions crates/core/component/community-pool/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ ark-ff = {workspace = true, default-features = false}
async-trait = {workspace = true}
base64 = {workspace = true}
blake2b_simd = {workspace = true}
cnidarium = {workspace = true, optional = true, default-features = true}
cnidarium-component = {workspace = true, optional = true, default-features = true}
cnidarium = {workspace = true, optional = true}
cnidarium-component = {workspace = true, optional = true}
futures = {workspace = true}
hex = {workspace = true}
metrics = {workspace = true}
Expand Down
6 changes: 3 additions & 3 deletions crates/core/component/compact-block/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ ark-ff = {workspace = true, default-features = false}
async-trait = {workspace = true}
blake2b_simd = {workspace = true}
bytes = {workspace = true}
cnidarium = {workspace = true, optional = true, default-features = true}
cnidarium-component = {workspace = true, optional = true, default-features = true}
cnidarium = {workspace = true, optional = true}
cnidarium-component = {workspace = true, optional = true}
decaf377-rdsa = {workspace = true}
futures = {workspace = true}
im = {workspace = true}
Expand All @@ -40,7 +40,7 @@ penumbra-proto = {workspace = true, default-features = false}
penumbra-sct = {workspace = true, default-features = false}
penumbra-shielded-pool = {workspace = true, default-features = false}
penumbra-stake = {workspace = true, default-features = false}
penumbra-tct = {workspace = true, default-features = true}
penumbra-tct = {workspace = true}
rand = {workspace = true}
rand_core = {workspace = true, features = ["getrandom"]}
serde = {workspace = true, features = ["derive"]}
Expand Down
Loading

0 comments on commit 43db187

Please sign in to comment.