Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use workspace.dependencies #2643

Merged
merged 9 commits into from
Nov 14, 2023
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove unused deps
  • Loading branch information
wangjj9219 committed Nov 11, 2023
commit 3aaa411c9528ebc7eaa7d52537fa036f89d062fc
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

219 changes: 80 additions & 139 deletions Cargo.toml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion node/Cargo.toml
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ name = "acala"
path = "src/main.rs"

[dependencies]
futures = "0.3.28"
futures = { workspace = true }
acala-cli = { workspace = true }
acala-service = { workspace = true }

28 changes: 14 additions & 14 deletions node/cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -5,9 +5,9 @@ authors = ["Acala Developers"]
edition = "2021"

[dependencies]
log = "0.4.17"
clap = { version = "4.4.2", features = ["derive"] }
parity-scale-codec = { version = "3.4.0" }
log = { workspace = true }
clap = { workspace = true, features = ["derive"] }
parity-scale-codec = { workspace = true }

sp-core = { workspace = true, features = ["std"], optional = true }
sc-cli = { workspace = true, optional = true }
@@ -28,12 +28,12 @@ polkadot-cli = { workspace = true }
polkadot-primitives ={ workspace = true }
polkadot-service = { workspace = true }

inspect = { package = "acala-inspect", path = "../../inspect" }
service = { package = "acala-service", path = "../service", default-features = false, optional = true }
acala-inspect = { workspace = true }
acala-service = { workspace = true, optional = true }

[build-dependencies]
orml-build-script-utils = { path = "../../orml/build-script-utils" }
substrate-build-script-utils = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
orml-build-script-utils = { workspace = true }
substrate-build-script-utils = { workspace = true }

[features]
default = [ "cli" ]
@@ -43,7 +43,7 @@ cli = [
"sp-core",
"sc-executor",
"sc-service",
"service",
"acala-service",
"sp-io",
"try-runtime-cli",
]
@@ -54,26 +54,26 @@ runtime-benchmarks = [
"polkadot-primitives/runtime-benchmarks",
"polkadot-service/runtime-benchmarks",
"sc-service/runtime-benchmarks",
"service/runtime-benchmarks",
"acala-service/runtime-benchmarks",
"sp-runtime/runtime-benchmarks",
]
try-runtime = [
"polkadot-cli/try-runtime",
"polkadot-service/try-runtime",
"service/try-runtime",
"acala-service/try-runtime",
"try-runtime-cli",
]
with-mandala-runtime = [
"service/with-mandala-runtime",
"acala-service/with-mandala-runtime",
]
with-karura-runtime = [
"service/with-karura-runtime",
"acala-service/with-karura-runtime",
]
with-acala-runtime = [
"service/with-acala-runtime",
"acala-service/with-acala-runtime",
]
with-all-runtime = [
"service/with-all-runtime",
"acala-service/with-all-runtime",
"with-acala-runtime",
"with-karura-runtime",
"with-mandala-runtime",
4 changes: 2 additions & 2 deletions node/cli/src/cli.rs
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ use clap::Parser;
use sc_cli::{KeySubcommand, SignCmd, VanityCmd, VerifyCmd};
use std::path::PathBuf;

use service::chain_spec;
use acala_service::chain_spec;

/// Possible subcommands of the main binary.
#[derive(Debug, Parser)]
@@ -44,7 +44,7 @@ pub enum Subcommand {
name = "inspect",
about = "Decode given block or extrinsic using current native runtime."
)]
Inspect(inspect::cli::InspectCmd),
Inspect(acala_inspect::cli::InspectCmd),

/// The custom benchmark subcommmand benchmarking runtime modules.
#[command(subcommand)]
2 changes: 1 addition & 1 deletion node/cli/src/command.rs
Original file line number Diff line number Diff line change
@@ -22,6 +22,7 @@
use std::net::SocketAddr;

use crate::cli::{Cli, RelayChainCli, Subcommand};
use acala_service::{chain_spec, new_partial, IdentifyVariant};
use cumulus_primitives_core::ParaId;
use frame_benchmarking_cli::{BenchmarkCmd, SUBSTRATE_REFERENCE_HARDWARE};
use log::info;
@@ -31,7 +32,6 @@ use sc_cli::{
};
use sc_executor::{sp_wasm_interface::ExtendedHostFunctions, NativeExecutionDispatch};
use sc_service::config::{BasePath, PrometheusConfig};
use service::{chain_spec, new_partial, IdentifyVariant};

fn chain_name() -> String {
"Acala".into()
27 changes: 13 additions & 14 deletions node/service/Cargo.toml
Original file line number Diff line number Diff line change
@@ -5,20 +5,19 @@ authors = ["Acala Developers"]
edition = "2021"

[dependencies]
log = "0.4.17"
async-trait = { version = "0.1.71" }
hex-literal = "0.4.1"
serde = { version = "1.0.143", features = ["derive"] }
serde_json = "1.0.81"
codec = { package = "parity-scale-codec", version = "3.4.0" }
futures = "0.3.28"
hex = "0.4.0"
jsonrpsee = { version = "0.16.2", features = ["server", "macros"] }

coins-bip32 = "0.7.0"
coins-bip39 = "0.7.0"
k256 = { version = "0.11.5", default-features = false, features = ["keccak256", "ecdsa", "std"] }
tiny-keccak = { version = "2.0", features = ["keccak"] }
log = { workspace = true }
async-trait = { workspace = true }
hex-literal = { workspace = true }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
parity-scale-codec = { workspace = true }
futures = { workspace = true }
hex = { workspace = true }
jsonrpsee = { workspace = true, features = ["server", "macros"] }
coins-bip32 = { workspace = true }
coins-bip39 = { workspace = true }
k256 = { workspace = true, features = ["keccak256", "ecdsa", "std"] }
tiny-keccak = { workspace = true, features = ["keccak"] }

sc-basic-authorship = { workspace = true }
sc-chain-spec = { workspace = true }