diff --git a/Cargo.toml b/Cargo.toml index 76fc0970129b4..450ca2a8c0a8b 100644 --- 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 index a31fc1453b630..5fb461abad3cf 100644 --- 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 index 5e3c5030c1c53..e1b5c4d97c8c4 100644 --- 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 b/crates/sui-framework/Cargo.toml similarity index 100% rename from sui_programmability/framework/Cargo.toml rename to crates/sui-framework/Cargo.toml diff --git a/sui_programmability/framework/Move.toml b/crates/sui-framework/Move.toml similarity index 100% rename from sui_programmability/framework/Move.toml rename to crates/sui-framework/Move.toml diff --git a/sui_programmability/framework/README.md b/crates/sui-framework/README.md similarity index 100% rename from sui_programmability/framework/README.md rename to crates/sui-framework/README.md diff --git a/sui_programmability/framework/deps/move-stdlib/Move.toml b/crates/sui-framework/deps/move-stdlib/Move.toml similarity index 100% rename from sui_programmability/framework/deps/move-stdlib/Move.toml rename to crates/sui-framework/deps/move-stdlib/Move.toml diff --git a/sui_programmability/framework/deps/move-stdlib/sources/ASCII.move b/crates/sui-framework/deps/move-stdlib/sources/ASCII.move similarity index 100% rename from sui_programmability/framework/deps/move-stdlib/sources/ASCII.move rename to crates/sui-framework/deps/move-stdlib/sources/ASCII.move diff --git a/sui_programmability/framework/deps/move-stdlib/sources/BCS.move b/crates/sui-framework/deps/move-stdlib/sources/BCS.move similarity index 100% rename from sui_programmability/framework/deps/move-stdlib/sources/BCS.move rename to crates/sui-framework/deps/move-stdlib/sources/BCS.move diff --git a/sui_programmability/framework/deps/move-stdlib/sources/BitVector.move b/crates/sui-framework/deps/move-stdlib/sources/BitVector.move similarity index 100% rename from sui_programmability/framework/deps/move-stdlib/sources/BitVector.move rename to crates/sui-framework/deps/move-stdlib/sources/BitVector.move diff --git a/sui_programmability/framework/deps/move-stdlib/sources/Capability.move b/crates/sui-framework/deps/move-stdlib/sources/Capability.move similarity index 100% rename from sui_programmability/framework/deps/move-stdlib/sources/Capability.move rename to crates/sui-framework/deps/move-stdlib/sources/Capability.move diff --git a/sui_programmability/framework/deps/move-stdlib/sources/Debug.move b/crates/sui-framework/deps/move-stdlib/sources/Debug.move similarity index 100% rename from sui_programmability/framework/deps/move-stdlib/sources/Debug.move rename to crates/sui-framework/deps/move-stdlib/sources/Debug.move diff --git a/sui_programmability/framework/deps/move-stdlib/sources/Errors.move b/crates/sui-framework/deps/move-stdlib/sources/Errors.move similarity index 100% rename from sui_programmability/framework/deps/move-stdlib/sources/Errors.move rename to crates/sui-framework/deps/move-stdlib/sources/Errors.move diff --git a/sui_programmability/framework/deps/move-stdlib/sources/FixedPoint32.move b/crates/sui-framework/deps/move-stdlib/sources/FixedPoint32.move similarity index 100% rename from sui_programmability/framework/deps/move-stdlib/sources/FixedPoint32.move rename to crates/sui-framework/deps/move-stdlib/sources/FixedPoint32.move diff --git a/sui_programmability/framework/deps/move-stdlib/sources/GUID.move b/crates/sui-framework/deps/move-stdlib/sources/GUID.move similarity index 100% rename from sui_programmability/framework/deps/move-stdlib/sources/GUID.move rename to crates/sui-framework/deps/move-stdlib/sources/GUID.move diff --git a/sui_programmability/framework/deps/move-stdlib/sources/Hash.move b/crates/sui-framework/deps/move-stdlib/sources/Hash.move similarity index 100% rename from sui_programmability/framework/deps/move-stdlib/sources/Hash.move rename to crates/sui-framework/deps/move-stdlib/sources/Hash.move diff --git a/sui_programmability/framework/deps/move-stdlib/sources/Option.move b/crates/sui-framework/deps/move-stdlib/sources/Option.move similarity index 100% rename from sui_programmability/framework/deps/move-stdlib/sources/Option.move rename to crates/sui-framework/deps/move-stdlib/sources/Option.move diff --git a/sui_programmability/framework/deps/move-stdlib/sources/Signer.move b/crates/sui-framework/deps/move-stdlib/sources/Signer.move similarity index 100% rename from sui_programmability/framework/deps/move-stdlib/sources/Signer.move rename to crates/sui-framework/deps/move-stdlib/sources/Signer.move diff --git a/sui_programmability/framework/deps/move-stdlib/sources/UnitTest.move b/crates/sui-framework/deps/move-stdlib/sources/UnitTest.move similarity index 100% rename from sui_programmability/framework/deps/move-stdlib/sources/UnitTest.move rename to crates/sui-framework/deps/move-stdlib/sources/UnitTest.move diff --git a/sui_programmability/framework/deps/move-stdlib/sources/Vector.move b/crates/sui-framework/deps/move-stdlib/sources/Vector.move similarity index 100% rename from sui_programmability/framework/deps/move-stdlib/sources/Vector.move rename to crates/sui-framework/deps/move-stdlib/sources/Vector.move diff --git a/sui_programmability/framework/sources/Bag.move b/crates/sui-framework/sources/Bag.move similarity index 100% rename from sui_programmability/framework/sources/Bag.move rename to crates/sui-framework/sources/Bag.move diff --git a/sui_programmability/framework/sources/Balance.move b/crates/sui-framework/sources/Balance.move similarity index 100% rename from sui_programmability/framework/sources/Balance.move rename to crates/sui-framework/sources/Balance.move diff --git a/sui_programmability/framework/sources/Coin.move b/crates/sui-framework/sources/Coin.move similarity index 100% rename from sui_programmability/framework/sources/Coin.move rename to crates/sui-framework/sources/Coin.move diff --git a/sui_programmability/framework/sources/Collection.move b/crates/sui-framework/sources/Collection.move similarity index 100% rename from sui_programmability/framework/sources/Collection.move rename to crates/sui-framework/sources/Collection.move diff --git a/sui_programmability/framework/sources/DevNetNFT.move b/crates/sui-framework/sources/DevNetNFT.move similarity index 100% rename from sui_programmability/framework/sources/DevNetNFT.move rename to crates/sui-framework/sources/DevNetNFT.move diff --git a/sui_programmability/framework/sources/ERC721Metadata.move b/crates/sui-framework/sources/ERC721Metadata.move similarity index 100% rename from sui_programmability/framework/sources/ERC721Metadata.move rename to crates/sui-framework/sources/ERC721Metadata.move diff --git a/sui_programmability/framework/sources/Event.move b/crates/sui-framework/sources/Event.move similarity index 100% rename from sui_programmability/framework/sources/Event.move rename to crates/sui-framework/sources/Event.move diff --git a/sui_programmability/framework/sources/Governance/Delegation.move b/crates/sui-framework/sources/Governance/Delegation.move similarity index 100% rename from sui_programmability/framework/sources/Governance/Delegation.move rename to crates/sui-framework/sources/Governance/Delegation.move diff --git a/sui_programmability/framework/sources/Governance/EpochRewardRecord.move b/crates/sui-framework/sources/Governance/EpochRewardRecord.move similarity index 100% rename from sui_programmability/framework/sources/Governance/EpochRewardRecord.move rename to crates/sui-framework/sources/Governance/EpochRewardRecord.move diff --git a/sui_programmability/framework/sources/Governance/Genesis.move b/crates/sui-framework/sources/Governance/Genesis.move similarity index 100% rename from sui_programmability/framework/sources/Governance/Genesis.move rename to crates/sui-framework/sources/Governance/Genesis.move diff --git a/sui_programmability/framework/sources/Governance/SuiSystem.move b/crates/sui-framework/sources/Governance/SuiSystem.move similarity index 100% rename from sui_programmability/framework/sources/Governance/SuiSystem.move rename to crates/sui-framework/sources/Governance/SuiSystem.move diff --git a/sui_programmability/framework/sources/Governance/Validator.move b/crates/sui-framework/sources/Governance/Validator.move similarity index 100% rename from sui_programmability/framework/sources/Governance/Validator.move rename to crates/sui-framework/sources/Governance/Validator.move diff --git a/sui_programmability/framework/sources/Governance/ValidatorSet.move b/crates/sui-framework/sources/Governance/ValidatorSet.move similarity index 100% rename from sui_programmability/framework/sources/Governance/ValidatorSet.move rename to crates/sui-framework/sources/Governance/ValidatorSet.move diff --git a/sui_programmability/framework/sources/ID.move b/crates/sui-framework/sources/ID.move similarity index 100% rename from sui_programmability/framework/sources/ID.move rename to crates/sui-framework/sources/ID.move diff --git a/sui_programmability/framework/sources/Math.move b/crates/sui-framework/sources/Math.move similarity index 100% rename from sui_programmability/framework/sources/Math.move rename to crates/sui-framework/sources/Math.move diff --git a/sui_programmability/framework/sources/ObjectBasics.move b/crates/sui-framework/sources/ObjectBasics.move similarity index 100% rename from sui_programmability/framework/sources/ObjectBasics.move rename to crates/sui-framework/sources/ObjectBasics.move diff --git a/sui_programmability/framework/sources/SUI.move b/crates/sui-framework/sources/SUI.move similarity index 100% rename from sui_programmability/framework/sources/SUI.move rename to crates/sui-framework/sources/SUI.move diff --git a/sui_programmability/framework/sources/TestScenario.move b/crates/sui-framework/sources/TestScenario.move similarity index 100% rename from sui_programmability/framework/sources/TestScenario.move rename to crates/sui-framework/sources/TestScenario.move diff --git a/sui_programmability/framework/sources/Transfer.move b/crates/sui-framework/sources/Transfer.move similarity index 100% rename from sui_programmability/framework/sources/Transfer.move rename to crates/sui-framework/sources/Transfer.move diff --git a/sui_programmability/framework/sources/TxContext.move b/crates/sui-framework/sources/TxContext.move similarity index 100% rename from sui_programmability/framework/sources/TxContext.move rename to crates/sui-framework/sources/TxContext.move diff --git a/sui_programmability/framework/sources/UTF8.move b/crates/sui-framework/sources/UTF8.move similarity index 100% rename from sui_programmability/framework/sources/UTF8.move rename to crates/sui-framework/sources/UTF8.move diff --git a/sui_programmability/framework/sources/Url.move b/crates/sui-framework/sources/Url.move similarity index 100% rename from sui_programmability/framework/sources/Url.move rename to crates/sui-framework/sources/Url.move diff --git a/sui_programmability/framework/src/lib.rs b/crates/sui-framework/src/lib.rs similarity index 99% rename from sui_programmability/framework/src/lib.rs rename to crates/sui-framework/src/lib.rs index d66ebbf0e5bee..80fbd9325bb51 100644 --- a/sui_programmability/framework/src/lib.rs +++ b/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/sui_programmability/framework/src/natives/event.rs b/crates/sui-framework/src/natives/event.rs similarity index 100% rename from sui_programmability/framework/src/natives/event.rs rename to crates/sui-framework/src/natives/event.rs diff --git a/sui_programmability/framework/src/natives/id.rs b/crates/sui-framework/src/natives/id.rs similarity index 100% rename from sui_programmability/framework/src/natives/id.rs rename to crates/sui-framework/src/natives/id.rs diff --git a/sui_programmability/framework/src/natives/mod.rs b/crates/sui-framework/src/natives/mod.rs similarity index 100% rename from sui_programmability/framework/src/natives/mod.rs rename to crates/sui-framework/src/natives/mod.rs diff --git a/sui_programmability/framework/src/natives/test_scenario.rs b/crates/sui-framework/src/natives/test_scenario.rs similarity index 100% rename from sui_programmability/framework/src/natives/test_scenario.rs rename to crates/sui-framework/src/natives/test_scenario.rs diff --git a/sui_programmability/framework/src/natives/transfer.rs b/crates/sui-framework/src/natives/transfer.rs similarity index 100% rename from sui_programmability/framework/src/natives/transfer.rs rename to crates/sui-framework/src/natives/transfer.rs diff --git a/sui_programmability/framework/src/natives/tx_context.rs b/crates/sui-framework/src/natives/tx_context.rs similarity index 100% rename from sui_programmability/framework/src/natives/tx_context.rs rename to crates/sui-framework/src/natives/tx_context.rs diff --git a/sui_programmability/framework/tests/BagTests.move b/crates/sui-framework/tests/BagTests.move similarity index 100% rename from sui_programmability/framework/tests/BagTests.move rename to crates/sui-framework/tests/BagTests.move diff --git a/sui_programmability/framework/tests/CoinBalanceTests.move b/crates/sui-framework/tests/CoinBalanceTests.move similarity index 100% rename from sui_programmability/framework/tests/CoinBalanceTests.move rename to crates/sui-framework/tests/CoinBalanceTests.move diff --git a/sui_programmability/framework/tests/CollectionTests.move b/crates/sui-framework/tests/CollectionTests.move similarity index 100% rename from sui_programmability/framework/tests/CollectionTests.move rename to crates/sui-framework/tests/CollectionTests.move diff --git a/sui_programmability/framework/tests/IDTests.move b/crates/sui-framework/tests/IDTests.move similarity index 100% rename from sui_programmability/framework/tests/IDTests.move rename to crates/sui-framework/tests/IDTests.move diff --git a/sui_programmability/framework/tests/MathTests.move b/crates/sui-framework/tests/MathTests.move similarity index 100% rename from sui_programmability/framework/tests/MathTests.move rename to crates/sui-framework/tests/MathTests.move diff --git a/sui_programmability/framework/tests/TestScenarioTests.move b/crates/sui-framework/tests/TestScenarioTests.move similarity index 100% rename from sui_programmability/framework/tests/TestScenarioTests.move rename to crates/sui-framework/tests/TestScenarioTests.move diff --git a/sui_programmability/framework/tests/TxContextTests.move b/crates/sui-framework/tests/TxContextTests.move similarity index 100% rename from sui_programmability/framework/tests/TxContextTests.move rename to crates/sui-framework/tests/TxContextTests.move diff --git a/sui_programmability/framework/tests/UrlTests.move b/crates/sui-framework/tests/UrlTests.move similarity index 100% rename from sui_programmability/framework/tests/UrlTests.move rename to crates/sui-framework/tests/UrlTests.move diff --git a/sui_programmability/framework/tests/ValidatorSetTests.move b/crates/sui-framework/tests/ValidatorSetTests.move similarity index 100% rename from sui_programmability/framework/tests/ValidatorSetTests.move rename to crates/sui-framework/tests/ValidatorSetTests.move diff --git a/sui_programmability/framework/tests/ValidatorTests.move b/crates/sui-framework/tests/ValidatorTests.move similarity index 100% rename from sui_programmability/framework/tests/ValidatorTests.move rename to crates/sui-framework/tests/ValidatorTests.move diff --git a/crates/sui-json/Cargo.toml b/crates/sui-json/Cargo.toml index daf7db36f9146..1c872c58b0e7f 100644 --- 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 index cd734f26b511b..a9e258dafa424 100644 --- 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 index 37f052125e58a..21fb1f6d7dc6b 100644 --- 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 index 0c1e7c56036d8..faf8dadadeb62 100644 --- 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 index db02f5a5bb88b..d98f3313220a7 100644 --- 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 index 0c1e7c56036d8..faf8dadadeb62 100644 --- 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 index b51c4cb4c79f5..f236e1a222f4d 100644 --- 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 index 0c1e7c56036d8..faf8dadadeb62 100644 --- 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 index 3c36a718d7b83..a9abb50255afd 100644 --- 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 index 6c4cc6c8852b4..8b5ade25a40b6 100644 --- 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 index 1100883f7c536..a8edf3d83f791 100644 --- 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 index 3d4aaee273f3e..2077759bb9758 100644 --- 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 index 00e8dfb26f4f4..8361976dbf784 100644 --- 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 index 7ae8f35e0d879..077789659d356 100644 --- 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 index 48bce0407a41a..d467526b14781 100644 --- 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 index 93189c6c924a5..7447088d1bfbb 100644 --- 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 index 3814f95dc2f4b..1c86cfb369b96 100644 --- 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 index 8022147d560d1..49e2227403359 100644 --- 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"}