Clean up a few circular dependencies (#13052)

## Description Clean up a few circular dependencies. Some are due to unused dependencies, some are due to end-to-end tests embedded in the crate, moving out the tests help. ## Test Plan CI --- If your changes are not user-facing and not a breaking change, you can skip the following section. Otherwise, please indicate what changed, and then add to the Release Notes section as highlighted during the release process. ### Type of Change (Check all that apply) - [ ] protocol change - [ ] user-visible impact - [ ] breaking change for a client SDKs - [ ] breaking change for FNs (FN binary must upgrade) - [ ] breaking change for validators or node operators (must upgrade binaries) - [ ] breaking change for on-chain data layout - [ ] necessitate either a data wipe or data migration ### Release notes
MystenLabs · Jul 19, 2023 · 2f1edb7 · 2f1edb7 · github-actions · Jul 20, 2023
1 parent bf7e088
commit 2f1edb7
Show file tree

Hide file tree

Showing 17 changed files with 96 additions and 50 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -91,6 +91,7 @@ members = [
     "crates/sui-indexer",
     "crates/sui-json",
     "crates/sui-json-rpc",
+    "crates/sui-json-rpc-tests",
     "crates/sui-json-rpc-types",
     "crates/sui-keys",
     "crates/sui-macros",

diff --git a/crates/sui-sdk/tests/stream_tests.rs → ...s/sui-e2e-tests/tests/sdk_stream_tests.rs b/crates/sui-sdk/tests/stream_tests.rs → ...s/sui-e2e-tests/tests/sdk_stream_tests.rs
diff --git a/crates/sui-json-rpc-tests/Cargo.toml b/crates/sui-json-rpc-tests/Cargo.toml
@@ -0,0 +1,43 @@
+[package]
+name = "sui-json-rpc-tests"
+version = "0.0.0"
+authors = ["Mysten Labs <[email protected]>"]
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dependencies]
+workspace-hack = { version = "0.1", path = "../workspace-hack" }
+
+[dev-dependencies]
+move-package.workspace = true
+sui-config.workspace = true
+sui-core.workspace = true
+sui-keys.workspace = true
+sui-move-build.workspace = true
+sui-test-transaction-builder.workspace = true
+sui-sdk.workspace = true
+sui-macros.workspace = true
+sui-simulator.workspace = true
+sui-json.workspace = true
+sui-json-rpc.workspace = true
+sui-json-rpc-types.workspace = true
+sui-open-rpc.workspace = true
+sui-open-rpc-macros.workspace = true
+sui-protocol-config.workspace = true
+sui-swarm-config.workspace = true
+sui-types.workspace = true
+test-cluster.workspace = true
+
+anyhow.workspace = true
+async-trait.workspace = true
+bcs.workspace = true
+hyper.workspace = true
+jsonrpsee.workspace = true
+jsonrpsee-proc-macros.workspace = true
+prometheus.workspace = true
+rand.workspace = true
+reqwest.workspace = true
+tokio = { workspace = true, features = ["full"] }
+tracing.workspace = true
+
diff --git a/...i-json-rpc/tests/balance_changes_tests.rs → ...-rpc-tests/tests/balance_changes_tests.rs b/...i-json-rpc/tests/balance_changes_tests.rs → ...-rpc-tests/tests/balance_changes_tests.rs
@@ -1,7 +1,7 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-use std::path::Path;
+use std::path::PathBuf;
 use sui_move_build::{BuildConfig, SuiPackageHooks};
 use sui_sdk::SuiClient;
 use sui_types::programmable_transaction_builder::ProgrammableTransactionBuilder;
@@ -18,8 +18,9 @@ async fn test_dry_run_publish_with_mocked_coin() -> Result<(), anyhow::Error> {
 
     // Publish test coin package
     move_package::package_hooks::register_package_hooks(Box::new(SuiPackageHooks));
-    let compiled_package = BuildConfig::default()
-        .build(Path::new("src/unit_tests/data/dummy_modules_publish").to_path_buf())?;
+    let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+    path.extend(["tests", "data", "dummy_modules_publish"]);
+    let compiled_package = BuildConfig::default().build(path)?;
     let compiled_modules_bytes = compiled_package
         .get_package_base64(false)
         .into_iter()

diff --git a/...ests/data/dummy_modules_publish/Move.toml → ...ests/data/dummy_modules_publish/Move.toml b/...ests/data/dummy_modules_publish/Move.toml → ...ests/data/dummy_modules_publish/Move.toml
@@ -3,7 +3,7 @@ name = "Examples"
 version = "0.0.1"
 
 [dependencies]
-Sui = { local = "../../../../../sui-framework/packages/sui-framework" }
+Sui = { local = "../../../../sui-framework/packages/sui-framework" }
 
 [addresses]
 examples = "0x0"
diff --git a/...modules_publish/sources/trusted_coin.move → ...modules_publish/sources/trusted_coin.move b/...modules_publish/sources/trusted_coin.move → ...modules_publish/sources/trusted_coin.move
diff --git a/crates/sui-json-rpc/tests/routing_tests.rs → ...sui-json-rpc-tests/tests/routing_tests.rs b/crates/sui-json-rpc/tests/routing_tests.rs → ...sui-json-rpc-tests/tests/routing_tests.rs
diff --git a/...on-rpc/src/unit_tests/rpc_server_tests.rs → ...-json-rpc-tests/tests/rpc_server_tests.rs b/...on-rpc/src/unit_tests/rpc_server_tests.rs → ...-json-rpc-tests/tests/rpc_server_tests.rs
@@ -1,16 +1,16 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::api::{
-    CoinReadApiClient, GovernanceReadApiClient, IndexerApiClient, ReadApiClient,
-    TransactionBuilderClient, WriteApiClient,
-};
 use std::collections::BTreeMap;
-use std::path::Path;
+use std::path::{Path, PathBuf};
 #[cfg(not(msim))]
 use std::str::FromStr;
 use std::time::Duration;
 use sui_json::{call_args, type_args};
+use sui_json_rpc::api::{
+    CoinReadApiClient, GovernanceReadApiClient, IndexerApiClient, ReadApiClient,
+    TransactionBuilderClient, WriteApiClient,
+};
 use sui_json_rpc_types::ObjectChange;
 use sui_json_rpc_types::ObjectsPage;
 use sui_json_rpc_types::{
@@ -446,8 +446,9 @@ async fn test_get_metadata() -> Result<(), anyhow::Error> {
     let gas = objects.first().unwrap().object().unwrap();
 
     // Publish test coin package
-    let compiled_package = BuildConfig::default()
-        .build(Path::new("src/unit_tests/data/dummy_modules_publish").to_path_buf())?;
+    let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+    path.extend(["tests", "data", "dummy_modules_publish"]);
+    let compiled_package = BuildConfig::new_for_testing().build(path)?;
     let compiled_modules_bytes =
         compiled_package.get_package_base64(/* with_unpublished_deps */ false);
     let dependencies = compiled_package.get_dependency_original_package_ids();
@@ -529,8 +530,9 @@ async fn test_get_total_supply() -> Result<(), anyhow::Error> {
     let gas = objects.first().unwrap().object().unwrap();
 
     // Publish test coin package
-    let compiled_package = BuildConfig::new_for_testing()
-        .build(Path::new("src/unit_tests/data/dummy_modules_publish").to_path_buf())?;
+    let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+    path.extend(["tests", "data", "dummy_modules_publish"]);
+    let compiled_package = BuildConfig::default().build(path)?;
     let compiled_modules_bytes =
         compiled_package.get_package_base64(/* with_unpublished_deps */ false);
     let dependencies = compiled_package.get_dependency_original_package_ids();

diff --git a/.../sui-json-rpc/tests/subscription_tests.rs → ...son-rpc-tests/tests/subscription_tests.rs b/.../sui-json-rpc/tests/subscription_tests.rs → ...son-rpc-tests/tests/subscription_tests.rs
diff --git a/...n-rpc/src/unit_tests/transaction_tests.rs → ...json-rpc-tests/tests/transaction_tests.rs b/...n-rpc/src/unit_tests/transaction_tests.rs → ...json-rpc-tests/tests/transaction_tests.rs
@@ -12,7 +12,7 @@ use sui_types::quorum_driver_types::ExecuteTransactionRequestType;
 use sui_types::transaction::SenderSignedData;
 use test_cluster::TestClusterBuilder;
 
-use crate::api::{IndexerApiClient, TransactionBuilderClient, WriteApiClient};
+use sui_json_rpc::api::{IndexerApiClient, TransactionBuilderClient, WriteApiClient};
 
 #[sim_test]
 async fn test_get_transaction_block() -> Result<(), anyhow::Error> {

diff --git a/crates/sui-json-rpc/Cargo.toml b/crates/sui-json-rpc/Cargo.toml
@@ -52,15 +52,5 @@ typed-store.workspace = true
 cached.workspace = true
 
 [dev-dependencies]
-sui-config.workspace = true
-sui-keys.workspace = true
-sui-move-build.workspace = true
-sui-test-transaction-builder.workspace = true
-test-cluster.workspace = true
-sui-sdk.workspace = true
-rand.workspace = true
-sui-macros.workspace = true
-sui-simulator.workspace = true
-reqwest.workspace = true
 mockall.workspace = true
 expect-test.workspace = true
diff --git a/crates/sui-json-rpc/src/lib.rs b/crates/sui-json-rpc/src/lib.rs
@@ -53,13 +53,6 @@ pub const APP_NAME_HEADER: &str = "app-name";
 
 pub const MAX_REQUEST_SIZE: u32 = 2 << 30;
 
-#[cfg(test)]
-#[path = "unit_tests/rpc_server_tests.rs"]
-mod rpc_server_test;
-#[cfg(test)]
-#[path = "unit_tests/transaction_tests.rs"]
-mod transaction_tests;
-
 pub struct JsonRpcServerBuilder {
     module: RpcModule<()>,
     rpc_doc: Project,

diff --git a/crates/sui-open-rpc/Cargo.toml b/crates/sui-open-rpc/Cargo.toml
@@ -20,7 +20,6 @@ clap.workspace = true
 pretty_assertions.workspace = true
 tokio = { workspace = true, features = ["full"] }
 fastcrypto = { workspace = true }
-sui.workspace = true
 sui-core.workspace = true
 sui-json-rpc.workspace = true
 sui-json-rpc-types.workspace = true

diff --git a/crates/sui-sdk/Cargo.toml b/crates/sui-sdk/Cargo.toml
@@ -42,10 +42,8 @@ clap.workspace = true
 dirs.workspace = true
 async-recursion.workspace = true
 tempfile.workspace = true
-test-cluster.workspace = true
 futures-core.workspace = true
 futures.workspace = true
-sui.workspace = true
 
 [[example]]
 name = "tic-tac-toe"

diff --git a/crates/sui-source-validation/Cargo.toml b/crates/sui-source-validation/Cargo.toml
@@ -34,6 +34,5 @@ tempfile.workspace = true
 tokio = { workspace = true, features = ["macros", "test-util"] }
 tracing.workspace = true
 
-sui.workspace = true
 sui-test-transaction-builder.workspace = true
 test-cluster.workspace = true
diff --git a/crates/test-cluster/Cargo.toml b/crates/test-cluster/Cargo.toml
@@ -17,7 +17,6 @@ prometheus.workspace = true
 tokio = { workspace = true, features = ["full", "tracing", "test-util"] }
 serde_json.workspace = true
 rand.workspace = true
-sui.workspace = true
 sui-config.workspace = true
 sui-core = { workspace = true, features = ["test-utils"] }
 sui-framework.workspace = true