Skip to content

Commit

Permalink
Revert "Update msim pointer to latest commit (#18282)"
Browse files Browse the repository at this point in the history
This reverts commit 285d403.
  • Loading branch information
halfprice authored Jun 18, 2024
1 parent 6ff84a6 commit 929a335
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock

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

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -375,8 +375,8 @@ moka = { version = "0.12", default-features = false, features = [
"atomic64",
] }
more-asserts = "0.3.1"
msim = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "862e52287eea423d132d462879631dad8e346147", package = "msim" }
msim-macros = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "862e52287eea423d132d462879631dad8e346147", package = "msim-macros" }
msim = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "3a490f1f1035cc6b7845f6a82d697ce47b067fd9", package = "msim" }
msim-macros = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "3a490f1f1035cc6b7845f6a82d697ce47b067fd9", package = "msim-macros" }
multiaddr = "0.17.0"
nexlint = { git = "https://github.com/nextest-rs/nexlint.git", rev = "94da5c787636dad779c340affa65219134d127f5" }
nexlint-lints = { git = "https://github.com/nextest-rs/nexlint.git", rev = "94da5c787636dad779c340affa65219134d127f5" }
Expand Down
4 changes: 2 additions & 2 deletions scripts/simtest/cargo-simtest
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ if [ -n "$LOCAL_MSIM_PATH" ]; then
else
cargo_patch_args=(
--config 'patch.crates-io.tokio.git = "https://github.com/MystenLabs/mysten-sim.git"'
--config 'patch.crates-io.tokio.rev = "862e52287eea423d132d462879631dad8e346147"'
--config 'patch.crates-io.tokio.rev = "3a490f1f1035cc6b7845f6a82d697ce47b067fd9"'
--config 'patch.crates-io.futures-timer.git = "https://github.com/MystenLabs/mysten-sim.git"'
--config 'patch.crates-io.futures-timer.rev = "862e52287eea423d132d462879631dad8e346147"'
--config 'patch.crates-io.futures-timer.rev = "3a490f1f1035cc6b7845f6a82d697ce47b067fd9"'
)
fi

Expand Down
4 changes: 2 additions & 2 deletions scripts/simtest/config-patch
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ index c0829bc1b6..4007f97d66 100644
include_dir = "0.7.3"
+
+[patch.crates-io]
+tokio = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "862e52287eea423d132d462879631dad8e346147" }
+futures-timer = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "862e52287eea423d132d462879631dad8e346147" }
+tokio = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "3a490f1f1035cc6b7845f6a82d697ce47b067fd9" }
+futures-timer = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "3a490f1f1035cc6b7845f6a82d697ce47b067fd9" }

0 comments on commit 929a335

Please sign in to comment.