sui: move into crates directory

toxicoff · May 23, 2022 · 9e3e3ae · 9e3e3ae
1 parent 98417b0
commit 9e3e3ae
Show file tree

Hide file tree

Showing 43 changed files with 34 additions and 33 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,6 @@
 [workspace]
 members = [
+    "crates/sui",
     "crates/sui-adapter",
     "crates/sui-adapter-transactional-tests",
     "crates/sui-config",
@@ -20,7 +21,6 @@ members = [
     "crates/sui-verifier-transactional-tests",
     "crates/test-utils",
     "crates/x",
-    "sui",
 ]
 
 [profile.release]

diff --git a/crates/sui-faucet/Cargo.toml b/crates/sui-faucet/Cargo.toml
@@ -20,7 +20,7 @@ serde = { version = "1.0.137", features = ["derive"] }
 serde_json = "1.0.80"
 tower = { version = "0.4.12", features = ["util", "timeout", "load-shed", "limit"] }
 
-sui = { path = "../../sui" }
+sui = { path = "../sui" }
 sui-types = { path = "../sui-types" }
 sui-core = { path = "../sui-core" }
 

diff --git a/sui/Cargo.toml → crates/sui/Cargo.toml b/sui/Cargo.toml → crates/sui/Cargo.toml
@@ -38,18 +38,18 @@ multiaddr = "0.14.0"
 mysten-network = { git = "https://github.com/MystenLabs/mysten-infra", rev = "7c247967e5a5abd59ecaa75bc62b05bcdf4503fe" }
 
 bcs = "0.1.3"
-sui-core = { path = "../crates/sui-core" }
-sui-storage = { path = "../crates/sui-storage" }
-sui-adapter = { path = "../crates/sui-adapter" }
-sui-framework = { path = "../crates/sui-framework" }
-sui-network = { path = "../crates/sui-network" }
-sui-config = { path = "../crates/sui-config" }
-sui-types = { path = "../crates/sui-types" }
-sui-verifier = { path = "../crates/sui-verifier" }
-sui-open-rpc = { path = "../crates/sui-open-rpc" }
-sui-open-rpc-macros = { path = "../crates/sui-open-rpc-macros" }
-sui-json = { path = "../crates/sui-json" }
-sui-gateway = { path = "../crates/sui-gateway" }
+sui-core = { path = "../sui-core" }
+sui-storage = { path = "../sui-storage" }
+sui-adapter = { path = "../sui-adapter" }
+sui-framework = { path = "../sui-framework" }
+sui-network = { path = "../sui-network" }
+sui-config = { path = "../sui-config" }
+sui-types = { path = "../sui-types" }
+sui-verifier = { path = "../sui-verifier" }
+sui-open-rpc = { path = "../sui-open-rpc" }
+sui-open-rpc-macros = { path = "../sui-open-rpc-macros" }
+sui-json = { path = "../sui-json" }
+sui-gateway = { path = "../sui-gateway" }
 
 rustyline = "9.1.2"
 rustyline-derive = "0.6.0"
@@ -77,9 +77,9 @@ shell-words = "1.1.0"
 tracing-test = "0.2.1"
 pretty_assertions = "1.2.0"
 tokio-util = { version = "0.7.2", features = ["codec"] }
-sui-node = { path = "../crates/sui-node" }
+sui-node = { path = "../sui-node" }
 
-test-utils = { path = "../crates/test-utils" }
+test-utils = { path = "../test-utils" }
 
 [features]
 benchmark = ["narwhal-node/benchmark"]

diff --git a/sui/build.rs → crates/sui/build.rs b/sui/build.rs → crates/sui/build.rs
diff --git a/sui/src/benchmark.rs → crates/sui/src/benchmark.rs b/sui/src/benchmark.rs → crates/sui/src/benchmark.rs
diff --git a/sui/src/benchmark/bench_types.rs → crates/sui/src/benchmark/bench_types.rs b/sui/src/benchmark/bench_types.rs → crates/sui/src/benchmark/bench_types.rs
diff --git a/sui/src/benchmark/load_generator.rs → crates/sui/src/benchmark/load_generator.rs b/sui/src/benchmark/load_generator.rs → crates/sui/src/benchmark/load_generator.rs
diff --git a/sui/src/benchmark/transaction_creator.rs → .../sui/src/benchmark/transaction_creator.rs b/sui/src/benchmark/transaction_creator.rs → .../sui/src/benchmark/transaction_creator.rs
diff --git a/sui/src/benchmark/validator_preparer.rs → ...s/sui/src/benchmark/validator_preparer.rs b/sui/src/benchmark/validator_preparer.rs → ...s/sui/src/benchmark/validator_preparer.rs
diff --git a/sui/src/bin/bench.rs → crates/sui/src/bin/bench.rs b/sui/src/bin/bench.rs → crates/sui/src/bin/bench.rs
diff --git a/sui/src/bin/bench_configure.rs → crates/sui/src/bin/bench_configure.rs b/sui/src/bin/bench_configure.rs → crates/sui/src/bin/bench_configure.rs
diff --git a/sui/src/bin/key_tool.rs → crates/sui/src/bin/key_tool.rs b/sui/src/bin/key_tool.rs → crates/sui/src/bin/key_tool.rs
diff --git a/sui/src/bin/remote_load_generator.rs → crates/sui/src/bin/remote_load_generator.rs b/sui/src/bin/remote_load_generator.rs → crates/sui/src/bin/remote_load_generator.rs
diff --git a/sui/src/bin/rpc-server.rs → crates/sui/src/bin/rpc-server.rs b/sui/src/bin/rpc-server.rs → crates/sui/src/bin/rpc-server.rs
diff --git a/sui/src/bin/sui-move.rs → crates/sui/src/bin/sui-move.rs b/sui/src/bin/sui-move.rs → crates/sui/src/bin/sui-move.rs
diff --git a/sui/src/bin/sui.rs → crates/sui/src/bin/sui.rs b/sui/src/bin/sui.rs → crates/sui/src/bin/sui.rs
diff --git a/sui/src/bin/wallet.rs → crates/sui/src/bin/wallet.rs b/sui/src/bin/wallet.rs → crates/sui/src/bin/wallet.rs
diff --git a/sui/src/config/mod.rs → crates/sui/src/config/mod.rs b/sui/src/config/mod.rs → crates/sui/src/config/mod.rs
diff --git a/sui/src/generate_json_rpc_spec.rs → crates/sui/src/generate_json_rpc_spec.rs b/sui/src/generate_json_rpc_spec.rs → crates/sui/src/generate_json_rpc_spec.rs
@@ -37,12 +37,13 @@ struct Options {
     action: Action,
 }
 
-const FILE_PATH: &str = "crates/sui-open-rpc/spec/openrpc.json";
-const OBJECT_SAMPLE_FILE_PATH: &str = "crates/sui-open-rpc/samples/objects.json";
-const TRANSACTION_SAMPLE_FILE_PATH: &str = "crates/sui-open-rpc/samples/transactions.json";
+const FILE_PATH: &str = "sui-open-rpc/spec/openrpc.json";
+const OBJECT_SAMPLE_FILE_PATH: &str = "sui-open-rpc/samples/objects.json";
+const TRANSACTION_SAMPLE_FILE_PATH: &str = "sui-open-rpc/samples/transactions.json";
 
 #[tokio::main]
 async fn main() {
+    println!("{}", std::env::current_dir().unwrap().display());
     let options = Options::parse();
     let open_rpc = RpcGatewayOpenRpc::open_rpc();
     match options.action {

diff --git a/sui/src/keystore.rs → crates/sui/src/keystore.rs b/sui/src/keystore.rs → crates/sui/src/keystore.rs
diff --git a/sui/src/lib.rs → crates/sui/src/lib.rs b/sui/src/lib.rs → crates/sui/src/lib.rs
diff --git a/sui/src/shell.rs → crates/sui/src/shell.rs b/sui/src/shell.rs → crates/sui/src/shell.rs
diff --git a/sui/src/sui_commands.rs → crates/sui/src/sui_commands.rs b/sui/src/sui_commands.rs → crates/sui/src/sui_commands.rs
diff --git a/sui/src/unit_tests/cli_tests.rs → crates/sui/src/unit_tests/cli_tests.rs b/sui/src/unit_tests/cli_tests.rs → crates/sui/src/unit_tests/cli_tests.rs
diff --git a/...s/data/custom_genesis_package_1/Move.toml → ...s/data/custom_genesis_package_1/Move.toml b/...s/data/custom_genesis_package_1/Move.toml → ...s/data/custom_genesis_package_1/Move.toml
@@ -3,7 +3,7 @@ name = "Examples"
 version = "0.0.1"
 
 [dependencies]
-Sui = { local = "../../../../../crates/sui-framework" }
+Sui = { local = "../../../../../sui-framework" }
 
 [addresses]
 Examples = "0x0"
diff --git a/..._package_1/sources/CombinableObjects.move → ..._package_1/sources/CombinableObjects.move b/..._package_1/sources/CombinableObjects.move → ..._package_1/sources/CombinableObjects.move
diff --git a/...ckage_1/sources/CustomObjectTemplate.move → ...ckage_1/sources/CustomObjectTemplate.move b/...ckage_1/sources/CustomObjectTemplate.move → ...ckage_1/sources/CustomObjectTemplate.move
diff --git a/..._genesis_package_1/sources/TicTacToe.move → ..._genesis_package_1/sources/TicTacToe.move b/..._genesis_package_1/sources/TicTacToe.move → ..._genesis_package_1/sources/TicTacToe.move
diff --git a/...enesis_package_1/sources/TrustedCoin.move → ...enesis_package_1/sources/TrustedCoin.move b/...enesis_package_1/sources/TrustedCoin.move → ...enesis_package_1/sources/TrustedCoin.move
diff --git a/crates/sui/src/unit_tests/data/custom_genesis_package_2/Move.toml b/crates/sui/src/unit_tests/data/custom_genesis_package_2/Move.toml
@@ -0,0 +1,10 @@
+[package]
+name = "publish_init_param"
+version = "0.0.0"
+
+[addresses]
+Test = "0x0"
+
+[dependencies]
+MoveStdlib = { local = "../../../../../sui-framework/deps/move-stdlib/" }
+Sui =      { local = "../../../../../sui-framework" }
diff --git a/.../custom_genesis_package_2/sources/M1.move → .../custom_genesis_package_2/sources/M1.move b/.../custom_genesis_package_2/sources/M1.move → .../custom_genesis_package_2/sources/M1.move
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 = "../../../../../crates/sui-framework" }
+Sui = { local = "../../../../../sui-framework" }
 
 [addresses]
 Examples = "0x0"
diff --git a/..._modules_publish/sources/TrustedCoin.move → ..._modules_publish/sources/TrustedCoin.move b/..._modules_publish/sources/TrustedCoin.move → ..._modules_publish/sources/TrustedCoin.move
diff --git a/sui/src/unit_tests/rpc_server_tests.rs → ...es/sui/src/unit_tests/rpc_server_tests.rs b/sui/src/unit_tests/rpc_server_tests.rs → ...es/sui/src/unit_tests/rpc_server_tests.rs
@@ -97,7 +97,7 @@ async fn test_publish() -> Result<(), anyhow::Error> {
     let gas = objects.first().unwrap();
 
     let compiled_modules = build_move_package_to_bytes(
-        Path::new("../sui_programmability/examples/fungible_tokens"),
+        Path::new("../../sui_programmability/examples/fungible_tokens"),
         false,
     )?
     .iter()

diff --git a/sui/src/unit_tests/shell_tests.rs → crates/sui/src/unit_tests/shell_tests.rs b/sui/src/unit_tests/shell_tests.rs → crates/sui/src/unit_tests/shell_tests.rs
diff --git a/sui/src/unit_tests/sui_network.rs → crates/sui/src/unit_tests/sui_network.rs b/sui/src/unit_tests/sui_network.rs → crates/sui/src/unit_tests/sui_network.rs
diff --git a/sui/src/wallet_commands.rs → crates/sui/src/wallet_commands.rs b/sui/src/wallet_commands.rs → crates/sui/src/wallet_commands.rs
diff --git a/sui/tests/full_node_tests.rs → crates/sui/tests/full_node_tests.rs b/sui/tests/full_node_tests.rs → crates/sui/tests/full_node_tests.rs
diff --git a/sui/tests/generate_json_rpc_spec.rs → crates/sui/tests/generate_json_rpc_spec.rs b/sui/tests/generate_json_rpc_spec.rs → crates/sui/tests/generate_json_rpc_spec.rs
diff --git a/sui/tests/readme.rs → crates/sui/tests/readme.rs b/sui/tests/readme.rs → crates/sui/tests/readme.rs
diff --git a/sui/tests/shared_objects_tests.rs → crates/sui/tests/shared_objects_tests.rs b/sui/tests/shared_objects_tests.rs → crates/sui/tests/shared_objects_tests.rs
diff --git a/crates/test-utils/Cargo.toml b/crates/test-utils/Cargo.toml
@@ -30,4 +30,4 @@ sui-config = { path = "../sui-config" }
 sui-types = { path = "../sui-types" }
 sui-core = { path = "../sui-core" }
 sui-network = { path = "../sui-network" }
-sui = { path = "../../sui" }
+sui = { path = "../sui" }
diff --git a/sui/src/unit_tests/data/custom_genesis_package_2/Move.toml b/sui/src/unit_tests/data/custom_genesis_package_2/Move.toml