framework: move into crates directory

Shade888 · May 23, 2022 · 95a947f · 95a947f
1 parent e7dd341
commit 95a947f
Show file tree

Hide file tree

Showing 77 changed files with 26 additions and 26 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,6 +4,7 @@ members = [
     "crates/sui-adapter-transactional-tests",
     "crates/sui-config",
     "crates/sui-faucet",
+    "crates/sui-framework",
     "crates/sui-gateway",
     "crates/sui-json",
     "crates/sui-network",
@@ -17,7 +18,6 @@ members = [
     "crates/x",
     "sui",
     "sui_core",
-    "sui_programmability/framework",
     "sui_storage",
     "test_utils",
 ]

diff --git a/crates/sui-adapter/Cargo.toml b/crates/sui-adapter/Cargo.toml
@@ -21,9 +21,9 @@ move-cli = { git = "https://github.com/move-language/move", rev = "1b2d3b4274345
 move-vm-runtime = { git = "https://github.com/move-language/move", rev = "1b2d3b4274345f5b4b6a1a1bde5aee452003ab5b" }
 move-vm-types = { git = "https://github.com/move-language/move", rev = "1b2d3b4274345f5b4b6a1a1bde5aee452003ab5b" }
 
-sui-framework = { path = "../../sui_programmability/framework" }
-sui-verifier = { path = "../../crates/sui-verifier" }
-sui-types = { path = "../../crates/sui-types" }
+sui-framework = { path = "../sui-framework" }
+sui-verifier = { path = "../sui-verifier" }
+sui-types = { path = "../sui-types" }
 
 [dev-dependencies]
 move-package = { git = "https://github.com/move-language/move", rev = "1b2d3b4274345f5b4b6a1a1bde5aee452003ab5b" }
diff --git a/crates/sui-config/Cargo.toml b/crates/sui-config/Cargo.toml
@@ -23,7 +23,7 @@ narwhal-crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "2c5e823
 move-binary-format = { git = "https://github.com/move-language/move", rev = "1b2d3b4274345f5b4b6a1a1bde5aee452003ab5b" }
 move-package = { git = "https://github.com/move-language/move", rev = "1b2d3b4274345f5b4b6a1a1bde5aee452003ab5b" }
 
-sui-framework = { path = "../../sui_programmability/framework" }
+sui-framework = { path = "../sui-framework" }
 
 sui-adapter = { path = "../sui-adapter" }
 sui-types = { path = "../sui-types" }
diff --git a/sui_programmability/framework/Cargo.toml → crates/sui-framework/Cargo.toml b/sui_programmability/framework/Cargo.toml → crates/sui-framework/Cargo.toml
diff --git a/sui_programmability/framework/Move.toml → crates/sui-framework/Move.toml b/sui_programmability/framework/Move.toml → crates/sui-framework/Move.toml
diff --git a/sui_programmability/framework/README.md → crates/sui-framework/README.md b/sui_programmability/framework/README.md → crates/sui-framework/README.md
diff --git a/...lity/framework/deps/move-stdlib/Move.toml → .../sui-framework/deps/move-stdlib/Move.toml b/...lity/framework/deps/move-stdlib/Move.toml → .../sui-framework/deps/move-stdlib/Move.toml
diff --git a/...ework/deps/move-stdlib/sources/ASCII.move → ...ework/deps/move-stdlib/sources/ASCII.move b/...ework/deps/move-stdlib/sources/ASCII.move → ...ework/deps/move-stdlib/sources/ASCII.move
diff --git a/...amework/deps/move-stdlib/sources/BCS.move → ...amework/deps/move-stdlib/sources/BCS.move b/...amework/deps/move-stdlib/sources/BCS.move → ...amework/deps/move-stdlib/sources/BCS.move
diff --git a/...k/deps/move-stdlib/sources/BitVector.move → ...k/deps/move-stdlib/sources/BitVector.move b/...k/deps/move-stdlib/sources/BitVector.move → ...k/deps/move-stdlib/sources/BitVector.move
diff --git a/.../deps/move-stdlib/sources/Capability.move → .../deps/move-stdlib/sources/Capability.move b/.../deps/move-stdlib/sources/Capability.move → .../deps/move-stdlib/sources/Capability.move
diff --git a/...ework/deps/move-stdlib/sources/Debug.move → ...ework/deps/move-stdlib/sources/Debug.move b/...ework/deps/move-stdlib/sources/Debug.move → ...ework/deps/move-stdlib/sources/Debug.move
diff --git a/...work/deps/move-stdlib/sources/Errors.move → ...work/deps/move-stdlib/sources/Errors.move b/...work/deps/move-stdlib/sources/Errors.move → ...work/deps/move-stdlib/sources/Errors.move
diff --git a/...eps/move-stdlib/sources/FixedPoint32.move → ...eps/move-stdlib/sources/FixedPoint32.move b/...eps/move-stdlib/sources/FixedPoint32.move → ...eps/move-stdlib/sources/FixedPoint32.move
diff --git a/...mework/deps/move-stdlib/sources/GUID.move → ...mework/deps/move-stdlib/sources/GUID.move b/...mework/deps/move-stdlib/sources/GUID.move → ...mework/deps/move-stdlib/sources/GUID.move
diff --git a/...mework/deps/move-stdlib/sources/Hash.move → ...mework/deps/move-stdlib/sources/Hash.move b/...mework/deps/move-stdlib/sources/Hash.move → ...mework/deps/move-stdlib/sources/Hash.move
diff --git a/...work/deps/move-stdlib/sources/Option.move → ...work/deps/move-stdlib/sources/Option.move b/...work/deps/move-stdlib/sources/Option.move → ...work/deps/move-stdlib/sources/Option.move
diff --git a/...work/deps/move-stdlib/sources/Signer.move → ...work/deps/move-stdlib/sources/Signer.move b/...work/deps/move-stdlib/sources/Signer.move → ...work/deps/move-stdlib/sources/Signer.move
diff --git a/...rk/deps/move-stdlib/sources/UnitTest.move → ...rk/deps/move-stdlib/sources/UnitTest.move b/...rk/deps/move-stdlib/sources/UnitTest.move → ...rk/deps/move-stdlib/sources/UnitTest.move
diff --git a/...work/deps/move-stdlib/sources/Vector.move → ...work/deps/move-stdlib/sources/Vector.move b/...work/deps/move-stdlib/sources/Vector.move → ...work/deps/move-stdlib/sources/Vector.move
diff --git a/...rogrammability/framework/sources/Bag.move → crates/sui-framework/sources/Bag.move b/...rogrammability/framework/sources/Bag.move → crates/sui-framework/sources/Bag.move
diff --git a/...ammability/framework/sources/Balance.move → crates/sui-framework/sources/Balance.move b/...ammability/framework/sources/Balance.move → crates/sui-framework/sources/Balance.move
diff --git a/...ogrammability/framework/sources/Coin.move → crates/sui-framework/sources/Coin.move b/...ogrammability/framework/sources/Coin.move → crates/sui-framework/sources/Coin.move
diff --git a/...ability/framework/sources/Collection.move → crates/sui-framework/sources/Collection.move b/...ability/framework/sources/Collection.move → crates/sui-framework/sources/Collection.move
diff --git a/...mability/framework/sources/DevNetNFT.move → crates/sui-framework/sources/DevNetNFT.move b/...mability/framework/sources/DevNetNFT.move → crates/sui-framework/sources/DevNetNFT.move
diff --git a/...ity/framework/sources/ERC721Metadata.move → ...sui-framework/sources/ERC721Metadata.move b/...ity/framework/sources/ERC721Metadata.move → ...sui-framework/sources/ERC721Metadata.move
diff --git a/...grammability/framework/sources/Event.move → crates/sui-framework/sources/Event.move b/...grammability/framework/sources/Event.move → crates/sui-framework/sources/Event.move
diff --git a/...mework/sources/Governance/Delegation.move → ...mework/sources/Governance/Delegation.move b/...mework/sources/Governance/Delegation.move → ...mework/sources/Governance/Delegation.move
diff --git a/...sources/Governance/EpochRewardRecord.move → ...sources/Governance/EpochRewardRecord.move b/...sources/Governance/EpochRewardRecord.move → ...sources/Governance/EpochRewardRecord.move
diff --git a/...framework/sources/Governance/Genesis.move → ...framework/sources/Governance/Genesis.move b/...framework/sources/Governance/Genesis.move → ...framework/sources/Governance/Genesis.move
diff --git a/...amework/sources/Governance/SuiSystem.move → ...amework/sources/Governance/SuiSystem.move b/...amework/sources/Governance/SuiSystem.move → ...amework/sources/Governance/SuiSystem.move
diff --git a/...amework/sources/Governance/Validator.move → ...amework/sources/Governance/Validator.move b/...amework/sources/Governance/Validator.move → ...amework/sources/Governance/Validator.move
diff --git a/...work/sources/Governance/ValidatorSet.move → ...work/sources/Governance/ValidatorSet.move b/...work/sources/Governance/ValidatorSet.move → ...work/sources/Governance/ValidatorSet.move
diff --git a/...programmability/framework/sources/ID.move → crates/sui-framework/sources/ID.move b/...programmability/framework/sources/ID.move → crates/sui-framework/sources/ID.move
diff --git a/...ogrammability/framework/sources/Math.move → crates/sui-framework/sources/Math.move b/...ogrammability/framework/sources/Math.move → crates/sui-framework/sources/Math.move
diff --git a/...ility/framework/sources/ObjectBasics.move → ...s/sui-framework/sources/ObjectBasics.move b/...ility/framework/sources/ObjectBasics.move → ...s/sui-framework/sources/ObjectBasics.move
diff --git a/...rogrammability/framework/sources/SUI.move → crates/sui-framework/sources/SUI.move b/...rogrammability/framework/sources/SUI.move → crates/sui-framework/sources/SUI.move
diff --git a/...ility/framework/sources/TestScenario.move → ...s/sui-framework/sources/TestScenario.move b/...ility/framework/sources/TestScenario.move → ...s/sui-framework/sources/TestScenario.move
diff --git a/...mmability/framework/sources/Transfer.move → crates/sui-framework/sources/Transfer.move b/...mmability/framework/sources/Transfer.move → crates/sui-framework/sources/Transfer.move
diff --git a/...mability/framework/sources/TxContext.move → crates/sui-framework/sources/TxContext.move b/...mability/framework/sources/TxContext.move → crates/sui-framework/sources/TxContext.move
diff --git a/...ogrammability/framework/sources/UTF8.move → crates/sui-framework/sources/UTF8.move b/...ogrammability/framework/sources/UTF8.move → crates/sui-framework/sources/UTF8.move
diff --git a/...rogrammability/framework/sources/Url.move → crates/sui-framework/sources/Url.move b/...rogrammability/framework/sources/Url.move → crates/sui-framework/sources/Url.move
diff --git a/sui_programmability/framework/src/lib.rs → crates/sui-framework/src/lib.rs b/sui_programmability/framework/src/lib.rs → crates/sui-framework/src/lib.rs
@@ -251,7 +251,7 @@ fn run_examples_move_unit_tests() {
     ];
     for example in examples {
         let path = Path::new(env!("CARGO_MANIFEST_DIR"))
-            .join("../examples")
+            .join("../../sui_programmability/examples")
             .join(example);
         build_and_verify_user_package(&path).unwrap();
         run_move_unit_tests(&path, None).unwrap();

diff --git a/...ammability/framework/src/natives/event.rs → crates/sui-framework/src/natives/event.rs b/...ammability/framework/src/natives/event.rs → crates/sui-framework/src/natives/event.rs
diff --git a/...ogrammability/framework/src/natives/id.rs → crates/sui-framework/src/natives/id.rs b/...ogrammability/framework/src/natives/id.rs → crates/sui-framework/src/natives/id.rs
diff --git a/...grammability/framework/src/natives/mod.rs → crates/sui-framework/src/natives/mod.rs b/...grammability/framework/src/natives/mod.rs → crates/sui-framework/src/natives/mod.rs
diff --git a/...ty/framework/src/natives/test_scenario.rs → ...ui-framework/src/natives/test_scenario.rs b/...ty/framework/src/natives/test_scenario.rs → ...ui-framework/src/natives/test_scenario.rs
diff --git a/...ability/framework/src/natives/transfer.rs → crates/sui-framework/src/natives/transfer.rs b/...ability/framework/src/natives/transfer.rs → crates/sui-framework/src/natives/transfer.rs
diff --git a/...ility/framework/src/natives/tx_context.rs → ...s/sui-framework/src/natives/tx_context.rs b/...ility/framework/src/natives/tx_context.rs → ...s/sui-framework/src/natives/tx_context.rs
diff --git a/...rammability/framework/tests/BagTests.move → crates/sui-framework/tests/BagTests.move b/...rammability/framework/tests/BagTests.move → crates/sui-framework/tests/BagTests.move
diff --git a/...ity/framework/tests/CoinBalanceTests.move → ...sui-framework/tests/CoinBalanceTests.move b/...ity/framework/tests/CoinBalanceTests.move → ...sui-framework/tests/CoinBalanceTests.move
diff --git a/...lity/framework/tests/CollectionTests.move → .../sui-framework/tests/CollectionTests.move b/...lity/framework/tests/CollectionTests.move → .../sui-framework/tests/CollectionTests.move
diff --git a/...grammability/framework/tests/IDTests.move → crates/sui-framework/tests/IDTests.move b/...grammability/framework/tests/IDTests.move → crates/sui-framework/tests/IDTests.move
diff --git a/...ammability/framework/tests/MathTests.move → crates/sui-framework/tests/MathTests.move b/...ammability/framework/tests/MathTests.move → crates/sui-framework/tests/MathTests.move
diff --git a/...ty/framework/tests/TestScenarioTests.move → ...ui-framework/tests/TestScenarioTests.move b/...ty/framework/tests/TestScenarioTests.move → ...ui-framework/tests/TestScenarioTests.move
diff --git a/...ility/framework/tests/TxContextTests.move → ...s/sui-framework/tests/TxContextTests.move b/...ility/framework/tests/TxContextTests.move → ...s/sui-framework/tests/TxContextTests.move
diff --git a/...rammability/framework/tests/UrlTests.move → crates/sui-framework/tests/UrlTests.move b/...rammability/framework/tests/UrlTests.move → crates/sui-framework/tests/UrlTests.move
diff --git a/...ty/framework/tests/ValidatorSetTests.move → ...ui-framework/tests/ValidatorSetTests.move b/...ty/framework/tests/ValidatorSetTests.move → ...ui-framework/tests/ValidatorSetTests.move
diff --git a/...ility/framework/tests/ValidatorTests.move → ...s/sui-framework/tests/ValidatorTests.move b/...ility/framework/tests/ValidatorTests.move → ...s/sui-framework/tests/ValidatorTests.move
diff --git a/crates/sui-json/Cargo.toml b/crates/sui-json/Cargo.toml
@@ -23,4 +23,4 @@ move-core-types = { git = "https://github.com/move-language/move", rev = "1b2d3b
 test-fuzz = "3.0.2"
 
 sui-adapter = { path = "../sui-adapter" }
-sui-framework = { path = "../../sui_programmability/framework" }
+sui-framework = { path = "../sui-framework" }
diff --git a/crates/sui-transactional-test-runner/Cargo.toml b/crates/sui-transactional-test-runner/Cargo.toml
@@ -34,7 +34,7 @@ move-vm-runtime = { git = "https://github.com/move-language/move", rev = "1b2d3b
 move-vm-types = { git = "https://github.com/move-language/move", rev = "1b2d3b4274345f5b4b6a1a1bde5aee452003ab5b" }
 
 
-sui-framework = { path = "../../sui_programmability/framework" }
+sui-framework = { path = "../sui-framework" }
 sui-verifier = { path = "../sui-verifier" }
 sui-types = { path = "../sui-types" }
 sui-adapter = { path = "../sui-adapter" }

diff --git a/sui/Cargo.toml b/sui/Cargo.toml
@@ -41,7 +41,7 @@ bcs = "0.1.3"
 sui_core = { path = "../sui_core" }
 sui_storage = { path = "../sui_storage" }
 sui-adapter = { path = "../crates/sui-adapter" }
-sui-framework = { path = "../sui_programmability/framework" }
+sui-framework = { path = "../crates/sui-framework" }
 sui-network = { path = "../crates/sui-network" }
 sui-config = { path = "../crates/sui-config" }
 sui-types = { path = "../crates/sui-types" }

diff --git a/sui/src/unit_tests/data/custom_genesis_package_1/Move.toml b/sui/src/unit_tests/data/custom_genesis_package_1/Move.toml
@@ -3,7 +3,7 @@ name = "Examples"
 version = "0.0.1"
 
 [dependencies]
-Sui = { local = "../../../../../sui_programmability/framework" }
+Sui = { local = "../../../../../crates/sui-framework" }
 
 [addresses]
 Examples = "0x0"
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
@@ -6,5 +6,5 @@ version = "0.0.0"
 Test = "0x0"
 
 [dependencies]
-MoveStdlib = { local = "../../../../../sui_programmability/framework/deps/move-stdlib/" }
-Sui =      { local = "../../../../../sui_programmability/framework" }
+MoveStdlib = { local = "../../../../../crates/sui-framework/deps/move-stdlib/" }
+Sui =      { local = "../../../../../crates/sui-framework" }
diff --git a/sui/src/unit_tests/data/dummy_modules_publish/Move.toml b/sui/src/unit_tests/data/dummy_modules_publish/Move.toml
@@ -3,7 +3,7 @@ name = "Examples"
 version = "0.0.1"
 
 [dependencies]
-Sui = { local = "../../../../../sui_programmability/framework" }
+Sui = { local = "../../../../../crates/sui-framework" }
 
 [addresses]
 Examples = "0x0"
diff --git a/sui_core/Cargo.toml b/sui_core/Cargo.toml
@@ -43,7 +43,7 @@ arc-swap = "1.5.0"
 
 
 sui-adapter = { path = "../crates/sui-adapter" }
-sui-framework = { path = "../sui_programmability/framework" }
+sui-framework = { path = "../crates/sui-framework" }
 sui-network = { path = "../crates/sui-network" }
 sui-types = { path = "../crates/sui-types" }
 sui_storage = { path = "../sui_storage" }

diff --git a/sui_core/src/unit_tests/data/hero/Move.toml b/sui_core/src/unit_tests/data/hero/Move.toml
@@ -3,7 +3,7 @@ name = "Examples"
 version = "0.0.1"
 
 [dependencies]
-Sui = { local = "../../../../../sui_programmability/framework" }
+Sui = { local = "../../../../../crates/sui-framework" }
 
 [addresses]
 Examples = "0x0"
diff --git a/sui_core/src/unit_tests/data/object_owner/Move.toml b/sui_core/src/unit_tests/data/object_owner/Move.toml
@@ -3,7 +3,7 @@ name = "ObjectOwner"
 version = "0.0.1"
 
 [dependencies]
-Sui = { local = "../../../../../sui_programmability/framework" }
+Sui = { local = "../../../../../crates/sui-framework" }
 
 [addresses]
 ObjectOwner = "0x0"
diff --git a/sui_core/src/unit_tests/data/object_wrapping/Move.toml b/sui_core/src/unit_tests/data/object_wrapping/Move.toml
@@ -3,7 +3,7 @@ name = "ObjectWrapping"
 version = "0.0.1"
 
 [dependencies]
-Sui = { local = "../../../../../sui_programmability/framework" }
+Sui = { local = "../../../../../crates/sui-framework" }
 
 [addresses]
 ObjectWrapping = "0x0"
diff --git a/sui_programmability/examples/basics/Move.toml b/sui_programmability/examples/basics/Move.toml
@@ -3,7 +3,7 @@ name = "Basics"
 version = "0.0.1"
 
 [dependencies]
-Sui = { local = "../../framework" }
+Sui = { local = "../../../crates/sui-framework" }
 
 [addresses]
 Basics = "0x0"
diff --git a/sui_programmability/examples/defi/Move.toml b/sui_programmability/examples/defi/Move.toml
@@ -3,7 +3,7 @@ name = "DeFi"
 version = "0.0.1"
 
 [dependencies]
-Sui = { local = "../../framework" }
+Sui = { local = "../../../crates/sui-framework" }
 
 [addresses]
 DeFi = "0x0"
diff --git a/sui_programmability/examples/fungible_tokens/Move.toml b/sui_programmability/examples/fungible_tokens/Move.toml
@@ -3,7 +3,7 @@ name = "FungibleTokens"
 version = "0.0.1"
 
 [dependencies]
-Sui = { local = "../../framework" }
+Sui = { local = "../../../crates/sui-framework" }
 
 [addresses]
 FungibleTokens = "0x0"
diff --git a/sui_programmability/examples/games/Move.toml b/sui_programmability/examples/games/Move.toml
@@ -3,7 +3,7 @@ name = "Games"
 version = "0.0.1"
 
 [dependencies]
-Sui = { local = "../../framework" }
+Sui = { local = "../../../crates/sui-framework" }
 
 [addresses]
 Games = "0x0"
diff --git a/sui_programmability/examples/nfts/Move.toml b/sui_programmability/examples/nfts/Move.toml
@@ -3,7 +3,7 @@ name = "NFTs"
 version = "0.0.1"
 
 [dependencies]
-Sui = { local = "../../framework" }
+Sui = { local = "../../../crates/sui-framework" }
 
 [addresses]
 NFTs = "0x0"
diff --git a/sui_programmability/examples/objects_tutorial/Move.toml b/sui_programmability/examples/objects_tutorial/Move.toml
@@ -3,8 +3,8 @@ name = "Tutorial"
 version = "0.0.1"
 
 [dependencies]
-MoveStdlib = { local = "../../../sui_programmability/framework/deps/move-stdlib/" }
-Sui = { local = "../../../sui_programmability/framework/" }
+MoveStdlib = { local = "../../../crates/sui-framework/deps/move-stdlib/" }
+Sui = { local = "../../../crates/sui-framework/" }
 
 [addresses]
 Tutorial = "0x0"

diff --git a/sui_programmability/tutorial/Move.toml b/sui_programmability/tutorial/Move.toml
@@ -3,7 +3,7 @@ name = "MyFirstPackage"
 version = "0.0.1"
 
 [dependencies]
-Sui = { local = "../framework" }
+Sui = { local = "../../crates/sui-framework" }
 
 [addresses]
 MyFirstPackage = "0x0"
diff --git a/test_utils/Cargo.toml b/test_utils/Cargo.toml
@@ -20,7 +20,7 @@ tempfile = "3.3.0"
 bcs = "0.1.3"
 
 sui-adapter = { path = "../crates/sui-adapter" }
-sui-framework = { path = "../sui_programmability/framework" }
+sui-framework = { path = "../crates/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"}