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.

Sign up for GitHub

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

Jump to bottom

Move mysten-infra dependencies to common Cargo file #4791

Merged
merged 1 commit into from
Sep 26, 2022
Merged

Move mysten-infra dependencies to common Cargo file #4791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,13 @@ opt-level = 1
# Dependencies that should be kept in sync through the whole workspace
[workspace.dependencies]

# github.com/MystenLabs/mysten-infra dependencies
typed-store = "0.1.0"
typed-store-derive = "0.1.0"
telemetry-subscribers = "0.1.0"
mysten-network = "0.1.0"
name-variant = "0.1.0"

# Move dependencies
move-binary-format = { git = "https://github.com/move-language/move", rev = "e1e647b73dbd3652aabb2020728a4a517c26e28e" }
move-bytecode-utils = { git = "https://github.com/move-language/move", rev = "e1e647b73dbd3652aabb2020728a4a517c26e28e" }
Expand Down
2 changes: 1 addition & 1 deletion crates/sui-benchmark/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ rocksdb = "0.19.0"
serde_with = { version = "1.14.0", features = ["hex"] }
tracing = "0.1.36"
tracing-subscriber = { version = "0.3.15", features = ["time", "registry", "env-filter"] }
telemetry-subscribers = "0.1.0"
telemetry-subscribers.workspace = true
clap = { version = "3.1.17", features = ["derive"] }
prometheus = "0.13.2"
multiaddr = "0.14.0"
Expand Down
2 changes: 1 addition & 1 deletion crates/sui-cluster-test/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ tokio = { version = "1.20.1", features = ["full"] }
tracing = { version = "0.1.36", features = ["log"] }
clap = { version = "3.1.14", features = ["derive"] }
reqwest = { version = "0.11.11", features = ["blocking", "json"] }
telemetry-subscribers = "0.1.0"
telemetry-subscribers.workspace = true
async-trait = "0.1.57"
anyhow = { version = "1.0.64", features = ["backtrace"] }
bcs = "0.1.3"
Expand Down
8 changes: 4 additions & 4 deletions crates/sui-core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ move-bytecode-utils.workspace = true
move-core-types.workspace = true
move-vm-runtime.workspace = true

typed-store = "0.1.0"
typed-store-derive = "0.1.0"
mysten-network = "0.1.0"
typed-store.workspace = true
typed-store-derive.workspace = true
mysten-network.workspace = true

narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "5f4b7d3f4edb1fd2e1a2789a2b7167fffe2ff28d" }
narwhal-consensus = { git = "https://github.com/MystenLabs/narwhal", rev = "5f4b7d3f4edb1fd2e1a2789a2b7167fffe2ff28d" }
Expand All @@ -69,7 +69,7 @@ move-package.workspace = true
serde-reflection = "0.3.6"
serde_yaml = "0.8.26"
pretty_assertions = "1.2.1"
telemetry-subscribers = "0.1.0"
telemetry-subscribers.workspace = true

test-fuzz = "3.0.4"
test-utils = { path = "../test-utils" }
Expand Down
2 changes: 1 addition & 1 deletion crates/sui-faucet/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ sui-node = { path = "../sui-node" }
sui-json-rpc-types= { path = "../sui-json-rpc-types" }
sui-types = { path = "../sui-types" }
sui-config = { path = "../sui-config" }
telemetry-subscribers = "0.1.0"
telemetry-subscribers.workspace = true
workspace-hack = { path = "../workspace-hack"}

[dev-dependencies]
Expand Down
4 changes: 2 additions & 2 deletions crates/sui-gateway/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ tokio = { version = "1.20.1", features = ["full"] }
futures = "0.3.23"
prometheus = "0.13.2"
clap = { version = "3.2.17", features = ["derive"] }
telemetry-subscribers = "0.1.0"
telemetry-subscribers.workspace = true

sui-core = { path = "../sui-core" }
sui-config = { path = "../sui-config" }
Expand All @@ -26,7 +26,7 @@ sui-json-rpc-types= { path = "../sui-json-rpc-types" }
sui-node = { path = "../sui-node" }


mysten-network = "0.1.0"
mysten-network.workspace = true
move-package.workspace = true
workspace-hack = { path = "../workspace-hack"}

Expand Down
3 changes: 1 addition & 2 deletions crates/sui-network/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ tonic = "0.7"

sui-types = { path = "../sui-types" }


mysten-network = "0.1.0"
mysten-network.workspace = true
workspace-hack = { path = "../workspace-hack"}

[build-dependencies]
Expand Down
6 changes: 3 additions & 3 deletions crates/sui-node/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ tokio = { version = "1.20.1", features = ["full"] }
tracing = "0.1.36"
parking_lot = "0.12.1"
futures = "0.3.23"
typed-store = "0.1.0"
typed-store.workspace = true
chrono = "0.4.0"

