Skip to content

Commit

Permalink
[refactor] #3289: Use workspace inheritance
Browse files Browse the repository at this point in the history
Signed-off-by: Nikita Strygin <DCNick3@users.noreply.github.com>
  • Loading branch information
DCNick3 authored and mversic committed Oct 17, 2023
1 parent fe20aad commit baa0e63
Show file tree
Hide file tree
Showing 39 changed files with 522 additions and 428 deletions.
47 changes: 12 additions & 35 deletions Cargo.lock

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

112 changes: 112 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,117 @@ license = "Apache-2.0"
keywords = ["blockchain", "crypto", "iroha", "ledger"]
categories = ["cryptography::cryptocurrencies"]

[workspace.dependencies]
iroha = { path = "cli" }
iroha_cli_derive = { version = "=2.0.0-pre-rc.16", path = "cli/derive" }
iroha_macro_utils = { version = "=2.0.0-pre-rc.16", path = "macro/utils" }
iroha_wasm_builder = { version = "=2.0.0-pre-rc.16", path = "wasm_builder" }
iroha_telemetry = { version = "=2.0.0-pre-rc.16", path = "telemetry" }
iroha_telemetry_derive = { version = "=2.0.0-pre-rc.16", path = "telemetry/derive" }
iroha_p2p = { version = "=2.0.0-pre-rc.16", path = "p2p" }
iroha_data_model_derive = { version = "=2.0.0-pre-rc.16", path = "data_model/derive" }
iroha_core = { version = "=2.0.0-pre-rc.16", path = "core" }
iroha_primitives = { version = "=2.0.0-pre-rc.16", path = "primitives", default-features = false }
iroha_primitives_derive = { version = "=2.0.0-pre-rc.16", path = "primitives/derive" }
iroha_data_model = { version = "=2.0.0-pre-rc.16", path = "data_model" }
iroha_client = { version = "=2.0.0-pre-rc.16", path = "client" }
iroha_config = { version = "=2.0.0-pre-rc.16", path = "config" }
iroha_config_base = { version = "=2.0.0-pre-rc.16", path = "config/base" }
iroha_config_derive = { version = "=2.0.0-pre-rc.16", path = "config/base/derive" }
iroha_schema_gen = { version = "=2.0.0-pre-rc.16", path = "schema/gen" }
iroha_schema = { version = "=2.0.0-pre-rc.16", path = "schema", default-features = false }
iroha_schema_derive = { version = "=2.0.0-pre-rc.16", path = "schema/derive" }
iroha_logger = { version = "=2.0.0-pre-rc.16", path = "logger" }
iroha_crypto = { version = "=2.0.0-pre-rc.16", path = "crypto", default-features = false }
iroha_macro = { version = "=2.0.0-pre-rc.16", path = "macro", default-features = false }
iroha_derive = { version = "=2.0.0-pre-rc.16", path = "macro/derive" }
iroha_futures = { version = "=2.0.0-pre-rc.16", path = "futures" }
iroha_futures_derive = { version = "=2.0.0-pre-rc.16", path = "futures/derive" }
iroha_genesis = { version = "=2.0.0-pre-rc.16", path = "genesis" }
iroha_ffi = { version = "=2.0.0-pre-rc.16", path = "ffi" }
iroha_ffi_derive = { version = "=2.0.0-pre-rc.16", path = "ffi/derive" }
iroha_version = { version = "=2.0.0-pre-rc.16", path = "version", default-features = false }
iroha_version_derive = { version = "=2.0.0-pre-rc.16", path = "version/derive", default-features = false }
iroha_wasm_codec = { version = "=2.0.0-pre-rc.16", path = "wasm_codec" }
test_network = { version = "=2.0.0-pre-rc.16", path = "core/test_network" }

proc-macro-error = "1.0.4"
proc-macro2 = "1.0.49"
syn = { version = "1.0.107", default-features = false }
quote = "1.0.23"

futures = { version = "0.3.25", default-features = false }
async-stream = "0.3.3"
tokio = "1.23.0"
tokio-stream = "0.1.11"
tokio-tungstenite = "0.17.2"

crossbeam = "0.8.2"
crossbeam-queue = "0.3.8"
parking_lot = { version = "0.12.1" }

once_cell = "1.16.0"
tempfile = "3.3.0"
path-absolutize = "3.1.0"
pathdiff = "0.2.1"
itertools = "0.10.5"
bytes = "1.4.0"

vergen = { version = "8.1.1", default-features = false }
trybuild = "1.0.73"

base64 = { version = "0.13.1", default-features = false }
hex = { version = "0.4.3", default-features = false }

fixnum = { version = "0.9.1", default-features = false }
url = "2.3.1"
prometheus = { version = "0.13.3", default-features = false }

clap = "4.2.1"
owo-colors = "3.5.0"
supports-color = "2.0.0"
inquire = "0.6.2"
spinoff = "0.7.0"
duct = "0.13.6"

criterion = "0.3.6"
proptest = "1.0.0"
expect-test = "1.4.1"

eyre = "0.6.8"
color-eyre = "0.6.2"
thiserror = { version = "1.0.38", default-features = false }

cfg-if = "1.0.0"
derive_more = { version = "0.99.17", default-features = false }
async-trait = "0.1.60"
strum = { version = "0.24.1", default-features = false }
getset = "0.1.2"
hex-literal = "0.3.4"

