Merge pull request #2 from dojoengine/ci

Setup ci

.github/workflows/ci.yml

@@ -0,0 +1,57 @@
+name: ci
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+env:
+  CARGO_TERM_COLOR: always
+  RUST_VERSION: 1.70.0
+
+jobs:
+  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@v1
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Install nextest test runner
+        uses: taiki-e/install-action@nextest
+      - run: |
+          cargo nextest run --all-features
+
+  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:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+      - run: scripts/clippy.sh
+
+  fmt:
+    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

.github/workflows/release.yml

@@ -0,0 +1,118 @@
+name: release
+
+on:
+  push:
+    tags:
+      - "*"
+
+env:
+  CARGO_TERM_COLOR: always
+  RUST_VERSION: 1.70.0
+
+jobs:
+  prepare:
+    name: Prepare release
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+  build-and-release:
+    name: ${{ matrix.job.target }} (${{ matrix.job.os }})
+    needs: prepare
+    runs-on: ${{ matrix.job.os }}
+    strategy:
+      matrix:
+        job:
+          # The OS is used for the runner
+          # The platform is a generic platform name
+          # The target is used by Cargo
+          # The arch is either 386, arm64 or amd64
+          # The svm target platform to use for the binary https://github.com/roynalnaruto/svm-rs/blob/84cbe0ac705becabdc13168bae28a45ad2299749/svm-builds/build.rs#L4-L24
+          - os: ubuntu-latest-32-cores
+            platform: linux
+            target: x86_64-unknown-linux-gnu
+            arch: amd64
+          - os: ubuntu-latest-32-cores
+            platform: linux
+            target: aarch64-unknown-linux-gnu
+            arch: arm64
+            svm_target_platform: linux-aarch64
+          - os: macos-latest
+            platform: darwin
+            target: x86_64-apple-darwin
+            arch: amd64
+          - os: macos-latest
+            platform: darwin
+            target: aarch64-apple-darwin
+            arch: arm64
+          - os: windows-latest
+            platform: win32
+            target: x86_64-pc-windows-msvc
+            arch: amd64
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: dtolnay/rust-toolchain@master
+        name: Rust Toolchain Setup
+        with:
+          targets: ${{ matrix.job.target }}
+          toolchain: ${{ env.RUST_VERSION }}
+
+      - uses: Swatinem/rust-cache@v1
+        with:
+          cache-on-failure: true
+
+      - uses: arduino/setup-protoc@v1
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Apple M1 setup
+        if: ${{ matrix.job.target == 'aarch64-apple-darwin' }}
+        run: |
+          echo "SDKROOT=$(xcrun -sdk macosx --show-sdk-path)" >> $GITHUB_ENV
+          echo "MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx --show-sdk-platform-version)" >> $GITHUB_ENV
+
+      - name: Linux ARM setup
+        if: ${{ matrix.job.target == 'aarch64-unknown-linux-gnu' }}
+        run: |
+          sudo apt-get update -y
+          sudo apt-get install -y gcc-aarch64-linux-gnu libssl-dev
+          echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
+
+      - name: Build binaries
+        run: cargo build --release --target ${{ matrix.job.target }}
+
+      - name: debug
+        run: ls target/${{ matrix.job.arch }}/release
+
+      - name: Package
+        run: |
+          if [[ "${{ matrix.job.os }}" == "macos-latest" ]]; then
+            tar -czvf torii-${{ matrix.job.target }}-${{ matrix.job.arch }}.tar.gz target/${{ matrix.job.arch }}/release/libtorii_c.dylib
+          elif [[ "${{ matrix.job.os }}" == "windows-latest" ]]; then
+            tar -czvf torii-${{ matrix.job.target }}-${{ matrix.job.arch }}.tar.gz target/${{ matrix.job.arch }}/release/libtorii_c.dll
+          else
+            tar -czvf torii-${{ matrix.job.target }}-${{ matrix.job.arch }}.tar.gz target/${{ matrix.job.arch }}/release/libtorii_c.so
+          fi
+
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: Release ${{ github.ref }}
+          draft: false
+          prerelease: false
+
+      - name: Upload Release Asset
+        uses: actions/upload-release-asset@v1
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./torii-${{ matrix.job.target }}-${{ matrix.job.arch }}.tar.gz
+          asset_name: torii-${{ matrix.job.target }}-${{ matrix.job.arch }}.tar.gz
+          asset_content_type: application/gzip

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 edition = "2021"
-name = "torii-unity"
+name = "torii-c"
 version = "0.3.1"
 
 [lib]

