fix build

BibliothecaDAO · Oct 13, 2023 · 8dc1a98 · 8dc1a98
1 parent a73bff6
commit 8dc1a98
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/contracts/game/src/game/interfaces.cairo b/contracts/game/src/game/interfaces.cairo
@@ -13,7 +13,7 @@ use survivor::{
 trait IGame<TContractState> {
     // ------ Game Actions ------
     fn new_game(
-        ref self: TContractState, client_reward_address: ContractAddress, weapon: u8, name: u128
+        ref self: TContractState, client_reward_address: ContractAddress, weapon: u8, name: u128, golden_token_id: u256
     );
     fn explore(ref self: TContractState, adventurer_id: felt252, till_beast: bool);
     fn attack(ref self: TContractState, adventurer_id: felt252, to_the_death: bool);

diff --git a/contracts/game/src/lib.cairo b/contracts/game/src/lib.cairo
@@ -23,7 +23,8 @@ mod Game {
         array::{SpanTrait, ArrayTrait}, integer::u256_try_as_non_zero, traits::{TryInto, Into},
         clone::Clone, poseidon::poseidon_hash_span, option::OptionTrait, box::BoxTrait,
         starknet::{
-            get_caller_address, ContractAddress, ContractAddressIntoFelt252, contract_address_const, get_block_timestamp
+            get_caller_address, ContractAddress, ContractAddressIntoFelt252, contract_address_const,
+            get_block_timestamp
         },
     };
 
@@ -3461,7 +3462,7 @@ mod Game {
         };
 
         assert(_can_play(@self, token_id), 'Cant play');
-        assert(golden_token.owner_of(token_id) == account, 'Not owner');
+        assert(golden_token.owner_of(token_id) == player, 'Not owner');
 
         self
             ._golden_token_last_use

diff --git a/contracts/game/src/tests/test_game.cairo b/contracts/game/src/tests/test_game.cairo
@@ -106,7 +106,7 @@ mod tests {
     }
 
     fn add_adventurer_to_game(ref game: IGameDispatcher) {
-        game.new_game(INTERFACE_ID(), ItemId::Wand, 'loothero', DEFAULT_NO_GOLDEN_TOKEN);
+        game.new_game(INTERFACE_ID(), ItemId::Wand, 'loothero', DEFAULT_NO_GOLDEN_TOKEN.into());
 
         let original_adventurer = game.get_adventurer(ADVENTURER_ID);
         assert(original_adventurer.xp == 0, 'wrong starting xp');
@@ -124,7 +124,7 @@ mod tests {
         let name = 'abcdefghijklmno';
 
         // start new game
-        game.new_game(INTERFACE_ID(), starting_weapon, name, DEFAULT_NO_GOLDEN_TOKEN);
+        game.new_game(INTERFACE_ID(), starting_weapon, name, DEFAULT_NO_GOLDEN_TOKEN.into());
 
         // get adventurer state
         let adventurer = game.get_adventurer(ADVENTURER_ID);