Merge branch 'main' into torii-types-test

dojoengine · Sep 28, 2023 · 746c526 · 746c526
2 parents a88a446 + 23f6e64
commit 746c526
Show file tree

Hide file tree

Showing 340 changed files with 20,714 additions and 18,928 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,11 +15,9 @@ jobs:
     runs-on: ubuntu-latest-4-cores
     steps:
       - uses: actions/checkout@v3
-
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ env.RUST_VERSION }}
-
       - uses: Swatinem/rust-cache@v2
       - uses: arduino/setup-protoc@v1
         with:
@@ -31,17 +29,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ env.RUST_VERSION }}
           targets: wasm32-unknown-unknown
-
       - uses: Swatinem/rust-cache@v2
-      - name: "Ensure `torii-client` crate is wasmable"
+      - uses: arduino/setup-protoc@v2
+      - name: "Ensure `torii-client` crate is WASM-able"
         run: |
           cargo build -r --target wasm32-unknown-unknown -p torii-client
-      - name: "Ensure `torii-client-wasm` crate is wasmable"
+      - name: "Ensure `torii-client-wasm` crate is WASM-able"
         run: |
           cargo build -r --target wasm32-unknown-unknown --manifest-path crates/torii/client/wasm/Cargo.toml
 
@@ -57,29 +54,48 @@ jobs:
   #     - run: cargo install cairo-lang-formatter
   #     - run: scripts/cairo_fmt.sh --check
 
-  cairotest:
+  dojo-core-test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3 
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{ env.RUST_VERSION }}
+      - uses: Swatinem/rust-cache@v2
+      - uses: arduino/setup-protoc@v2
+      - run: cargo run --bin sozo -- --manifest-path crates/dojo-core/Scarb.toml test
+
+  dojo-erc-test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3 
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{ env.RUST_VERSION }}
+      - uses: Swatinem/rust-cache@v2
+      - uses: arduino/setup-protoc@v2
+      - run: cargo run --bin sozo -- --manifest-path crates/dojo-erc/Scarb.toml test
+
+  dojo-ecs-example-test:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ env.RUST_VERSION }}
-
       - uses: Swatinem/rust-cache@v2
-      - run: scripts/cairo_test.sh
+      - uses: arduino/setup-protoc@v2
+      - run: cargo run --bin sozo -- --manifest-path examples/ecs/Scarb.toml test
 
   clippy:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ env.RUST_VERSION }}
           targets: wasm32-unknown-unknown
           components: clippy
-
       - uses: Swatinem/rust-cache@v2
       - uses: arduino/setup-protoc@v1
         with:
@@ -90,19 +106,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: nightly
           components: rustfmt
-
       - uses: Swatinem/rust-cache@v2
       - uses: arduino/setup-protoc@v1
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
       - run: scripts/rust_fmt.sh --check
-      - name: "Format TOML files"
-        run: cargo install taplo-cli && taplo format 
 
   # Check for unnecessary dependencies.
   # udeps:
@@ -138,11 +150,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ env.RUST_VERSION }}
-
       - uses: Swatinem/rust-cache@v2
       - uses: arduino/setup-protoc@v1
         with:
@@ -158,11 +168,9 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
-
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ env.RUST_VERSION }}
-
       - uses: Swatinem/rust-cache@v2
       - name: Install Hurl
         run: |

diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
-/target
+**/target
 workspace
 .idea/
 dojo.iml

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -7,61 +7,21 @@
         {
             "type": "lldb",
             "request": "launch",
-            "name": "Debug unit tests in library 'dojo-world'",
+            "name": "Debug unit tests in 'dojo-world'",
             "cargo": {
                 "args": [
                     "test",
                     "--no-run",
-                    "--lib",
-                    "--package=dojo-world"
+                    "--package=dojo-world",
+                    "--lib"
                 ],
                 "filter": {
                     "name": "dojo-world",
                     "kind": "lib"
                 }
             },
-            "args": [],
-            "env": {
-                "CARGO_MANIFEST_DIR": "${workspaceFolder}/crates/dojo-world"
-            },
+            "args": ["migration::compile_moves"],
             "cwd": "${workspaceFolder}/crates/dojo-world"
         },
-        {
-            "type": "lldb",
-            "request": "launch",
-            "name": "Debug executable 'dojo-compile'",
-            "cargo": {
-                "args": [
-                    "build",
-                    "--bin=dojo-compile",
-                    "--package=dojo-lang"
-                ],
-                "filter": {
-                    "name": "dojo-compile",
-                    "kind": "bin"
-                }
-            },
-            "args": ["${workspaceFolder}/crates/dojo-lang/src/cairo_level_tests/component.cairo"],
-            "cwd": "${workspaceFolder}/crates/dojo-lang"
-        },
-        {
-            "type": "lldb",
-            "request": "launch",
-            "name": "Debug unit tests in executable 'dojo-compile'",
-            "cargo": {
-                "args": [
-                    "test",
-                    "--no-run",
-                    "--bin=dojo-compile",
-                    "--package=dojo-lang"
-                ],
-                "filter": {
-                    "name": "dojo-compile",
-                    "kind": "bin"
-                }
-            },
-            "args": [],
-            "cwd": "${workspaceFolder}/crates/dojo-lang"
-        }
     ]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json