Merge pull request #34 from gianalarcon/update

Scarb.lock

@@ -3,8 +3,8 @@ version = 1
 
 [[package]]
 name = "dojo"
-version = "0.4.0"
-source = "git+https://github.com/dojoengine/dojo#17c1b42910cb751fe3986ed44ce4e3a6a16b1e51"
+version = "0.4.1"
+source = "git+https://github.com/dojoengine/dojo#3de37a62cfbd81063bd5eb1ad39f028b2d482049"
 dependencies = [
  "dojo_plugin",
 ]

Scarb.toml

@@ -7,7 +7,7 @@ version = "0.4.0"
 sierra-replace-ids = true
 
 [dependencies]
-dojo = { git = "https://github.com/dojoengine/dojo", version = "0.4.0" }
+dojo = { git = "https://github.com/dojoengine/dojo", version = "0.4.1" }
 
 [[target.dojo]]
 

src/actions.cairo

@@ -52,7 +52,7 @@ mod actions {
             set!(
                 world,
                 (
-                    Moves { player, remaining: 100, last_direction: Direction::None(()) },
+                    Moves { player, remaining: 100, last_direction: Direction::None },
                     Position { player, vec: Vec2 { x: 10, y: 10 } },
                 )
             );
@@ -125,13 +125,13 @@ mod tests {
         actions_system.spawn();
 
         // call move with direction right
-        actions_system.move(Direction::Right(()));
+        actions_system.move(Direction::Right);
 
         // Check world state
         let moves = get!(world, caller, Moves);
 
         // casting right direction
-        let right_dir_felt: felt252 = Direction::Right(()).into();
+        let right_dir_felt: felt252 = Direction::Right.into();
 
         // check moves
         assert(moves.remaining == 99, 'moves is wrong');

src/models.cairo

@@ -2,21 +2,21 @@ use starknet::ContractAddress;
 
 #[derive(Serde, Copy, Drop, Introspect)]
 enum Direction {
-    None: (),
-    Left: (),
-    Right: (),
-    Up: (),
-    Down: (),
+    None,
+    Left,
+    Right,
+    Up,
+    Down,
 }
 
 impl DirectionIntoFelt252 of Into<Direction, felt252> {
     fn into(self: Direction) -> felt252 {
         match self {
-            Direction::None(()) => 0,
-            Direction::Left(()) => 1,
-            Direction::Right(()) => 2,
-            Direction::Up(()) => 3,
-            Direction::Down(()) => 4,
+            Direction::None => 0,
+            Direction::Left => 1,
+            Direction::Right => 2,
+            Direction::Up => 3,
+            Direction::Down => 4,
         }
     }
 }

src/utils.cairo

@@ -2,22 +2,11 @@ use dojo_examples::models::{Position, Direction};
 
 fn next_position(mut position: Position, direction: Direction) -> Position {
     match direction {
-        Direction::None(()) => {
-            return position;
-        },
-        Direction::Left(()) => {
-            position.vec.x -= 1;
-        },
-        Direction::Right(()) => {
-            position.vec.x += 1;
-        },
-        Direction::Up(()) => {
-            position.vec.y -= 1;
-        },
-        Direction::Down(()) => {
-            position.vec.y += 1;
-        },
+        Direction::None => { return position; },
+        Direction::Left => { position.vec.x -= 1; },
+        Direction::Right => { position.vec.x += 1; },
+        Direction::Up => { position.vec.y -= 1; },
+        Direction::Down => { position.vec.y += 1; },
     };
-
     position
 }