Skip to content

Commit

Permalink
Maintain dependencies in workspace (#1060)
Browse files Browse the repository at this point in the history 
* Unify dependencies in workspace

* Use default instead of std features in std environment

* Align dependency defintion structure

Dependencies are defined using the following order: Either just a version, or a version/git repository, then a branch or tag, than whether default features are enabled or not
  • Loading branch information
@sea212
sea212 authored Aug 2, 2023
1 parent 893ab52 commit 37e1a16
Show file tree
Hide file tree
Showing 24 changed files with 748 additions and 549 deletions.
199 changes: 199 additions & 0 deletions Cargo.toml
View file

Large diffs are not rendered by default.

164 changes: 82 additions & 82 deletions node/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,113 +3,113 @@ name = "zeitgeist"
path = "./src/main.rs"

[build-dependencies]
substrate-build-script-utils = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
substrate-build-script-utils = { workspace = true }

[dependencies]
pallet-asset-tx-payment = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
pallet-transaction-payment = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
pallet-transaction-payment-rpc = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
pallet-transaction-payment-rpc-runtime-api = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
sc-basic-authorship = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
sc-cli = { branch = "polkadot-v0.9.32", features = ["wasmtime"], git = "https://github.com/paritytech/substrate" }
sc-client-api = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
sc-consensus = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
sc-executor = { branch = "polkadot-v0.9.32", features = ["wasmtime"], git = "https://github.com/paritytech/substrate" }
sc-keystore = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
sc-rpc = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
sc-rpc-api = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
sc-service = { branch = "polkadot-v0.9.32", features = ["wasmtime"], git = "https://github.com/paritytech/substrate" }
sc-sysinfo = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
sc-telemetry = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
sc-transaction-pool = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
sc-transaction-pool-api = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
sp-api = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
sp-block-builder = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
sp-blockchain = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
sp-consensus = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
sp-core = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
sp-inherents = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
sp-keyring = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
sp-offchain = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
sp-runtime = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
sp-session = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
sp-storage = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
sp-timestamp = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
sp-transaction-pool = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
sp-trie = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
substrate-frame-rpc-system = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
pallet-asset-tx-payment = { workspace = true, features = ["default"] }
pallet-transaction-payment = { workspace = true, features = ["default"] }
pallet-transaction-payment-rpc = { workspace = true }
pallet-transaction-payment-rpc-runtime-api = { workspace = true, features = ["default"] }
sc-basic-authorship = { workspace = true }
sc-cli = { workspace = true, features = ["wasmtime"] }
sc-client-api = { workspace = true }
sc-consensus = { workspace = true }
sc-executor = { workspace = true, features = ["wasmtime"] }
sc-keystore = { workspace = true }
sc-rpc = { workspace = true }
sc-rpc-api = { workspace = true }
sc-service = { workspace = true, features = ["wasmtime"] }
sc-sysinfo = { workspace = true }
sc-telemetry = { workspace = true }
sc-transaction-pool = { workspace = true }
sc-transaction-pool-api = { workspace = true }
sp-api = { workspace = true, features = ["default"] }
sp-block-builder = { workspace = true, features = ["default"] }
sp-blockchain = { workspace = true }
sp-consensus = { workspace = true }
sp-core = { workspace = true, features = ["default"] }
sp-inherents = { workspace = true, features = ["default"] }
sp-keyring = { workspace = true }
sp-offchain = { workspace = true, features = ["default"] }
sp-runtime = { workspace = true, features = ["default"] }
sp-session = { workspace = true, features = ["default"] }
sp-storage = { workspace = true }
sp-timestamp = { workspace = true }
sp-transaction-pool = { workspace = true, features = ["default"] }
sp-trie = { workspace = true }
substrate-frame-rpc-system = { workspace = true }

# Try-Runtime

try-runtime-cli = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate", optional = true }
try-runtime-cli = { workspace = true, optional = true }

# Benchmark

frame-benchmarking = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate", optional = true }
frame-benchmarking-cli = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
frame-benchmarking = { workspace = true, features = ["default"], optional = true }
frame-benchmarking-cli = { workspace = true }

# Cumulus

cumulus-client-cli = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/cumulus", optional = true }
cumulus-client-collator = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/cumulus", optional = true }
cumulus-client-consensus-common = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/cumulus", optional = true }
cumulus-client-consensus-relay-chain = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/cumulus", optional = true }
cumulus-client-network = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/cumulus", optional = true }
cumulus-client-service = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/cumulus", optional = true }
cumulus-primitives-core = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/cumulus", optional = true }
cumulus-primitives-parachain-inherent = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/cumulus", optional = true }
cumulus-relay-chain-inprocess-interface = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/cumulus", optional = true }
cumulus-relay-chain-interface = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/cumulus", optional = true }
cumulus-relay-chain-minimal-node = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/cumulus", optional = true }
cumulus-relay-chain-rpc-interface = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/cumulus", optional = true }
cumulus-client-cli = { workspace = true, optional = true }
cumulus-client-collator = { workspace = true, optional = true }
cumulus-client-consensus-common = { workspace = true, optional = true }
cumulus-client-consensus-relay-chain = { workspace = true, optional = true }
cumulus-client-network = { workspace = true, optional = true }
cumulus-client-service = { workspace = true, optional = true }
cumulus-primitives-core = { workspace = true, features = ["default"], optional = true }
cumulus-primitives-parachain-inherent = { workspace = true, optional = true }
cumulus-relay-chain-inprocess-interface = { workspace = true, optional = true }
cumulus-relay-chain-interface = { workspace = true, optional = true }
cumulus-relay-chain-minimal-node = { workspace = true, optional = true }
cumulus-relay-chain-rpc-interface = { workspace = true, optional = true }

# Parachain

moonbeam-vrf = { git = "https://github.com/zeitgeistpm/external", optional = true }
nimbus-consensus = { default-features = false, git = "https://github.com/zeitgeistpm/external", optional = true }
nimbus-primitives = { default-features = false, git = "https://github.com/zeitgeistpm/external", optional = true }
pallet-author-inherent = { default-features = false, git = "https://github.com/zeitgeistpm/external", optional = true }
pallet-parachain-staking = { default-features = false, git = "https://github.com/zeitgeistpm/external", optional = true }
parity-scale-codec = { optional = true, version = "3.0.0" }
sc-chain-spec = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate", optional = true }
sc-network = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate", optional = true }
sc-network-common = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate", optional = true }
sc-tracing = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate", optional = true }
serde = { features = ["derive"], optional = true, version = "1.0.144" }
session-keys-primitives = { default-features = false, git = "https://github.com/zeitgeistpm/external", optional = true }
sp-keystore = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate", optional = true }
substrate-prometheus-endpoint = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate", optional = true }
moonbeam-vrf = { workspace = true, optional = true }
nimbus-consensus = { workspace = true, optional = true }
nimbus-primitives = { workspace = true, features = ["default"], optional = true }
pallet-author-inherent = { workspace = true, features = ["default"], optional = true }
pallet-parachain-staking = { workspace = true, features = ["default"], optional = true }
parity-scale-codec = { workspace = true, features = ["default"], optional = true }
sc-chain-spec = { workspace = true, optional = true }
sc-network = { workspace = true, optional = true }
sc-network-common = { workspace = true, optional = true }
sc-tracing = { workspace = true, optional = true }
serde = { workspace = true, features = ["default"], optional = true }
session-keys-primitives = { workspace = true, features = ["default"], optional = true }
sp-keystore = { workspace = true, optional = true }
substrate-prometheus-endpoint = { workspace = true, optional = true }

# Polkadot

polkadot-cli = { branch = "release-v0.9.32", git = "https://github.com/paritytech/polkadot", optional = true }
polkadot-parachain = { branch = "release-v0.9.32", git = "https://github.com/paritytech/polkadot", optional = true }
polkadot-primitives = { branch = "release-v0.9.32", git = "https://github.com/paritytech/polkadot", optional = true }
polkadot-service = { branch = "release-v0.9.32", git = "https://github.com/paritytech/polkadot", optional = true }
polkadot-test-service = { branch = "release-v0.9.32", git = "https://github.com/paritytech/polkadot", optional = true }
polkadot-cli = { workspace = true, optional = true }
polkadot-parachain = { workspace = true, features = ["default"], optional = true }
polkadot-primitives = { workspace = true, features = ["default"], optional = true }
polkadot-service = { workspace = true, optional = true }
polkadot-test-service = { workspace = true, optional = true }

# Standalone

sc-consensus-aura = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
sc-finality-grandpa = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
sp-consensus-aura = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
sp-finality-grandpa = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
sc-consensus-aura = { workspace = true }
sc-finality-grandpa = { workspace = true }
sp-consensus-aura = { workspace = true }
sp-finality-grandpa = { workspace = true, features = ["default"] }

# Utility
cfg-if = { version = "1.0.0" }
clap = { version = "4.0.9", features = ["derive"] }
hex-literal = { version = "0.3.4" }
jsonrpsee = { version = "0.15.1", features = ["server"] }
log = { optional = true, version = "0.4.18" }
url = "2.2.2"
cfg-if = { workspace = true }
clap = { workspace = true, features = ["derive"] }
hex-literal = { workspace = true }
jsonrpsee = { workspace = true, features = ["server"] }
log = { workspace = true, optional = true }
url = { workspace = true }

# Zeitgeist

battery-station-runtime = { path = "../runtime/battery-station", optional = true }
zeitgeist-primitives = { path = "../primitives" }
zeitgeist-runtime = { path = "../runtime/zeitgeist", optional = true }
zrml-liquidity-mining = { path = "../zrml/liquidity-mining" }
zrml-swaps-rpc = { path = "../zrml/swaps/rpc" }
battery-station-runtime = { workspace = true, optional = true }
zeitgeist-primitives = { workspace = true, features = ["default"] }
zeitgeist-runtime = { workspace = true, optional = true }
zrml-liquidity-mining = { workspace = true, features = ["default"] }
zrml-swaps-rpc = { workspace = true }

[features]
default = ["with-battery-station-runtime", "with-zeitgeist-runtime"]
Expand Down
24 changes: 12 additions & 12 deletions primitives/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
[dependencies]
arbitrary = { default-features = false, optional = true, version = "1.0" }
frame-support = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
frame-system = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
orml-currencies = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library" }
orml-tokens = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library" }
orml-traits = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library" }
parity-scale-codec = { default-features = false, features = ["derive", "max-encoded-len"], version = "3.0.0" }
scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
serde = { default-features = false, features = ["derive"], optional = true, version = "1.0.144" }
sp-core = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
sp-runtime = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
arbitrary = { workspace = true, optional = true }
frame-support = { workspace = true }
frame-system = { workspace = true }
orml-currencies = { workspace = true }
orml-tokens = { workspace = true }
orml-traits = { workspace = true }
parity-scale-codec = { workspace = true, features = ["derive", "max-encoded-len"] }
scale-info = { workspace = true, features = ["derive"] }
serde = { workspace = true, features = ["derive"], optional = true }
sp-core = { workspace = true }
sp-runtime = { workspace = true }

[dev-dependencies]
test-case = "2.0.2"
test-case = { workspace = true }

[features]
default = ["std"]
Expand Down
Loading

0 comments on commit 37e1a16

Please sign in to comment.