ursa = "0.3.7"
aead = "0.3.2"

rand = "0.8.5"
warp = { version = "0.3.3", default-features = false }
wasmtime = "0.39.1"

tracing = "0.1.37"
tracing-core = "0.1.30"
tracing-subscriber = { version = "0.3.16", default-features = false }
tracing-futures = { version = "0.2.5", default-features = false }
tracing-bunyan-formatter = { version = "0.3.4", default-features = false }

dashmap = "5.4.0"
rustc-hash = "1.1.0"

serde = { version = "1.0.151", default-features = false }
serde_json = { version = "1.0.91", default-features = false }
serde_yaml = "0.9.21"
serde_with = { version = "2.2.0", default-features = false }
parity-scale-codec = { version = "3.2.1", default-features = false }
json5 = "0.4.1"

[workspace]
resolver = "2"
members = [
Expand Down Expand Up @@ -55,6 +166,7 @@ members = [
"wasm_builder",
]


[profile.deploy]
inherits = "release"
opt-level = 3
Expand Down
64 changes: 32 additions & 32 deletions cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,45 +39,45 @@ is-it-maintained-open-issues = { repository = "https://github.com/hyperledger/ir
maintenance = { status = "actively-developed" }

[dependencies]
iroha_core = { version = "=2.0.0-pre-rc.16", path = "../core" }
iroha_macro = { version = "=2.0.0-pre-rc.16", path = "../macro" }
iroha_logger = { version = "=2.0.0-pre-rc.16", path = "../logger" }
iroha_futures = { version = "=2.0.0-pre-rc.16", path = "../futures" }
iroha_data_model = { version = "=2.0.0-pre-rc.16", path = "../data_model", features = ["http"] }
iroha_telemetry = { version = "=2.0.0-pre-rc.16", path = "../telemetry", optional = true }
iroha_version = { version = "=2.0.0-pre-rc.16", path = "../version", features = ["http"] }
iroha_config = { version = "=2.0.0-pre-rc.16", path = "../config" }
iroha_crypto = { version = "=2.0.0-pre-rc.16", path = "../crypto" }
iroha_p2p = { version = "=2.0.0-pre-rc.16", path = "../p2p" }
iroha_schema_gen = { version = "=2.0.0-pre-rc.16", path = "../schema/gen", optional = true }
iroha_cli_derive = { version = "=2.0.0-pre-rc.16", path = "derive" }
iroha_genesis = { version = "=2.0.0-pre-rc.16", path = "../genesis" }
iroha_wasm_builder = { version = "=2.0.0-pre-rc.16", path = "../wasm_builder" }
iroha_core = { workspace = true }
iroha_macro = { workspace = true }
iroha_logger = { workspace = true }
iroha_futures = { workspace = true }
iroha_data_model = { workspace = true, features = ["http"] }
iroha_telemetry = { workspace = true, optional = true }
iroha_version = { workspace = true, features = ["http"] }
iroha_config = { workspace = true }
iroha_crypto = { workspace = true }
iroha_p2p = { workspace = true }
iroha_schema_gen = { workspace = true, optional = true }
iroha_cli_derive = { workspace = true }
iroha_genesis = { workspace = true }
iroha_wasm_builder = { workspace = true }


async-trait = "0.1.60"
color-eyre = "0.6.2"
eyre = "0.6.8"
tracing = "0.1.37"
futures = { version = "0.3.25", default-features = false, features = ["std", "async-await"] }
parity-scale-codec = { version = "3.2.1", default-features = false, features = ["derive"] }
serde = { version = "1.0.151", features = ["derive"] }
serde_json = "1.0.91"
thiserror = "1.0.38"
tokio = { version = "1.23.0", features = ["sync", "time", "rt", "io-util", "rt-multi-thread", "macros", "fs", "signal"] }
warp = "0.3.3"
async-trait = { workspace = true }
color-eyre = { workspace = true }
eyre = { workspace = true }
tracing = { workspace = true }
futures = { workspace = true, features = ["std", "async-await"] }
parity-scale-codec = { workspace = true, features = ["derive"] }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
thiserror = { workspace = true }
tokio = { workspace = true, features = ["sync", "time", "rt", "io-util", "rt-multi-thread", "macros", "fs", "signal"] }
warp = { workspace = true, features = ["multipart", "websocket"] }
serial_test = "0.8.0"
once_cell = "1.16.0"
owo-colors = { version = "3.5.0", features = ["supports-colors"] }
supports-color = "2.0.0"
once_cell = { workspace = true }
owo-colors = { workspace = true, features = ["supports-colors"] }
supports-color = { workspace = true }
thread-local-panic-hook = { version = "0.1.0", optional = true }
tempfile = "3.3.0"
tempfile = { workspace = true }

[build-dependencies]
iroha_wasm_builder = { version = "=2.0.0-pre-rc.16", path = "../wasm_builder" }
eyre = "0.6.8"
iroha_wasm_builder = { workspace = true }
eyre = { workspace = true }

vergen = { version = "8.1.1", default-features = false, features = ["cargo"] }
vergen = { workspace = true, features = ["cargo"] }

[package.metadata.cargo-all-features]
denylist = [
Expand Down
Loading

0 comments on commit baa0e63

Please sign in to comment.