diff --git a/Cargo.lock b/Cargo.lock index 52dc7edf7df39..fbf6645edc44c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5484,7 +5484,7 @@ dependencies = [ "sui_storage", "telemetry-subscribers", "tempfile", - "test_utils", + "test-utils", "tokio", "tokio-util 0.7.2", "toml", @@ -5561,7 +5561,7 @@ dependencies = [ "sui-types", "sui_core", "tempfile", - "test_utils", + "test-utils", "thiserror", "tokio", "tower", @@ -5855,7 +5855,7 @@ dependencies = [ "temp_testdir", "tempfile", "test-fuzz", - "test_utils", + "test-utils", "thiserror", "tokio", "tokio-stream", @@ -6053,7 +6053,7 @@ dependencies = [ ] [[package]] -name = "test_utils" +name = "test-utils" version = "0.1.0" dependencies = [ "anyhow", diff --git a/Cargo.toml b/Cargo.toml index 8629481e45c97..6cf04636fec2a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,11 +16,11 @@ members = [ "crates/sui-types", "crates/sui-verifier", "crates/sui-verifier-transactional-tests", + "crates/test-utils", "crates/x", "sui", "sui_core", "sui_storage", - "test_utils", ] [profile.release] diff --git a/crates/sui-faucet/Cargo.toml b/crates/sui-faucet/Cargo.toml index 7f5e80ff08a8e..0d0e64720d307 100644 --- a/crates/sui-faucet/Cargo.toml +++ b/crates/sui-faucet/Cargo.toml @@ -26,7 +26,7 @@ sui_core = { path = "../../sui_core" } [dev-dependencies] tempfile = "3.3.0" -test_utils = { path = "../../test_utils" } +test-utils = { path = "../test-utils" } [[bin]] name = "sui-faucet" diff --git a/test_utils/Cargo.toml b/crates/test-utils/Cargo.toml similarity index 75% rename from test_utils/Cargo.toml rename to crates/test-utils/Cargo.toml index 49e2227403359..d4c085d08d11b 100644 --- a/test_utils/Cargo.toml +++ b/crates/test-utils/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "test_utils" +name = "test-utils" authors = ["Mysten Labs "] version = "0.1.0" license = "Apache-2.0" @@ -19,15 +19,15 @@ tracing = { version = "0.1.34", features = ["log"] } tempfile = "3.3.0" bcs = "0.1.3" -sui-adapter = { path = "../crates/sui-adapter" } -sui-framework = { path = "../crates/sui-framework" } +sui-adapter = { path = "../sui-adapter" } +sui-framework = { path = "../sui-framework" } move-package = { git = "https://github.com/move-language/move", rev = "1b2d3b4274345f5b4b6a1a1bde5aee452003ab5b" } move-core-types = { git = "https://github.com/move-language/move", rev = "1b2d3b4274345f5b4b6a1a1bde5aee452003ab5b", features = ["address20"] } typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev ="7c247967e5a5abd59ecaa75bc62b05bcdf4503fe"} narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "2c5e8236c0702a3ff47dd769c2bbc94b029bf4a9", package = "config" } -sui-config = { path = "../crates/sui-config" } -sui-types = { path = "../crates/sui-types" } -sui_core = { path = "../sui_core" } -sui-network = { path = "../crates/sui-network" } -sui = { path = "../sui" } +sui-config = { path = "../sui-config" } +sui-types = { path = "../sui-types" } +sui_core = { path = "../../sui_core" } +sui-network = { path = "../sui-network" } +sui = { path = "../../sui" } diff --git a/test_utils/src/authority.rs b/crates/test-utils/src/authority.rs similarity index 100% rename from test_utils/src/authority.rs rename to crates/test-utils/src/authority.rs diff --git a/test_utils/src/lib.rs b/crates/test-utils/src/lib.rs similarity index 100% rename from test_utils/src/lib.rs rename to crates/test-utils/src/lib.rs diff --git a/test_utils/src/messages.rs b/crates/test-utils/src/messages.rs similarity index 98% rename from test_utils/src/messages.rs rename to crates/test-utils/src/messages.rs index 81d80fdb9c3bf..13a3ee5db7fc8 100644 --- a/test_utils/src/messages.rs +++ b/crates/test-utils/src/messages.rs @@ -76,7 +76,7 @@ pub fn test_shared_object_transactions() -> Vec { pub fn publish_move_package_transaction(gas_object: Object) -> Transaction { let build_config = BuildConfig::default(); let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR")); - path.push("../sui_programmability/examples/basics"); + path.push("../../sui_programmability/examples/basics"); let modules = sui_framework::build_move_package(&path, build_config, false).unwrap(); let all_module_bytes = modules diff --git a/test_utils/src/network.rs b/crates/test-utils/src/network.rs similarity index 100% rename from test_utils/src/network.rs rename to crates/test-utils/src/network.rs diff --git a/test_utils/src/objects.rs b/crates/test-utils/src/objects.rs similarity index 100% rename from test_utils/src/objects.rs rename to crates/test-utils/src/objects.rs diff --git a/sui/Cargo.toml b/sui/Cargo.toml index 21fb1f6d7dc6b..1511248c4cd66 100644 --- a/sui/Cargo.toml +++ b/sui/Cargo.toml @@ -79,7 +79,7 @@ pretty_assertions = "1.2.0" tokio-util = { version = "0.7.2", features = ["codec"] } sui-node = { path = "../crates/sui-node" } -test_utils = { path = "../test_utils" } +test-utils = { path = "../crates/test-utils" } [features] benchmark = ["narwhal-node/benchmark"] diff --git a/sui_core/Cargo.toml b/sui_core/Cargo.toml index f236e1a222f4d..9230384b8f102 100644 --- a/sui_core/Cargo.toml +++ b/sui_core/Cargo.toml @@ -74,7 +74,7 @@ tracing-test = "0.2.1" tracing-subscriber = "^0.3" test-fuzz = "3.0.2" -test_utils = { path = "../test_utils" } +test-utils = { path = "../crates/test-utils" } [[example]] name = "generate-format"