README.md

@@ -6,5 +6,5 @@ This package provides C bindings for the Torii Client SDK. The approach is to ge
 
 ```
 cargo build --release
-gcc example/main.c -L target/release -l torii_unity -I ..
+gcc example/main.c -L target/release -l torii_c -I ..
 ```

build.rs

@@ -1,12 +1,12 @@
-extern crate cbindgen;
-
 use std::env;
 
 fn main() {
     let crate_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
 
-    let mut config: cbindgen::Config = Default::default();
-    config.language = cbindgen::Language::C;
+    let config = cbindgen::Config {
+        language: cbindgen::Language::C,
+        ..Default::default()
+    };
 
     cbindgen::Builder::new()
         .with_config(config)

scripts/rust_fmt.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+cargo +nightly fmt --check --all -- "$@"

src/lib.rs

@@ -15,9 +15,9 @@ pub struct FieldElement {
     data: [u8; 32],
 }
 
-impl Into<starknet::core::types::FieldElement> for &FieldElement {
-    fn into(self) -> starknet::core::types::FieldElement {
-        starknet::core::types::FieldElement::from_bytes_be(&self.data).unwrap()
+impl From<&FieldElement> for starknet::core::types::FieldElement {
+    fn from(val: &FieldElement) -> Self {
+        starknet::core::types::FieldElement::from_bytes_be(&val.data).unwrap()
     }
 }
 
@@ -29,10 +29,10 @@ pub struct EntityModel {
     pub keys_len: usize,
 }
 
-impl Into<dojo_types::schema::EntityModel> for &EntityModel {
-    fn into(self) -> dojo_types::schema::EntityModel {
-        let model = unsafe { CStr::from_ptr(self.model).to_string_lossy().into_owned() };
-        let keys = unsafe { std::slice::from_raw_parts(self.keys, self.keys_len).to_vec() };
+impl From<&EntityModel> for dojo_types::schema::EntityModel {
+    fn from(val: &EntityModel) -> Self {
+        let model = unsafe { CStr::from_ptr(val.model).to_string_lossy().into_owned() };
+        let keys = unsafe { std::slice::from_raw_parts(val.keys, val.keys_len).to_vec() };
 
         dojo_types::schema::EntityModel {
             model,
@@ -42,7 +42,8 @@ impl Into<dojo_types::schema::EntityModel> for &EntityModel {
 }
 
 #[no_mangle]
-pub extern "C" fn client_new(
+#[allow(clippy::missing_safety_doc)]
+pub unsafe extern "C" fn client_new(
     torii_url: *const c_char,
     rpc_url: *const c_char,
     world: &FieldElement,
@@ -79,7 +80,8 @@ pub extern "C" fn client_new(
 }
 
 #[no_mangle]
-pub extern "C" fn client_add_entities_to_sync(
+#[allow(clippy::missing_safety_doc)]
+pub unsafe extern "C" fn client_add_entities_to_sync(
     client: *mut ToriiClient,
     entities: *const EntityModel,
     entities_len: usize,
@@ -107,7 +109,8 @@ pub extern "C" fn client_add_entities_to_sync(
 }
 
 #[no_mangle]
-pub extern "C" fn client_remove_entities_to_sync(
+#[allow(clippy::missing_safety_doc)]
+pub unsafe extern "C" fn client_remove_entities_to_sync(
     client: *mut ToriiClient,
     entities: *const EntityModel,
     entities_len: usize,
@@ -139,7 +142,8 @@ pub extern "C" fn client_remove_entities_to_sync(
 // back into a Box<ToriiClient>, which gets dropped at the end of the scope,
 // deallocating the memory.
 #[no_mangle]
-pub extern "C" fn client_free(client: *mut ToriiClient) {
+#[allow(clippy::missing_safety_doc)]
+pub unsafe extern "C" fn client_free(client: *mut ToriiClient) {
     if !client.is_null() {
         unsafe {
             let _ = Box::from_raw(client);