refactor(contracts): split player/drug name to component (#87)

Scarb.toml

@@ -7,7 +7,7 @@ cairo-version = "2.0.0-rc4"
 sierra-replace-ids = true
 
 [dependencies]
-dojo = { git = "https://github.com/dojoengine/dojo.git"}
+dojo = { git = "https://github.com/dojoengine/dojo.git", rev="b842d0a2c137fe232d4b9d8a4282a4c78771e3d8"}
 
 [[target.dojo]]
 

src/components.cairo

@@ -4,3 +4,4 @@ mod player;
 mod drug;
 mod location;
 mod risks;
+mod name;

src/components/drug.cairo

@@ -3,8 +3,7 @@ use traits::{Into, TryInto};
 
 #[derive(Component, Copy, Drop, Serde)]
 struct Drug {
-    name: felt252,
-    quantity: usize,
+    quantity: usize, 
 }
 
 trait DrugTrait {

src/components/name.cairo

@@ -0,0 +1,4 @@
+#[derive(Component, Copy, Drop, Serde)]
+struct Name {
+    short_string: felt252, 
+}

src/components/player.cairo

@@ -1,6 +1,5 @@
 #[derive(Component, Copy, Drop, Serde)]
 struct Player {
-    name: felt252,
     cash: u128,
     health: u8,
     arrested: bool,

src/systems/create.cairo

@@ -7,6 +7,7 @@ mod create_game {
     use dojo::world::Context;
 
     use rollyourown::events::{emit, GameCreated, PlayerJoined};
+    use rollyourown::components::name::Name;
     use rollyourown::components::game::Game;
     use rollyourown::components::player::Player;
     use rollyourown::components::risks::Risks;
@@ -48,7 +49,6 @@ mod create_game {
             (game_id, player_id).into(),
             (
                 Player {
-                    name: 0, // set at end of game
                     cash: 100 * SCALING_FACTOR, // $100
                     health: 100,
                     arrested: false,
@@ -89,7 +89,13 @@ mod create_game {
                                 set !(
                                     ctx.world,
                                     (game_id, *location_name, *drug_name).into(),
-                                    (Market { cash: MARKET_CASH, quantity: MARKET_QUANTITY })
+                                    (
+                                        Name {
+                                            short_string: *drug_name
+                                            }, Market {
+                                            cash: MARKET_CASH, quantity: MARKET_QUANTITY
+                                        }
+                                    )
                                 );
                             },
                             Option::None(()) => {

src/systems/join.cairo

@@ -30,7 +30,6 @@ mod join_game {
             (game_id, player_id).into(),
             (
                 Player {
-                    name: 0, // set at end of game
                     cash: 100 * SCALING_FACTOR, // $100
                     health: 100,
                     arrested: false,

src/systems/player.cairo

@@ -5,23 +5,12 @@ mod set_name {
 
     use dojo::world::Context;
     use rollyourown::components::game::Game;
-    use rollyourown::components::player::Player;
+    use rollyourown::components::name::Name;
 
     fn execute(ctx: Context, game_id: u32, player_name: felt252) {
         let player_id: felt252 = ctx.origin.into();
         let player_sk: Query = (game_id, player_id).into();
-        let player = get !(ctx.world, player_sk, (Player));
 
-        set !(
-            ctx.world,
-            player_sk,
-            (Player {
-                name: player_name,
-                cash: player.cash,
-                health: player.health,
-                arrested: player.arrested,
-                turns_remaining: player.turns_remaining,
-            })
-        )
+        set !(ctx.world, player_sk, (Name { short_string: player_name,  }))
     }
 }

src/systems/trade.cairo

@@ -47,7 +47,6 @@ mod buy {
             ctx.world,
             (game_id, player_id).into(),
             (Player {
-                name: player.name,
                 cash: player.cash - cost,
                 health: player.health,
                 arrested: player.arrested,
@@ -60,9 +59,7 @@ mod buy {
             Option::None(_) => quantity,
         };
         set !(
-            ctx.world,
-            (game_id, player_id, drug_name).into(),
-            (Drug { name: drug_name, quantity: player_quantity })
+            ctx.world, (game_id, player_id, drug_name).into(), (Drug { quantity: player_quantity })
         );
 
         Bought(game_id, player_id, drug_name, quantity, cost);
@@ -121,7 +118,6 @@ mod sell {
             ctx.world,
             (game_id, player_id).into(),
             (Player {
-                name: player.name,
                 cash: player.cash + payout,
                 health: player.health,
                 arrested: player.arrested,
@@ -131,7 +127,7 @@ mod sell {
         set !(
             ctx.world,
             (game_id, player_id, drug_name).into(),
-            (Drug { name: drug_name, quantity: player_quantity - quantity })
+            (Drug { quantity: player_quantity - quantity })
         );
 
         Sold(game_id, player_id, drug_name, quantity, payout);

src/systems/travel.cairo

@@ -45,7 +45,6 @@ mod travel {
                 Location {
                     name: next_location_name
                     }, Player {
-                    name: player.name,
                     cash: player.cash - result.money_loss,
                     health: updated_health,
                     arrested: result.arrested,

src/tests/create.cairo

@@ -23,6 +23,7 @@ use rollyourown::components::player::{player, Player};
 use rollyourown::components::drug::{drug, Drug};
 use rollyourown::components::location::{location, Location};
 use rollyourown::components::risks::{risks, Risks};
+use rollyourown::components::name::{name, Name};
 use rollyourown::systems::travel::travel;
 use rollyourown::systems::trade::{buy, sell};
 use rollyourown::systems::join::join_game;
@@ -46,6 +47,7 @@ fn spawn_game() -> (ContractAddress, u32, felt252) {
     components.append(risks::TEST_CLASS_HASH);
     components.append(market::TEST_CLASS_HASH);
     components.append(drug::TEST_CLASS_HASH);
+    components.append(name::TEST_CLASS_HASH);
 
     let mut systems = array::ArrayTrait::new();
     systems.append(create_game::TEST_CLASS_HASH);

src/tests/player.cairo

@@ -9,7 +9,7 @@ use starknet::{ContractAddress, syscalls::deploy_syscall};
 use starknet::class_hash::{ClassHash, Felt252TryIntoClassHash};
 use dojo::world::{IWorldDispatcher, IWorldDispatcherTrait};
 
-use rollyourown::components::player::{player, Player};
+use rollyourown::components::name::{name, Name};
 use rollyourown::tests::create::spawn_game;
 
 #[test]
@@ -24,9 +24,9 @@ fn test_set_name() {
 
     world.execute('set_name'.into(), set_name_calldata.span());
 
-    let mut res = world.entity('Player'.into(), (game_id, player_id).into(), 0, 0);
+    let mut res = world.entity('Name'.into(), (game_id, player_id).into(), 0, 0);
     assert(res.len() > 0, 'no player');
 
-    let player = serde::Serde::<Player>::deserialize(ref res).expect('deserialization failed');
-    assert(player.name == 'Rambo'.into(), 'incorrect name');
+    let name = serde::Serde::<Name>::deserialize(ref res).expect('deserialization failed');
+    assert(name.short_string == 'Rambo'.into(), 'incorrect name');
 }

web/src/components/Header.tsx

@@ -93,14 +93,6 @@ const Header = ({ back }: HeaderProps) => {
                 {inventoryInfos.used}/{inventoryInfos.capacity}
               </Text>
             </HStack>
-            <Divider orientation="vertical" borderColor="neon.600" h="12px" />
-            <HStack>
-              <Clock />{" "}
-              <Text whiteSpace="nowrap">
-                {!IsMobile && "Day"} {game.maxTurns - player.turnsRemaining}/
-                {game.maxTurns}
-              </Text>
-            </HStack>
           </HStack>
         </HStack>
       )}

web/src/constants.ts

@@ -1,4 +1,4 @@
 export const RYO_WORLD_ADDRESS =
-  "0x7d17bb24b59cb371c9ca36b79efca27fe53318e26340df3d8623dba5a7b9e5f";
+  "0x26065106fa319c3981618e7567480a50132f23932226a51c219ffb8e47daa84";
 export const ETH_CONTRACT_ADDRESS =
   "0x49d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7";