From 33d28356ea8e9fb51518ee81fa1bb0f4e82d9876 Mon Sep 17 00:00:00 2001 From: glihm Date: Thu, 4 Apr 2024 16:33:46 -0400 Subject: [PATCH] fix: manifest name without `::` (#1770) * fix: remove from manifests name and use * fix: generate new manifests * ci: re-enable ensure-windows * fix: add new generated manifests for tests * fix: adjust clean command to new manifests path --- .github/workflows/ci.yml | 26 +++++++++---------- bin/sozo/src/commands/clean.rs | 11 +++++--- crates/dojo-lang/src/compiler.rs | 2 +- crates/dojo-world/src/manifest/mod.rs | 8 +++--- ...json => types_test_contracts_records.json} | 0 ...orld::world.json => dojo_world_world.json} | 0 ...ord.json => types_test_models_record.json} | 0 ... => types_test_models_record_sibling.json} | 0 ....json => types_test_models_subrecord.json} | 0 ...toml => types_test_contracts_records.toml} | 2 +- ...o::base::base.toml => dojo_base_base.toml} | 0 .../manifests/dev/base/dojo_world_world.toml | 2 +- ...ord.toml => types_test_models_record.toml} | 2 +- ... => types_test_models_record_sibling.toml} | 2 +- ....toml => types_test_models_subrecord.toml} | 2 +- ...son => dojo_examples_actions_actions.json} | 0 ...orld::world.json => dojo_world_world.json} | 0 ... dojo_examples_actions_actions_moved.json} | 0 ...s.json => dojo_examples_models_moves.json} | 0 ...son => dojo_examples_models_position.json} | 0 ...son => dojo_examples_actions_actions.json} | 0 ...orld::world.json => dojo_world_world.json} | 0 ... dojo_examples_actions_actions_moved.json} | 0 ...s.json => dojo_examples_models_moves.json} | 0 ...son => dojo_examples_models_position.json} | 0 ...oml => dojo_examples_actions_actions.toml} | 2 +- ...o::base::base.toml => dojo_base_base.toml} | 0 .../manifests/dev/base/dojo_world_world.toml | 2 +- ... dojo_examples_actions_actions_moved.toml} | 2 +- ...s.toml => dojo_examples_models_moves.toml} | 2 +- ...oml => dojo_examples_models_position.toml} | 2 +- .../manifests/dev/manifest.toml | 10 +++---- scripts/teardown_test_artifacts.sh | 3 +++ 33 files changed, 43 insertions(+), 37 deletions(-) rename crates/torii/types-test/manifests/dev/abis/base/contracts/{types_test::contracts::records.json => types_test_contracts_records.json} (100%) rename crates/torii/types-test/manifests/dev/abis/base/{dojo::world::world.json => dojo_world_world.json} (100%) rename crates/torii/types-test/manifests/dev/abis/base/models/{types_test::models::record.json => types_test_models_record.json} (100%) rename crates/torii/types-test/manifests/dev/abis/base/models/{types_test::models::record_sibling.json => types_test_models_record_sibling.json} (100%) rename crates/torii/types-test/manifests/dev/abis/base/models/{types_test::models::subrecord.json => types_test_models_subrecord.json} (100%) rename crates/torii/types-test/manifests/dev/base/contracts/{types_test::contracts::records.toml => types_test_contracts_records.toml} (79%) rename crates/torii/types-test/manifests/dev/base/{dojo::base::base.toml => dojo_base_base.toml} (100%) rename examples/spawn-and-move/manifests/dev/base/dojo::world::world.toml => crates/torii/types-test/manifests/dev/base/dojo_world_world.toml (79%) rename crates/torii/types-test/manifests/dev/base/models/{types_test::models::record.toml => types_test_models_record.toml} (94%) rename crates/torii/types-test/manifests/dev/base/models/{types_test::models::record_sibling.toml => types_test_models_record_sibling.toml} (81%) rename crates/torii/types-test/manifests/dev/base/models/{types_test::models::subrecord.toml => types_test_models_subrecord.toml} (85%) rename examples/spawn-and-move/manifests/dev/abis/base/contracts/{dojo_examples::actions::actions.json => dojo_examples_actions_actions.json} (100%) rename examples/spawn-and-move/manifests/dev/abis/base/{dojo::world::world.json => dojo_world_world.json} (100%) rename examples/spawn-and-move/manifests/dev/abis/base/models/{dojo_examples::actions::actions::moved.json => dojo_examples_actions_actions_moved.json} (100%) rename examples/spawn-and-move/manifests/dev/abis/base/models/{dojo_examples::models::moves.json => dojo_examples_models_moves.json} (100%) rename examples/spawn-and-move/manifests/dev/abis/base/models/{dojo_examples::models::position.json => dojo_examples_models_position.json} (100%) rename examples/spawn-and-move/manifests/dev/abis/deployments/contracts/{dojo_examples::actions::actions.json => dojo_examples_actions_actions.json} (100%) rename examples/spawn-and-move/manifests/dev/abis/deployments/{dojo::world::world.json => dojo_world_world.json} (100%) rename examples/spawn-and-move/manifests/dev/abis/deployments/models/{dojo_examples::actions::actions::moved.json => dojo_examples_actions_actions_moved.json} (100%) rename examples/spawn-and-move/manifests/dev/abis/deployments/models/{dojo_examples::models::moves.json => dojo_examples_models_moves.json} (100%) rename examples/spawn-and-move/manifests/dev/abis/deployments/models/{dojo_examples::models::position.json => dojo_examples_models_position.json} (100%) rename examples/spawn-and-move/manifests/dev/base/contracts/{dojo_examples::actions::actions.toml => dojo_examples_actions_actions.toml} (78%) rename examples/spawn-and-move/manifests/dev/base/{dojo::base::base.toml => dojo_base_base.toml} (100%) rename crates/torii/types-test/manifests/dev/base/dojo::world::world.toml => examples/spawn-and-move/manifests/dev/base/dojo_world_world.toml (79%) rename examples/spawn-and-move/manifests/dev/base/models/{dojo_examples::actions::actions::moved.toml => dojo_examples_actions_actions_moved.toml} (81%) rename examples/spawn-and-move/manifests/dev/base/models/{dojo_examples::models::moves.toml => dojo_examples_models_moves.toml} (85%) rename examples/spawn-and-move/manifests/dev/base/models/{dojo_examples::models::position.toml => dojo_examples_models_position.toml} (81%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f71f06e357..bb0c54609f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,19 +37,19 @@ jobs: - uses: Swatinem/rust-cache@v2 - run: cargo build -r --target wasm32-unknown-unknown -p torii-client -# ensure-windows: -# runs-on: windows-latest -# steps: -# - uses: actions/checkout@v3 -# - uses: actions-rs/toolchain@v1 -# with: -# toolchain: ${{ env.rust_version }} -# target: x86_64-pc-windows-msvc -# - uses: swatinem/rust-cache@v2 -# - uses: arduino/setup-protoc@v2 -# with: -# repo-token: ${{ secrets.github_token }} -# - run: cargo build --target x86_64-pc-windows-msvc --bins + ensure-windows: + runs-on: windows-latest + steps: + - uses: actions/checkout@v3 + - uses: actions-rs/toolchain@v1 + with: + toolchain: ${{ env.rust_version }} + target: x86_64-pc-windows-msvc + - uses: swatinem/rust-cache@v2 + - uses: arduino/setup-protoc@v2 + with: + repo-token: ${{ secrets.github_token }} + - run: cargo build --target x86_64-pc-windows-msvc --bins # cairofmt: # runs-on: ubuntu-latest diff --git a/bin/sozo/src/commands/clean.rs b/bin/sozo/src/commands/clean.rs index 0398c545a7..42129aed84 100644 --- a/bin/sozo/src/commands/clean.rs +++ b/bin/sozo/src/commands/clean.rs @@ -20,10 +20,10 @@ pub struct CleanArgs { } impl CleanArgs { - pub fn clean_manifests_abis(&self, root_dir: &Utf8PathBuf) -> Result<()> { + pub fn clean_manifests_abis(&self, root_dir: &Utf8PathBuf, profile_name: &str) -> Result<()> { let dirs = vec![ - root_dir.join(MANIFESTS_DIR).join(BASE_DIR), - root_dir.join(ABIS_DIR).join(BASE_DIR), + root_dir.join(MANIFESTS_DIR).join(profile_name).join(BASE_DIR), + root_dir.join(MANIFESTS_DIR).join(profile_name).join(ABIS_DIR).join(BASE_DIR), ]; for d in dirs { @@ -38,12 +38,15 @@ impl CleanArgs { pub fn run(self, config: &Config) -> Result<()> { let ws = scarb::ops::read_workspace(config.manifest_path(), config)?; + let profile_name = + ws.current_profile().expect("Scarb profile is expected at this point.").to_string(); + let clean_manifests_abis = self.manifests_abis || !self.artifacts; let clean_artifacts = self.artifacts || !self.manifests_abis; if clean_manifests_abis { let manifest_dir = ws.manifest_path().parent().unwrap().to_path_buf(); - self.clean_manifests_abis(&manifest_dir)?; + self.clean_manifests_abis(&manifest_dir, &profile_name)?; } if clean_artifacts { diff --git a/crates/dojo-lang/src/compiler.rs b/crates/dojo-lang/src/compiler.rs index 2d5f64a210..0f7d7d4163 100644 --- a/crates/dojo-lang/src/compiler.rs +++ b/crates/dojo-lang/src/compiler.rs @@ -458,7 +458,7 @@ fn write_manifest_and_abi( where T: Serialize + DeserializeOwned + ManifestMethods, { - let name = manifest.name.to_string(); + let name = manifest.name.to_string().replace("::", "_"); let relative_manifest_path = relative_manifest_dir.join(name.clone()).with_extension("toml"); let relative_abi_path = relative_abis_dir.join(name.clone()).with_extension("json"); diff --git a/crates/dojo-world/src/manifest/mod.rs b/crates/dojo-world/src/manifest/mod.rs index 8e0bceac33..de19e77b15 100644 --- a/crates/dojo-world/src/manifest/mod.rs +++ b/crates/dojo-world/src/manifest/mod.rs @@ -97,11 +97,11 @@ impl BaseManifest { let model_dir = path.join("models"); let world: Manifest = toml::from_str(&fs::read_to_string( - path.join(WORLD_CONTRACT_NAME).with_extension("toml"), + path.join(WORLD_CONTRACT_NAME.replace("::", "_")).with_extension("toml"), )?)?; let base: Manifest = toml::from_str(&fs::read_to_string( - path.join(BASE_CONTRACT_NAME).with_extension("toml"), + path.join(BASE_CONTRACT_NAME.replace("::", "_")).with_extension("toml"), )?)?; let contracts = elements_from_path::(&contract_dir)?; @@ -138,14 +138,14 @@ impl OverlayManifest { pub fn load_from_path(path: &Utf8PathBuf) -> Result { let mut world: Option = None; - let world_path = path.join(WORLD_CONTRACT_NAME).with_extension("toml"); + let world_path = path.join(WORLD_CONTRACT_NAME.replace("::", "_")).with_extension("toml"); if world_path.exists() { world = Some(toml::from_str(&fs::read_to_string(world_path)?)?); } let mut base: Option = None; - let base_path = path.join(BASE_CONTRACT_NAME).with_extension("toml"); + let base_path = path.join(BASE_CONTRACT_NAME.replace("::", "_")).with_extension("toml"); if base_path.exists() { base = Some(toml::from_str(&fs::read_to_string(base_path)?)?); diff --git a/crates/torii/types-test/manifests/dev/abis/base/contracts/types_test::contracts::records.json b/crates/torii/types-test/manifests/dev/abis/base/contracts/types_test_contracts_records.json similarity index 100% rename from crates/torii/types-test/manifests/dev/abis/base/contracts/types_test::contracts::records.json rename to crates/torii/types-test/manifests/dev/abis/base/contracts/types_test_contracts_records.json diff --git a/crates/torii/types-test/manifests/dev/abis/base/dojo::world::world.json b/crates/torii/types-test/manifests/dev/abis/base/dojo_world_world.json similarity index 100% rename from crates/torii/types-test/manifests/dev/abis/base/dojo::world::world.json rename to crates/torii/types-test/manifests/dev/abis/base/dojo_world_world.json diff --git a/crates/torii/types-test/manifests/dev/abis/base/models/types_test::models::record.json b/crates/torii/types-test/manifests/dev/abis/base/models/types_test_models_record.json similarity index 100% rename from crates/torii/types-test/manifests/dev/abis/base/models/types_test::models::record.json rename to crates/torii/types-test/manifests/dev/abis/base/models/types_test_models_record.json diff --git a/crates/torii/types-test/manifests/dev/abis/base/models/types_test::models::record_sibling.json b/crates/torii/types-test/manifests/dev/abis/base/models/types_test_models_record_sibling.json similarity index 100% rename from crates/torii/types-test/manifests/dev/abis/base/models/types_test::models::record_sibling.json rename to crates/torii/types-test/manifests/dev/abis/base/models/types_test_models_record_sibling.json diff --git a/crates/torii/types-test/manifests/dev/abis/base/models/types_test::models::subrecord.json b/crates/torii/types-test/manifests/dev/abis/base/models/types_test_models_subrecord.json similarity index 100% rename from crates/torii/types-test/manifests/dev/abis/base/models/types_test::models::subrecord.json rename to crates/torii/types-test/manifests/dev/abis/base/models/types_test_models_subrecord.json diff --git a/crates/torii/types-test/manifests/dev/base/contracts/types_test::contracts::records.toml b/crates/torii/types-test/manifests/dev/base/contracts/types_test_contracts_records.toml similarity index 79% rename from crates/torii/types-test/manifests/dev/base/contracts/types_test::contracts::records.toml rename to crates/torii/types-test/manifests/dev/base/contracts/types_test_contracts_records.toml index d9037bbb47..27cbb6f796 100644 --- a/crates/torii/types-test/manifests/dev/base/contracts/types_test::contracts::records.toml +++ b/crates/torii/types-test/manifests/dev/base/contracts/types_test_contracts_records.toml @@ -2,7 +2,7 @@ kind = "DojoContract" class_hash = "0x658309df749cea1c32e21920740011e829626ab06c9b4d0c05b75f82a20693b" original_class_hash = "0x658309df749cea1c32e21920740011e829626ab06c9b4d0c05b75f82a20693b" base_class_hash = "0x0" -abi = "manifests/dev/abis/base/contracts/types_test::contracts::records.json" +abi = "manifests/dev/abis/base/contracts/types_test_contracts_records.json" reads = [] writes = [] computed = [] diff --git a/crates/torii/types-test/manifests/dev/base/dojo::base::base.toml b/crates/torii/types-test/manifests/dev/base/dojo_base_base.toml similarity index 100% rename from crates/torii/types-test/manifests/dev/base/dojo::base::base.toml rename to crates/torii/types-test/manifests/dev/base/dojo_base_base.toml diff --git a/examples/spawn-and-move/manifests/dev/base/dojo::world::world.toml b/crates/torii/types-test/manifests/dev/base/dojo_world_world.toml similarity index 79% rename from examples/spawn-and-move/manifests/dev/base/dojo::world::world.toml rename to crates/torii/types-test/manifests/dev/base/dojo_world_world.toml index 5584a6f1c0..a08f22b905 100644 --- a/examples/spawn-and-move/manifests/dev/base/dojo::world::world.toml +++ b/crates/torii/types-test/manifests/dev/base/dojo_world_world.toml @@ -1,5 +1,5 @@ kind = "Class" class_hash = "0x799bc4e9da10bfb3dd88e6f223c9cfbf7745435cd14f5d69675ea448e578cd" original_class_hash = "0x799bc4e9da10bfb3dd88e6f223c9cfbf7745435cd14f5d69675ea448e578cd" -abi = "manifests/dev/abis/base/dojo::world::world.json" +abi = "manifests/dev/abis/base/dojo_world_world.json" name = "dojo::world::world" diff --git a/crates/torii/types-test/manifests/dev/base/models/types_test::models::record.toml b/crates/torii/types-test/manifests/dev/base/models/types_test_models_record.toml similarity index 94% rename from crates/torii/types-test/manifests/dev/base/models/types_test::models::record.toml rename to crates/torii/types-test/manifests/dev/base/models/types_test_models_record.toml index 41d3c76f75..1474e6e48a 100644 --- a/crates/torii/types-test/manifests/dev/base/models/types_test::models::record.toml +++ b/crates/torii/types-test/manifests/dev/base/models/types_test_models_record.toml @@ -1,7 +1,7 @@ kind = "DojoModel" class_hash = "0x134456282bbaf00e0895ff43f286af8d490202baf6279d2b05be9bc0c05f059" original_class_hash = "0x134456282bbaf00e0895ff43f286af8d490202baf6279d2b05be9bc0c05f059" -abi = "manifests/dev/abis/base/models/types_test::models::record.json" +abi = "manifests/dev/abis/base/models/types_test_models_record.json" name = "types_test::models::record" [[members]] diff --git a/crates/torii/types-test/manifests/dev/base/models/types_test::models::record_sibling.toml b/crates/torii/types-test/manifests/dev/base/models/types_test_models_record_sibling.toml similarity index 81% rename from crates/torii/types-test/manifests/dev/base/models/types_test::models::record_sibling.toml rename to crates/torii/types-test/manifests/dev/base/models/types_test_models_record_sibling.toml index a75309cf64..cf795b24b0 100644 --- a/crates/torii/types-test/manifests/dev/base/models/types_test::models::record_sibling.toml +++ b/crates/torii/types-test/manifests/dev/base/models/types_test_models_record_sibling.toml @@ -1,7 +1,7 @@ kind = "DojoModel" class_hash = "0x4e92336e21ac7970b9bd9f4e294705f7864c0b29f53fdbf42ff7a9d7f0a53f3" original_class_hash = "0x4e92336e21ac7970b9bd9f4e294705f7864c0b29f53fdbf42ff7a9d7f0a53f3" -abi = "manifests/dev/abis/base/models/types_test::models::record_sibling.json" +abi = "manifests/dev/abis/base/models/types_test_models_record_sibling.json" name = "types_test::models::record_sibling" [[members]] diff --git a/crates/torii/types-test/manifests/dev/base/models/types_test::models::subrecord.toml b/crates/torii/types-test/manifests/dev/base/models/types_test_models_subrecord.toml similarity index 85% rename from crates/torii/types-test/manifests/dev/base/models/types_test::models::subrecord.toml rename to crates/torii/types-test/manifests/dev/base/models/types_test_models_subrecord.toml index 0f7785f642..36158d7d9f 100644 --- a/crates/torii/types-test/manifests/dev/base/models/types_test::models::subrecord.toml +++ b/crates/torii/types-test/manifests/dev/base/models/types_test_models_subrecord.toml @@ -1,7 +1,7 @@ kind = "DojoModel" class_hash = "0x7a47c3a9c8509a1d4a0379e50799eba7b173db6e41961341fe3f856a51d627" original_class_hash = "0x7a47c3a9c8509a1d4a0379e50799eba7b173db6e41961341fe3f856a51d627" -abi = "manifests/dev/abis/base/models/types_test::models::subrecord.json" +abi = "manifests/dev/abis/base/models/types_test_models_subrecord.json" name = "types_test::models::subrecord" [[members]] diff --git a/examples/spawn-and-move/manifests/dev/abis/base/contracts/dojo_examples::actions::actions.json b/examples/spawn-and-move/manifests/dev/abis/base/contracts/dojo_examples_actions_actions.json similarity index 100% rename from examples/spawn-and-move/manifests/dev/abis/base/contracts/dojo_examples::actions::actions.json rename to examples/spawn-and-move/manifests/dev/abis/base/contracts/dojo_examples_actions_actions.json diff --git a/examples/spawn-and-move/manifests/dev/abis/base/dojo::world::world.json b/examples/spawn-and-move/manifests/dev/abis/base/dojo_world_world.json similarity index 100% rename from examples/spawn-and-move/manifests/dev/abis/base/dojo::world::world.json rename to examples/spawn-and-move/manifests/dev/abis/base/dojo_world_world.json diff --git a/examples/spawn-and-move/manifests/dev/abis/base/models/dojo_examples::actions::actions::moved.json b/examples/spawn-and-move/manifests/dev/abis/base/models/dojo_examples_actions_actions_moved.json similarity index 100% rename from examples/spawn-and-move/manifests/dev/abis/base/models/dojo_examples::actions::actions::moved.json rename to examples/spawn-and-move/manifests/dev/abis/base/models/dojo_examples_actions_actions_moved.json diff --git a/examples/spawn-and-move/manifests/dev/abis/base/models/dojo_examples::models::moves.json b/examples/spawn-and-move/manifests/dev/abis/base/models/dojo_examples_models_moves.json similarity index 100% rename from examples/spawn-and-move/manifests/dev/abis/base/models/dojo_examples::models::moves.json rename to examples/spawn-and-move/manifests/dev/abis/base/models/dojo_examples_models_moves.json diff --git a/examples/spawn-and-move/manifests/dev/abis/base/models/dojo_examples::models::position.json b/examples/spawn-and-move/manifests/dev/abis/base/models/dojo_examples_models_position.json similarity index 100% rename from examples/spawn-and-move/manifests/dev/abis/base/models/dojo_examples::models::position.json rename to examples/spawn-and-move/manifests/dev/abis/base/models/dojo_examples_models_position.json diff --git a/examples/spawn-and-move/manifests/dev/abis/deployments/contracts/dojo_examples::actions::actions.json b/examples/spawn-and-move/manifests/dev/abis/deployments/contracts/dojo_examples_actions_actions.json similarity index 100% rename from examples/spawn-and-move/manifests/dev/abis/deployments/contracts/dojo_examples::actions::actions.json rename to examples/spawn-and-move/manifests/dev/abis/deployments/contracts/dojo_examples_actions_actions.json diff --git a/examples/spawn-and-move/manifests/dev/abis/deployments/dojo::world::world.json b/examples/spawn-and-move/manifests/dev/abis/deployments/dojo_world_world.json similarity index 100% rename from examples/spawn-and-move/manifests/dev/abis/deployments/dojo::world::world.json rename to examples/spawn-and-move/manifests/dev/abis/deployments/dojo_world_world.json diff --git a/examples/spawn-and-move/manifests/dev/abis/deployments/models/dojo_examples::actions::actions::moved.json b/examples/spawn-and-move/manifests/dev/abis/deployments/models/dojo_examples_actions_actions_moved.json similarity index 100% rename from examples/spawn-and-move/manifests/dev/abis/deployments/models/dojo_examples::actions::actions::moved.json rename to examples/spawn-and-move/manifests/dev/abis/deployments/models/dojo_examples_actions_actions_moved.json diff --git a/examples/spawn-and-move/manifests/dev/abis/deployments/models/dojo_examples::models::moves.json b/examples/spawn-and-move/manifests/dev/abis/deployments/models/dojo_examples_models_moves.json similarity index 100% rename from examples/spawn-and-move/manifests/dev/abis/deployments/models/dojo_examples::models::moves.json rename to examples/spawn-and-move/manifests/dev/abis/deployments/models/dojo_examples_models_moves.json diff --git a/examples/spawn-and-move/manifests/dev/abis/deployments/models/dojo_examples::models::position.json b/examples/spawn-and-move/manifests/dev/abis/deployments/models/dojo_examples_models_position.json similarity index 100% rename from examples/spawn-and-move/manifests/dev/abis/deployments/models/dojo_examples::models::position.json rename to examples/spawn-and-move/manifests/dev/abis/deployments/models/dojo_examples_models_position.json diff --git a/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples::actions::actions.toml b/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples_actions_actions.toml similarity index 78% rename from examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples::actions::actions.toml rename to examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples_actions_actions.toml index c75c17b2f7..0fe97117a1 100644 --- a/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples::actions::actions.toml +++ b/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples_actions_actions.toml @@ -2,7 +2,7 @@ kind = "DojoContract" class_hash = "0x16b1037beb348c3cf11c7f10733d366c7f29bc9d9172ba663421e2af4dab83c" original_class_hash = "0x16b1037beb348c3cf11c7f10733d366c7f29bc9d9172ba663421e2af4dab83c" base_class_hash = "0x0" -abi = "manifests/dev/abis/base/contracts/dojo_examples::actions::actions.json" +abi = "manifests/dev/abis/base/contracts/dojo_examples_actions_actions.json" reads = [] writes = [] computed = [] diff --git a/examples/spawn-and-move/manifests/dev/base/dojo::base::base.toml b/examples/spawn-and-move/manifests/dev/base/dojo_base_base.toml similarity index 100% rename from examples/spawn-and-move/manifests/dev/base/dojo::base::base.toml rename to examples/spawn-and-move/manifests/dev/base/dojo_base_base.toml diff --git a/crates/torii/types-test/manifests/dev/base/dojo::world::world.toml b/examples/spawn-and-move/manifests/dev/base/dojo_world_world.toml similarity index 79% rename from crates/torii/types-test/manifests/dev/base/dojo::world::world.toml rename to examples/spawn-and-move/manifests/dev/base/dojo_world_world.toml index 5584a6f1c0..a08f22b905 100644 --- a/crates/torii/types-test/manifests/dev/base/dojo::world::world.toml +++ b/examples/spawn-and-move/manifests/dev/base/dojo_world_world.toml @@ -1,5 +1,5 @@ kind = "Class" class_hash = "0x799bc4e9da10bfb3dd88e6f223c9cfbf7745435cd14f5d69675ea448e578cd" original_class_hash = "0x799bc4e9da10bfb3dd88e6f223c9cfbf7745435cd14f5d69675ea448e578cd" -abi = "manifests/dev/abis/base/dojo::world::world.json" +abi = "manifests/dev/abis/base/dojo_world_world.json" name = "dojo::world::world" diff --git a/examples/spawn-and-move/manifests/dev/base/models/dojo_examples::actions::actions::moved.toml b/examples/spawn-and-move/manifests/dev/base/models/dojo_examples_actions_actions_moved.toml similarity index 81% rename from examples/spawn-and-move/manifests/dev/base/models/dojo_examples::actions::actions::moved.toml rename to examples/spawn-and-move/manifests/dev/base/models/dojo_examples_actions_actions_moved.toml index 521d35990d..51827417b0 100644 --- a/examples/spawn-and-move/manifests/dev/base/models/dojo_examples::actions::actions::moved.toml +++ b/examples/spawn-and-move/manifests/dev/base/models/dojo_examples_actions_actions_moved.toml @@ -1,7 +1,7 @@ kind = "DojoModel" class_hash = "0x52659850f9939482810d9f6b468b91dc99e0b7fa42c2016cf12833ec06ce911" original_class_hash = "0x52659850f9939482810d9f6b468b91dc99e0b7fa42c2016cf12833ec06ce911" -abi = "manifests/dev/abis/base/models/dojo_examples::actions::actions::moved.json" +abi = "manifests/dev/abis/base/models/dojo_examples_actions_actions_moved.json" name = "dojo_examples::actions::actions::moved" [[members]] diff --git a/examples/spawn-and-move/manifests/dev/base/models/dojo_examples::models::moves.toml b/examples/spawn-and-move/manifests/dev/base/models/dojo_examples_models_moves.toml similarity index 85% rename from examples/spawn-and-move/manifests/dev/base/models/dojo_examples::models::moves.toml rename to examples/spawn-and-move/manifests/dev/base/models/dojo_examples_models_moves.toml index b79f2c053a..31bb7ff6cc 100644 --- a/examples/spawn-and-move/manifests/dev/base/models/dojo_examples::models::moves.toml +++ b/examples/spawn-and-move/manifests/dev/base/models/dojo_examples_models_moves.toml @@ -1,7 +1,7 @@ kind = "DojoModel" class_hash = "0x511fbd833938f5c4b743eea1e67605a125d7ff60e8a09e8dc227ad2fb59ca54" original_class_hash = "0x511fbd833938f5c4b743eea1e67605a125d7ff60e8a09e8dc227ad2fb59ca54" -abi = "manifests/dev/abis/base/models/dojo_examples::models::moves.json" +abi = "manifests/dev/abis/base/models/dojo_examples_models_moves.json" name = "dojo_examples::models::moves" [[members]] diff --git a/examples/spawn-and-move/manifests/dev/base/models/dojo_examples::models::position.toml b/examples/spawn-and-move/manifests/dev/base/models/dojo_examples_models_position.toml similarity index 81% rename from examples/spawn-and-move/manifests/dev/base/models/dojo_examples::models::position.toml rename to examples/spawn-and-move/manifests/dev/base/models/dojo_examples_models_position.toml index 4bba82489f..8721663cef 100644 --- a/examples/spawn-and-move/manifests/dev/base/models/dojo_examples::models::position.toml +++ b/examples/spawn-and-move/manifests/dev/base/models/dojo_examples_models_position.toml @@ -1,7 +1,7 @@ kind = "DojoModel" class_hash = "0xb33ae053213ccb2a57967ffc4411901f3efab24781ca867adcd0b90f2fece5" original_class_hash = "0xb33ae053213ccb2a57967ffc4411901f3efab24781ca867adcd0b90f2fece5" -abi = "manifests/dev/abis/base/models/dojo_examples::models::position.json" +abi = "manifests/dev/abis/base/models/dojo_examples_models_position.json" name = "dojo_examples::models::position" [[members]] diff --git a/examples/spawn-and-move/manifests/dev/manifest.toml b/examples/spawn-and-move/manifests/dev/manifest.toml index 808efd47b9..e028f52316 100644 --- a/examples/spawn-and-move/manifests/dev/manifest.toml +++ b/examples/spawn-and-move/manifests/dev/manifest.toml @@ -2,7 +2,7 @@ kind = "Contract" class_hash = "0x799bc4e9da10bfb3dd88e6f223c9cfbf7745435cd14f5d69675ea448e578cd" original_class_hash = "0x799bc4e9da10bfb3dd88e6f223c9cfbf7745435cd14f5d69675ea448e578cd" -abi = "abis/deployments/dojo::world::world.json" +abi = "abis/deployments/dojo_world_world.json" address = "0x1385f25d20a724edc9c7b3bd9636c59af64cbaf9fcd12f33b3af96b2452f295" transaction_hash = "0x6afefdcc49b3563a4f3657900ba71e9f9356861b15b942a73f2018f046a1048" block_number = 3 @@ -21,7 +21,7 @@ address = "0x3539c9b89b08095ba914653fb0f20e55d4b172a415beade611bc260b346d0f7" class_hash = "0x16b1037beb348c3cf11c7f10733d366c7f29bc9d9172ba663421e2af4dab83c" original_class_hash = "0x16b1037beb348c3cf11c7f10733d366c7f29bc9d9172ba663421e2af4dab83c" base_class_hash = "0x679177a2cb757694ac4f326d01052ff0963eac0bc2a17116a2b87badcdf6f76" -abi = "abis/deployments/contracts/dojo_examples::actions::actions.json" +abi = "abis/deployments/contracts/dojo_examples_actions_actions.json" reads = [] writes = [] computed = [] @@ -31,7 +31,7 @@ name = "dojo_examples::actions::actions" kind = "DojoModel" class_hash = "0x52659850f9939482810d9f6b468b91dc99e0b7fa42c2016cf12833ec06ce911" original_class_hash = "0x52659850f9939482810d9f6b468b91dc99e0b7fa42c2016cf12833ec06ce911" -abi = "abis/deployments/models/dojo_examples::actions::actions::moved.json" +abi = "abis/deployments/models/dojo_examples_actions_actions_moved.json" name = "dojo_examples::actions::actions::moved" [[models.members]] @@ -48,7 +48,7 @@ key = false kind = "DojoModel" class_hash = "0x511fbd833938f5c4b743eea1e67605a125d7ff60e8a09e8dc227ad2fb59ca54" original_class_hash = "0x511fbd833938f5c4b743eea1e67605a125d7ff60e8a09e8dc227ad2fb59ca54" -abi = "abis/deployments/models/dojo_examples::models::moves.json" +abi = "abis/deployments/models/dojo_examples_models_moves.json" name = "dojo_examples::models::moves" [[models.members]] @@ -70,7 +70,7 @@ key = false kind = "DojoModel" class_hash = "0xb33ae053213ccb2a57967ffc4411901f3efab24781ca867adcd0b90f2fece5" original_class_hash = "0xb33ae053213ccb2a57967ffc4411901f3efab24781ca867adcd0b90f2fece5" -abi = "abis/deployments/models/dojo_examples::models::position.json" +abi = "abis/deployments/models/dojo_examples_models_position.json" name = "dojo_examples::models::position" [[models.members]] diff --git a/scripts/teardown_test_artifacts.sh b/scripts/teardown_test_artifacts.sh index 5c324ed7bd..8dec13caf1 100644 --- a/scripts/teardown_test_artifacts.sh +++ b/scripts/teardown_test_artifacts.sh @@ -5,4 +5,7 @@ # This script gives an easy way to remove those artifacts. rm -rf examples/spawn-and-move/target +rm -rf examples/spawn-and-move/manifests + rm -rf crates/torii/types-test/target +rm -rf crates/torii/types-test/manifests