Skip to content

Commit

Permalink
Merge remote-tracking branch 'dojo/main' into fix/model-store-trait
Browse files Browse the repository at this point in the history
  • Loading branch information
glihm committed Aug 27, 2024
2 parents 85af71c + b2ce5ef commit fc32300
Show file tree
Hide file tree
Showing 58 changed files with 1,258 additions and 2,137 deletions.
6 changes: 5 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions crates/dojo-core/src/tests/helpers.cairo
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,13 @@ pub mod foo_setter {
#[dojo::contract]
pub mod test_contract {}

#[dojo::contract]
pub mod test_contract_with_dojo_init_args {
fn dojo_init(world: @IWorldDispatcher, _arg1: felt252) {
let _u = world.uuid();
}
}

#[dojo::contract(namespace: "buzz_namespace", nomapping: true)]
pub mod buzz_contract {}

Expand Down
Loading

0 comments on commit fc32300

Please sign in to comment.