sui-core: move into crates directory

egisopian21 · May 23, 2022 · 98417b0 · 98417b0
1 parent 16ad801
commit 98417b0
Show file tree

Hide file tree

Showing 55 changed files with 91 additions and 91 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,6 +3,7 @@ members = [
     "crates/sui-adapter",
     "crates/sui-adapter-transactional-tests",
     "crates/sui-config",
+    "crates/sui-core",
     "crates/sui-faucet",
     "crates/sui-framework",
     "crates/sui-framework-build",
@@ -20,7 +21,6 @@ members = [
     "crates/test-utils",
     "crates/x",
     "sui",
-    "sui_core",
 ]
 
 [profile.release]

diff --git a/sui_core/Cargo.toml → crates/sui-core/Cargo.toml b/sui_core/Cargo.toml → crates/sui-core/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "sui_core"
+name = "sui-core"
 version = "0.1.0"
 authors = ["Mysten Labs <[email protected]>"]
 license = "Apache-2.0"
@@ -42,13 +42,13 @@ thiserror = "1.0.30"
 arc-swap = "1.5.0"
 
 
-sui-adapter = { path = "../crates/sui-adapter" }
-sui-framework = { path = "../crates/sui-framework" }
-sui-network = { path = "../crates/sui-network" }
-sui-types = { path = "../crates/sui-types" }
-sui-storage = { path = "../crates/sui-storage" }
-sui-config = { path = "../crates/sui-config" }
-sui-json = { path = "../crates/sui-json" }
+sui-adapter = { path = "../sui-adapter" }
+sui-framework = { path = "../sui-framework" }
+sui-network = { path = "../sui-network" }
+sui-types = { path = "../sui-types" }
+sui-storage = { path = "../sui-storage" }
+sui-config = { path = "../sui-config" }
+sui-json = { path = "../sui-json" }
 
 move-binary-format = { git = "https://github.com/move-language/move", rev = "1b2d3b4274345f5b4b6a1a1bde5aee452003ab5b" }
 move-bytecode-utils = { git = "https://github.com/move-language/move", rev = "1b2d3b4274345f5b4b6a1a1bde5aee452003ab5b" }
@@ -74,7 +74,7 @@ tracing-test = "0.2.1"
 tracing-subscriber = "^0.3"
 
 test-fuzz = "3.0.2"
-test-utils = { path = "../crates/test-utils" }
+test-utils = { path = "../test-utils" }
 
 [[example]]
 name = "generate-format"

diff --git a/sui_core/src/authority.rs → crates/sui-core/src/authority.rs b/sui_core/src/authority.rs → crates/sui-core/src/authority.rs
diff --git a/sui_core/src/authority/authority_notifier.rs → ...-core/src/authority/authority_notifier.rs b/sui_core/src/authority/authority_notifier.rs → ...-core/src/authority/authority_notifier.rs
diff --git a/sui_core/src/authority/authority_store.rs → ...sui-core/src/authority/authority_store.rs b/sui_core/src/authority/authority_store.rs → ...sui-core/src/authority/authority_store.rs
diff --git a/sui_core/src/authority/temporary_store.rs → ...sui-core/src/authority/temporary_store.rs b/sui_core/src/authority/temporary_store.rs → ...sui-core/src/authority/temporary_store.rs
diff --git a/sui_core/src/authority_active.rs → crates/sui-core/src/authority_active.rs b/sui_core/src/authority_active.rs → crates/sui-core/src/authority_active.rs
diff --git a/sui_core/src/authority_active/gossip/mod.rs → ...i-core/src/authority_active/gossip/mod.rs b/sui_core/src/authority_active/gossip/mod.rs → ...i-core/src/authority_active/gossip/mod.rs
diff --git a/...core/src/authority_active/gossip/tests.rs → ...core/src/authority_active/gossip/tests.rs b/...core/src/authority_active/gossip/tests.rs → ...core/src/authority_active/gossip/tests.rs
diff --git a/sui_core/src/authority_aggregator.rs → crates/sui-core/src/authority_aggregator.rs b/sui_core/src/authority_aggregator.rs → crates/sui-core/src/authority_aggregator.rs
diff --git a/sui_core/src/authority_batch.rs → crates/sui-core/src/authority_batch.rs b/sui_core/src/authority_batch.rs → crates/sui-core/src/authority_batch.rs
diff --git a/sui_core/src/authority_client.rs → crates/sui-core/src/authority_client.rs b/sui_core/src/authority_client.rs → crates/sui-core/src/authority_client.rs
diff --git a/sui_core/src/authority_server.rs → crates/sui-core/src/authority_server.rs b/sui_core/src/authority_server.rs → crates/sui-core/src/authority_server.rs
diff --git a/sui_core/src/checkpoints/mod.rs → crates/sui-core/src/checkpoints/mod.rs b/sui_core/src/checkpoints/mod.rs → crates/sui-core/src/checkpoints/mod.rs
diff --git a/sui_core/src/checkpoints/proposal.rs → crates/sui-core/src/checkpoints/proposal.rs b/sui_core/src/checkpoints/proposal.rs → crates/sui-core/src/checkpoints/proposal.rs
diff --git a/sui_core/src/checkpoints/reconstruction.rs → ...ui-core/src/checkpoints/reconstruction.rs b/sui_core/src/checkpoints/reconstruction.rs → ...ui-core/src/checkpoints/reconstruction.rs
diff --git a/...src/checkpoints/tests/checkpoint_tests.rs → ...src/checkpoints/tests/checkpoint_tests.rs b/...src/checkpoints/tests/checkpoint_tests.rs → ...src/checkpoints/tests/checkpoint_tests.rs
diff --git a/sui_core/src/consensus_adapter.rs → crates/sui-core/src/consensus_adapter.rs b/sui_core/src/consensus_adapter.rs → crates/sui-core/src/consensus_adapter.rs
diff --git a/sui_core/src/epoch/mod.rs → crates/sui-core/src/epoch/mod.rs b/sui_core/src/epoch/mod.rs → crates/sui-core/src/epoch/mod.rs
diff --git a/sui_core/src/execution_engine.rs → crates/sui-core/src/execution_engine.rs b/sui_core/src/execution_engine.rs → crates/sui-core/src/execution_engine.rs
diff --git a/sui_core/src/gateway_state.rs → crates/sui-core/src/gateway_state.rs b/sui_core/src/gateway_state.rs → crates/sui-core/src/gateway_state.rs
diff --git a/sui_core/src/gateway_types.rs → crates/sui-core/src/gateway_types.rs b/sui_core/src/gateway_types.rs → crates/sui-core/src/gateway_types.rs
diff --git a/sui_core/src/generate_format.rs → crates/sui-core/src/generate_format.rs b/sui_core/src/generate_format.rs → crates/sui-core/src/generate_format.rs
@@ -90,7 +90,7 @@ struct Options {
     action: Action,
 }
 
-const FILE_PATH: &str = "sui_core/tests/staged/sui.yaml";
+const FILE_PATH: &str = "sui-core/tests/staged/sui.yaml";
 
 fn main() {
     let options = Options::parse();

diff --git a/sui_core/src/lib.rs → crates/sui-core/src/lib.rs b/sui_core/src/lib.rs → crates/sui-core/src/lib.rs
diff --git a/sui_core/src/make.rs → crates/sui-core/src/make.rs b/sui_core/src/make.rs → crates/sui-core/src/make.rs
diff --git a/sui_core/src/safe_client.rs → crates/sui-core/src/safe_client.rs b/sui_core/src/safe_client.rs → crates/sui-core/src/safe_client.rs
diff --git a/sui_core/src/transaction_input_checker.rs → ...sui-core/src/transaction_input_checker.rs b/sui_core/src/transaction_input_checker.rs → ...sui-core/src/transaction_input_checker.rs
diff --git a/.../unit_tests/authority_aggregator_tests.rs → .../unit_tests/authority_aggregator_tests.rs b/.../unit_tests/authority_aggregator_tests.rs → .../unit_tests/authority_aggregator_tests.rs
diff --git a/sui_core/src/unit_tests/authority_tests.rs → ...ui-core/src/unit_tests/authority_tests.rs b/sui_core/src/unit_tests/authority_tests.rs → ...ui-core/src/unit_tests/authority_tests.rs
diff --git a/sui_core/src/unit_tests/batch_tests.rs → ...es/sui-core/src/unit_tests/batch_tests.rs b/sui_core/src/unit_tests/batch_tests.rs → ...es/sui-core/src/unit_tests/batch_tests.rs
diff --git a/...src/unit_tests/batch_transaction_tests.rs → ...src/unit_tests/batch_transaction_tests.rs b/...src/unit_tests/batch_transaction_tests.rs → ...src/unit_tests/batch_transaction_tests.rs
diff --git a/...src/unit_tests/consensus_adapter_tests.rs → ...src/unit_tests/consensus_adapter_tests.rs b/...src/unit_tests/consensus_adapter_tests.rs → ...src/unit_tests/consensus_adapter_tests.rs
diff --git a/sui_core/src/unit_tests/consensus_tests.rs → ...ui-core/src/unit_tests/consensus_tests.rs b/sui_core/src/unit_tests/consensus_tests.rs → ...ui-core/src/unit_tests/consensus_tests.rs
diff --git a/sui_core/src/unit_tests/data/hero/Move.toml → ...i-core/src/unit_tests/data/hero/Move.toml b/sui_core/src/unit_tests/data/hero/Move.toml → ...i-core/src/unit_tests/data/hero/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/...rc/unit_tests/data/hero/sources/Hero.move → ...rc/unit_tests/data/hero/sources/Hero.move b/...rc/unit_tests/data/hero/sources/Hero.move → ...rc/unit_tests/data/hero/sources/Hero.move
diff --git a/..._tests/data/hero/sources/TrustedCoin.move → ..._tests/data/hero/sources/TrustedCoin.move b/..._tests/data/hero/sources/TrustedCoin.move → ..._tests/data/hero/sources/TrustedCoin.move
diff --git a/...rc/unit_tests/data/object_owner/Move.toml → ...rc/unit_tests/data/object_owner/Move.toml b/...rc/unit_tests/data/object_owner/Move.toml → ...rc/unit_tests/data/object_owner/Move.toml
@@ -3,7 +3,7 @@ name = "ObjectOwner"
 version = "0.0.1"
 
 [dependencies]
-Sui = { local = "../../../../../crates/sui-framework" }
+Sui = { local = "../../../../../sui-framework" }
 
 [addresses]
 ObjectOwner = "0x0"
diff --git a/...ata/object_owner/sources/ObjectOwner.move → ...ata/object_owner/sources/ObjectOwner.move b/...ata/object_owner/sources/ObjectOwner.move → ...ata/object_owner/sources/ObjectOwner.move
diff --git a/...unit_tests/data/object_wrapping/Move.toml → ...unit_tests/data/object_wrapping/Move.toml b/...unit_tests/data/object_wrapping/Move.toml → ...unit_tests/data/object_wrapping/Move.toml
@@ -3,7 +3,7 @@ name = "ObjectWrapping"
 version = "0.0.1"
 
 [dependencies]
-Sui = { local = "../../../../../crates/sui-framework" }
+Sui = { local = "../../../../../sui-framework" }
 
 [addresses]
 ObjectWrapping = "0x0"
diff --git a/...ject_wrapping/sources/ObjectWrapping.move → ...ject_wrapping/sources/ObjectWrapping.move b/...ject_wrapping/sources/ObjectWrapping.move → ...ject_wrapping/sources/ObjectWrapping.move
diff --git a/sui_core/src/unit_tests/gas_tests.rs → crates/sui-core/src/unit_tests/gas_tests.rs b/sui_core/src/unit_tests/gas_tests.rs → crates/sui-core/src/unit_tests/gas_tests.rs
diff --git a/...ore/src/unit_tests/gateway_state_tests.rs → ...ore/src/unit_tests/gateway_state_tests.rs b/...ore/src/unit_tests/gateway_state_tests.rs → ...ore/src/unit_tests/gateway_state_tests.rs
diff --git a/...ore/src/unit_tests/gateway_types_tests.rs → ...ore/src/unit_tests/gateway_types_tests.rs b/...ore/src/unit_tests/gateway_types_tests.rs → ...ore/src/unit_tests/gateway_types_tests.rs
diff --git a/.../src/unit_tests/move_integration_tests.rs → .../src/unit_tests/move_integration_tests.rs b/.../src/unit_tests/move_integration_tests.rs → .../src/unit_tests/move_integration_tests.rs
diff --git a/sui_core/src/unit_tests/server_tests.rs → ...s/sui-core/src/unit_tests/server_tests.rs b/sui_core/src/unit_tests/server_tests.rs → ...s/sui-core/src/unit_tests/server_tests.rs
diff --git a/sui_core/tests/README.md → crates/sui-core/tests/README.md b/sui_core/tests/README.md → crates/sui-core/tests/README.md
diff --git a/sui_core/tests/format.rs → crates/sui-core/tests/format.rs b/sui_core/tests/format.rs → crates/sui-core/tests/format.rs
diff --git a/sui_core/tests/staged/sui.yaml → crates/sui-core/tests/staged/sui.yaml b/sui_core/tests/staged/sui.yaml → crates/sui-core/tests/staged/sui.yaml
diff --git a/crates/sui-faucet/Cargo.toml b/crates/sui-faucet/Cargo.toml
@@ -22,7 +22,7 @@ tower = { version = "0.4.12", features = ["util", "timeout", "load-shed", "limit
 
 sui = { path = "../../sui" }
 sui-types = { path = "../sui-types" }
-sui_core = { path = "../../sui_core" }
+sui-core = { path = "../sui-core" }
 
 [dev-dependencies]
 tempfile = "3.3.0"

diff --git a/crates/sui-gateway/Cargo.toml b/crates/sui-gateway/Cargo.toml
@@ -22,7 +22,7 @@ futures = "0.3.21"
 ed25519-dalek = { version = "1.0.1", features = ["batch", "serde"] }
 prometheus_exporter = "0.8.4"
 
-sui_core = { path = "../../sui_core" }
+sui-core = { path = "../sui-core" }
 sui-config = { path = "../sui-config" }
 sui-types = { path = "../sui-types" }
 sui-json = { path = "../sui-json" }

diff --git a/crates/sui-node/Cargo.toml b/crates/sui-node/Cargo.toml
@@ -15,7 +15,7 @@ tokio = { version = "1.18.2", features = ["full"] }
 tracing = "0.1.34"
 
 sui-config = { path = "../sui-config" }
-sui_core = { path = "../../sui_core" }
+sui-core = { path = "../sui-core" }
 sui-storage = { path = "../sui-storage" }
 sui-gateway = { path = "../sui-gateway" }
 

diff --git a/crates/sui-transactional-test-runner/Cargo.toml b/crates/sui-transactional-test-runner/Cargo.toml
@@ -38,4 +38,4 @@ sui-framework = { path = "../sui-framework" }
 sui-verifier = { path = "../sui-verifier" }
 sui-types = { path = "../sui-types" }
 sui-adapter = { path = "../sui-adapter" }
-sui_core = { path = "../../sui_core" }
+sui-core = { path = "../sui-core" }
diff --git a/crates/test-utils/Cargo.toml b/crates/test-utils/Cargo.toml
@@ -28,6 +28,6 @@ narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "2c5e823
 
 sui-config = { path = "../sui-config" }
 sui-types = { path = "../sui-types" }
-sui_core = { path = "../../sui_core" }
+sui-core = { path = "../sui-core" }
 sui-network = { path = "../sui-network" }
 sui = { path = "../../sui" }
diff --git a/sui/Cargo.toml b/sui/Cargo.toml
@@ -38,7 +38,7 @@ multiaddr = "0.14.0"
 mysten-network = { git = "https://github.com/MystenLabs/mysten-infra", rev = "7c247967e5a5abd59ecaa75bc62b05bcdf4503fe" }
 
 bcs = "0.1.3"
-sui_core = { path = "../sui_core" }
+sui-core = { path = "../crates/sui-core" }
 sui-storage = { path = "../crates/sui-storage" }
 sui-adapter = { path = "../crates/sui-adapter" }
 sui-framework = { path = "../crates/sui-framework" }