diff --git a/Cargo.lock b/Cargo.lock index 235b1f4035963..0293793f4bab2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7369,8 +7369,6 @@ dependencies = [ "futures", "hdrhistogram", "indicatif", - "jemalloc-ctl", - "jemallocator", "move-core-types", "multiaddr", "node", @@ -7745,7 +7743,6 @@ dependencies = [ name = "sui-macros" version = "0.7.0" dependencies = [ - "darling 0.14.1", "msim-macros", "proc-macro2 1.0.43", "quote 1.0.21", diff --git a/crates/sui-benchmark/Cargo.toml b/crates/sui-benchmark/Cargo.toml index ad72bf1110201..fc53a6c03d6cb 100644 --- a/crates/sui-benchmark/Cargo.toml +++ b/crates/sui-benchmark/Cargo.toml @@ -48,9 +48,5 @@ narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "9d667b470 workspace-hack = { path = "../workspace-hack"} test-utils = { path = "../test-utils" } -[target.'cfg(not(target_env = "msvc"))'.dependencies] -jemallocator = { version = "^0.5", features = ["profiling"] } -jemalloc-ctl = "^0.5" - [features] benchmark = ["narwhal-node/benchmark"] diff --git a/crates/sui-config/Cargo.toml b/crates/sui-config/Cargo.toml index c9f01a08e5d17..4bb0aaf3cb038 100644 --- a/crates/sui-config/Cargo.toml +++ b/crates/sui-config/Cargo.toml @@ -30,12 +30,14 @@ narwhal-crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "9d667b4 sui-framework = { path = "../sui-framework" } sui-adapter = { path = "../sui-adapter" } -sui-simulator = { path = "../sui-simulator" } sui-types = { path = "../sui-types" } workspace-hack = { path = "../workspace-hack"} sha3 = "0.10.4" digest = "0.10.3" +[target.'cfg(msim)'.dependencies] +sui-simulator = { path = "../sui-simulator" } + [dev-dependencies] insta = { version = "1.19.1", features = ["redactions", "yaml"] } tempfile = "3.3.0" diff --git a/crates/sui-macros/Cargo.toml b/crates/sui-macros/Cargo.toml index d237d0d3561ad..66f49fa43ed7d 100644 --- a/crates/sui-macros/Cargo.toml +++ b/crates/sui-macros/Cargo.toml @@ -10,7 +10,6 @@ edition = "2021" proc-macro = true [dependencies] -darling = "0.14" proc-macro2 = "1" quote = "1" syn = "1" diff --git a/crates/sui-swarm/Cargo.toml b/crates/sui-swarm/Cargo.toml index ca3456ffa6c43..bff7dcc985972 100644 --- a/crates/sui-swarm/Cargo.toml +++ b/crates/sui-swarm/Cargo.toml @@ -19,11 +19,13 @@ prometheus = "0.13.2" sui-config = { path = "../sui-config" } sui-node = { path = "../sui-node" } -sui-simulator = { path = "../sui-simulator" } sui-types = { path = "../sui-types" } mysten-network = "0.1.0" workspace-hack = { path = "../workspace-hack"} +[target.'cfg(msim)'.dependencies] +sui-simulator = { path = "../sui-simulator" } + [dev-dependencies] telemetry-subscribers = "0.1.0" diff --git a/crates/sui/Cargo.toml b/crates/sui/Cargo.toml index 7b46c7379ef40..37e8edc9b1385 100644 --- a/crates/sui/Cargo.toml +++ b/crates/sui/Cargo.toml @@ -27,7 +27,6 @@ sui-framework = { path = "../sui-framework" } sui-config = { path = "../sui-config" } sui-types = { path = "../sui-types" } sui-json = { path = "../sui-json" } -sui-simulator = { path = "../sui-simulator" } sui-swarm = { path = "../sui-swarm" } sui-json-rpc-types = { path = "../sui-json-rpc-types" } sui-sdk = { path = "../sui-sdk" } @@ -61,6 +60,9 @@ hex = "0.4.3" jemallocator = { version = "^0.5", features = ["profiling"] } jemalloc-ctl = "^0.5" +[target.'cfg(msim)'.dependencies] +sui-simulator = { path = "../sui-simulator" } + [dev-dependencies] tempfile = "3.3.0" futures = "0.3.23"