Make tokio a workspace dep, and update it to 1.22.0, update mysten-si…

…m pointer (MystenLabs#6434)

* Make tokio a workspace dep, and update it to 1.22.0

* Update mysten-sim pointer

Cargo.toml

@@ -96,6 +96,8 @@ opt-level = 1
 # Dependencies that should be kept in sync through the whole workspace
 [workspace.dependencies]
 
+tokio = "1.22.0"
+
 # Move dependencies
 move-binary-format = { git = "https://github.com/move-language/move", rev = "0800fc79a98ca304bd449878f545cdcaff6f94bb" }
 move-bytecode-utils = { git = "https://github.com/move-language/move", rev = "0800fc79a98ca304bd449878f545cdcaff6f94bb" }

crates/component/Cargo.toml

@@ -12,5 +12,5 @@ publish = false
 [dependencies]
 async-trait = "0.1.56"
 eyre = "0.6.8"
-tokio = { version = "1.21.2", features = ["sync", "macros", "rt", "rt-multi-thread"] }
+tokio = { workspace = true, features = ["sync", "macros", "rt", "rt-multi-thread"] }
 workspace-hack.workspace = true

crates/mysten-network/Cargo.toml

@@ -15,7 +15,7 @@ futures = "0.3.21"
 http = "0.2.8"
 multiaddr = "0.16.0"
 serde = { version = "1.0.140", features = ["derive"] }
-tokio = { version = "1.21.2", features = ["sync", "rt", "macros"] }
+tokio = { workspace = true, features = ["sync", "rt", "macros"] }
 tokio-stream = { version = "0.1.11", features = ["net"] }
 tonic = { version = "0.8.2", features = ["transport"] }
 tonic-health = "0.7.0"

crates/sui-benchmark/Cargo.toml

@@ -14,7 +14,7 @@ futures = "0.3.23"
 serde = { version = "1.0.144", features = ["derive"] }
 serde_json = "1.0.88"
 tempfile = "3.3.0"
-tokio = { version = "1.20.1", features = ["full"] }
+tokio = { workspace = true, features = ["full"] }
 strum = "0.24.1"
 strum_macros = "0.24.3"
 num_cpus = "1.13.1"

crates/sui-cluster-test/Cargo.toml

@@ -11,7 +11,7 @@ serde = { version = "1.0.144", features = ["derive"] }
 futures = "0.3.24"
 serde_json = "1.0.88"
 tempfile = "3.3.0"
-tokio = { version = "1.20.1", features = ["full"] }
+tokio = { workspace = true, features = ["full"] }
 jsonrpsee = { version = "0.15.1", features = ["full"] }
 tracing = { version = "0.1.36", features = ["log"] }
 clap = { version = "3.1.14", features = ["derive"] }

crates/sui-core/Cargo.toml

@@ -16,7 +16,7 @@ bytes = "1.3.0"
 serde = { version = "1.0.144", features = ["derive"] }
 serde_json = "1.0.88"
 serde_with = "2.0.1"
-tokio = { version = "1.20.1", features = ["full", "tracing", "test-util"] }
+tokio = { workspace = true, features = ["full", "tracing", "test-util"] }
 tokio-stream = { version = "0.1.8", features = ["sync", "net"] }
 parking_lot = "0.12.1"
 async-trait = "0.1.57"

crates/sui-cost/Cargo.toml

@@ -10,7 +10,7 @@ edition = "2021"
 workspace-hack.workspace = true
 sui-types = {path = "../sui-types"}
 anyhow = { version = "1.0.64", features = ["backtrace"] }
-tokio = { version = "1.20.1", features = ["full"] }
+tokio = { workspace = true, features = ["full"] }
 serde = { version = "1.0.144", features = ["derive"] }
 strum = { version = "0.24", features = ["derive"] }
 strum_macros = "0.24"

crates/sui-faucet/Cargo.toml

@@ -12,7 +12,7 @@ async-trait = "0.1.57"
 axum = "0.5.16"
 clap = { version = "3.2.17", features = ["derive"] }
 thiserror = "1.0.34"
-tokio = { version = "1.20.1", features = ["full"] }
+tokio = { workspace = true, features = ["full"] }
 tracing = "0.1.36"
 serde = { version = "1.0.144", features = ["derive"] }
 tower = { version = "0.4.12", features = ["util", "timeout", "load-shed", "limit"] }

crates/sui-gateway/Cargo.toml

@@ -11,7 +11,7 @@ anyhow = { version = "1.0.64", features = ["backtrace"] }
 async-trait = "0.1.57"
 serde = { version = "1.0.144", features = ["derive"] }
 tracing = "0.1.36"
-tokio = { version = "1.20.1", features = ["full"] }
+tokio = { workspace = true, features = ["full"] }
 futures = "0.3.23"
 prometheus = "0.13.3"
 clap = { version = "3.2.17", features = ["derive"] }

crates/sui-indexer/Cargo.toml

@@ -23,7 +23,7 @@ serde = { version = "1.0.144", features = ["derive"] }
 serde_json = "1.0.83"
 thiserror = "1.0.34"
 tracing = "0.1.36"
-tokio = { version = "1.20.1", features = ["full"] }
+tokio = { workspace = true, features = ["full"] }
 
 narwhal-network = { path = "../../narwhal/network" }
 sui = { path = "../sui" }

crates/sui-json-rpc/Cargo.toml

@@ -20,7 +20,7 @@ tracing = "0.1.36"
 async-trait = "0.1.57"
 serde = { version = "1.0.144", features = ["derive"] }
 futures = "0.3.23"
-tokio = { version = "1.20.1", features = ["full"] }
+tokio = { workspace = true, features = ["full"] }
 signature = "1.6.0"
 
 tap = "1.0"

crates/sui-macros/Cargo.toml

@@ -16,4 +16,4 @@ syn = "1"
 workspace-hack.workspace = true
 
 [target.'cfg(msim)'.dependencies]
-msim-macros = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "7d2bb66f4310f23b14ea6f1df2dab0a1d84af1f2", package = "msim-macros" }
+msim-macros = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "86ce6eaf4bf03288ba339b464ddb15d9a26bb001", package = "msim-macros" }

crates/sui-metrics/Cargo.toml

@@ -12,5 +12,5 @@ tracing = "0.1"
 scopeguard = "1"
 prometheus = "0.13"
 once_cell = "1"
-tokio = "1"
+tokio = { workspace = true }
 tap = "1.0"

crates/sui-network/Cargo.toml

@@ -17,7 +17,7 @@ sui-config = { path = "../sui-config" }
 
 mysten-network.workspace = true
 workspace-hack.workspace = true
-tokio = { version = "1.17.0", features = ["full"] }
+tokio = { workspace = true, features = ["full"] }
 tracing = "0.1.37"
 futures = "0.3.24"
 multiaddr = "0.16.0"
@@ -31,4 +31,4 @@ tonic-build = { version = "0.8.2", features = [ "transport" ] }
 
 [dev-dependencies]
 telemetry-subscribers.workspace = true
-tokio = { version = "1.17.0", features = ["test-util"] }
+tokio = { workspace = true, features = ["test-util"] }