sui-config = { path = "../sui-config" }
Expand All @@ -27,8 +27,8 @@ sui-json-rpc = { path = "../sui-json-rpc" }
sui-telemetry = { path = "../sui-telemetry" }
sui-types = { path = "../sui-types" }

telemetry-subscribers = "0.1.0"
mysten-network = "0.1.0"
telemetry-subscribers.workspace = true
mysten-network.workspace = true
workspace-hack = { path = "../workspace-hack"}

[target.'cfg(not(target_env = "msvc"))'.dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crates/sui-simulator/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ edition = "2021"
[dependencies]
workspace-hack = { path = "../workspace-hack"}
sui-framework = { path = "../sui-framework" }
telemetry-subscribers = "0.1.0"
telemetry-subscribers.workspace = true
tracing = "0.1"

[target.'cfg(msim)'.dependencies]
Expand Down
6 changes: 3 additions & 3 deletions crates/sui-storage/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ tempfile = "3.3.0"
tap = "1.0.1"

sui-types = { path = "../sui-types" }
typed-store = "0.1.0"
typed-store-derive = "0.1.0"
typed-store.workspace = true
typed-store-derive.workspace = true
move-core-types.workspace = true
sui-json-rpc-types = { path = "../sui-json-rpc-types" }
workspace-hack = { path = "../workspace-hack"}
Expand All @@ -39,7 +39,7 @@ anyhow = "1.0.64"
tempfile = "3.3.0"
num_cpus = "1.13.1"
pretty_assertions = "1.2.0"
telemetry-subscribers = "0.1.0"
telemetry-subscribers.workspace = true

[[bench]]
name = "write_ahead_log"
Expand Down
4 changes: 2 additions & 2 deletions crates/sui-swarm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ sui-config = { path = "../sui-config" }
sui-node = { path = "../sui-node" }
sui-types = { path = "../sui-types" }

mysten-network = "0.1.0"
mysten-network.workspace = true
workspace-hack = { path = "../workspace-hack"}

[target.'cfg(msim)'.dependencies]
sui-simulator = { path = "../sui-simulator" }

[dev-dependencies]
telemetry-subscribers = "0.1.0"
telemetry-subscribers.workspace = true
8 changes: 4 additions & 4 deletions crates/sui-tool/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ tokio = { version = "1.20.1", features = ["full"] }
tracing = "0.1.36"
clap = { version = "3.2.17", features = ["derive"] }

telemetry-subscribers = "0.1.0"
mysten-network = "0.1.0"
telemetry-subscribers.workspace = true
mysten-network.workspace = true
textwrap = "0.15"
futures = "0.3.23"
rocksdb = "0.19.0"
typed-store = "0.1.0"
typed-store-derive = "0.1.0"
typed-store.workspace = true
typed-store-derive.workspace = true
tempfile = "3.3.0"
narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "5f4b7d3f4edb1fd2e1a2789a2b7167fffe2ff28d" }
serde_with = { version = "1.14.0", features = ["hex"] }
Expand Down
4 changes: 2 additions & 2 deletions crates/sui-types/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ eyre = "0.6.8"
bip32 = "0.4.0"
slip10_ed25519 = "0.1.3"

name-variant = "0.1.0"
typed-store = "0.1.0"
name-variant.workspace = true
typed-store.workspace = true

move-binary-format.workspace = true
move-bytecode-utils.workspace = true
Expand Down
10 changes: 5 additions & 5 deletions crates/sui/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ serde_with = { version = "1.14.0", features = ["hex"] }
tracing = "0.1.36"
bcs = "0.1.3"
clap = { version = "3.2.17", features = ["derive"] }
telemetry-subscribers = "0.1.0"
telemetry-subscribers.workspace = true
bip32 = "0.4.0"

sui-core = { path = "../sui-core" }
Expand All @@ -39,8 +39,8 @@ colored = "2.0.0"
unescape = "0.1.0"
shell-words = "1.1.0"
rocksdb = "0.19.0"
typed-store = "0.1.0"
typed-store-derive = "0.1.0"
typed-store.workspace = true
typed-store-derive.workspace = true

tempfile = "3.3.0"
narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "5f4b7d3f4edb1fd2e1a2789a2b7167fffe2ff28d" }
Expand All @@ -65,8 +65,8 @@ tempfile = "3.3.0"
futures = "0.3.23"
prometheus = "0.13.2"

typed-store = "0.1.0"
typed-store-derive = "0.1.0"
typed-store.workspace = true
typed-store-derive.workspace = true
jsonrpsee = { version = "0.15.1", features = ["full"] }

test-utils = { path = "../test-utils" }
Expand Down