diff --git a/.github/workflows/test-contracts.yml b/.github/workflows/test-contracts.yml index 016d0c0a8..832146b1e 100644 --- a/.github/workflows/test-contracts.yml +++ b/.github/workflows/test-contracts.yml @@ -58,7 +58,6 @@ jobs: - name: Run Dojo Test for ${{ matrix.test }} run: | cd contracts && sozo test -f ${{ matrix.test }} --print-resource-usage - continue-on-error: true test-scarb-fmt: needs: [setup-environment] diff --git a/contracts/src/systems/combat/contracts.cairo b/contracts/src/systems/combat/contracts.cairo index a1b2d3a53..6258c6acc 100644 --- a/contracts/src/systems/combat/contracts.cairo +++ b/contracts/src/systems/combat/contracts.cairo @@ -875,9 +875,6 @@ mod combat_systems { // leave battle let mut battle: Battle = get!(world, battle_id, Battle); - - InternalCombatImpl::leave_battle(world, ref battle, ref caller_army); - battle.update_state(); let battle_was_active = (battle.has_started() && !battle.has_ended()); InternalCombatImpl::leave_battle(world, ref battle, ref caller_army); diff --git a/contracts/src/systems/combat/tests/army_buy_test.cairo b/contracts/src/systems/combat/tests/army_buy_test.cairo index 4e5a38867..03da6e427 100644 --- a/contracts/src/systems/combat/tests/army_buy_test.cairo +++ b/contracts/src/systems/combat/tests/army_buy_test.cairo @@ -58,7 +58,7 @@ fn setup() -> (IWorldDispatcher, ICombatContractDispatcher, ID, ID) { starknet::testing::set_account_contract_address(contract_address_const::()); let realm_id = realm_system_dispatcher - .create(1, 1, 1, 1, 1, 1, 1, 1, 1, Position { entity_id: 0, x: REALM_COORD_X, y: REALM_COORD_Y }); + .create('Mysticora', 1, 1, 1, 1, 1, 1, 1, 1, 1, Position { entity_id: 0, x: REALM_COORD_X, y: REALM_COORD_Y }); mint( world, realm_id, diff --git a/contracts/src/systems/combat/tests/army_create_test.cairo b/contracts/src/systems/combat/tests/army_create_test.cairo index 98fe33d55..f3ceebff0 100644 --- a/contracts/src/systems/combat/tests/army_create_test.cairo +++ b/contracts/src/systems/combat/tests/army_create_test.cairo @@ -54,7 +54,7 @@ fn setup() -> (IWorldDispatcher, ICombatContractDispatcher, ID,) { starknet::testing::set_account_contract_address(contract_address_const::()); let realm_id = realm_system_dispatcher - .create(1, 1, 1, 1, 1, 1, 1, 1, 1, Position { entity_id: 0, x: REALM_COORD_X, y: REALM_COORD_Y }); + .create('Mysticora', 1, 1, 1, 1, 1, 1, 1, 1, 1, Position { entity_id: 0, x: REALM_COORD_X, y: REALM_COORD_Y }); mint( world, realm_id, diff --git a/contracts/src/systems/combat/tests/battle_leave_test.cairo b/contracts/src/systems/combat/tests/battle_leave_test.cairo index 4fa9577c3..747d59c5c 100644 --- a/contracts/src/systems/combat/tests/battle_leave_test.cairo +++ b/contracts/src/systems/combat/tests/battle_leave_test.cairo @@ -99,7 +99,17 @@ fn setup() -> (IWorldDispatcher, ICombatContractDispatcher, ID, ID, ID, ID, ID, starknet::testing::set_account_contract_address(contract_address_const::()); let player_1_realm_id = realm_system_dispatcher .create( - 1, 1, 1, 1, 1, 1, 1, 1, 1, Position { entity_id: 0, x: PLAYER_1_REALM_COORD_X, y: PLAYER_1_REALM_COORD_Y } + 'Mysticora', + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + Position { entity_id: 0, x: PLAYER_1_REALM_COORD_X, y: PLAYER_1_REALM_COORD_Y } ); mint( world, @@ -129,7 +139,17 @@ fn setup() -> (IWorldDispatcher, ICombatContractDispatcher, ID, ID, ID, ID, ID, starknet::testing::set_account_contract_address(contract_address_const::()); let player_2_realm_id = realm_system_dispatcher .create( - 1, 1, 1, 1, 1, 1, 1, 1, 1, Position { entity_id: 0, x: PLAYER_2_REALM_COORD_X, y: PLAYER_2_REALM_COORD_Y } + 'Mysticora', + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + Position { entity_id: 0, x: PLAYER_2_REALM_COORD_X, y: PLAYER_2_REALM_COORD_Y } ); mint( world, @@ -159,7 +179,17 @@ fn setup() -> (IWorldDispatcher, ICombatContractDispatcher, ID, ID, ID, ID, ID, starknet::testing::set_account_contract_address(contract_address_const::()); let player_3_realm_id = realm_system_dispatcher .create( - 1, 1, 1, 1, 1, 1, 1, 1, 1, Position { entity_id: 0, x: PLAYER_3_REALM_COORD_X, y: PLAYER_3_REALM_COORD_Y } + 'Mysticora', + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + Position { entity_id: 0, x: PLAYER_3_REALM_COORD_X, y: PLAYER_3_REALM_COORD_Y } ); mint( world, diff --git a/contracts/src/systems/combat/tests/battle_start_test.cairo b/contracts/src/systems/combat/tests/battle_start_test.cairo index 039c8a930..b56791839 100644 --- a/contracts/src/systems/combat/tests/battle_start_test.cairo +++ b/contracts/src/systems/combat/tests/battle_start_test.cairo @@ -103,7 +103,17 @@ fn setup() -> (IWorldDispatcher, ICombatContractDispatcher, ID, ID, ID, ID, ID, starknet::testing::set_contract_address(contract_address_const::()); let player_1_realm_id = realm_system_dispatcher .create( - 1, 1, 1, 1, 1, 1, 1, 1, 1, Position { entity_id: 0, x: PLAYER_1_REALM_COORD_X, y: PLAYER_1_REALM_COORD_Y } + 'Mysticora1', + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + Position { entity_id: 0, x: PLAYER_1_REALM_COORD_X, y: PLAYER_1_REALM_COORD_Y } ); mint( world, @@ -132,7 +142,17 @@ fn setup() -> (IWorldDispatcher, ICombatContractDispatcher, ID, ID, ID, ID, ID, starknet::testing::set_contract_address(contract_address_const::()); let player_2_realm_id = realm_system_dispatcher .create( - 1, 1, 1, 1, 1, 1, 1, 1, 1, Position { entity_id: 0, x: PLAYER_2_REALM_COORD_X, y: PLAYER_2_REALM_COORD_Y } + 'Mysticora2', + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + Position { entity_id: 0, x: PLAYER_2_REALM_COORD_X, y: PLAYER_2_REALM_COORD_Y } ); mint( world, @@ -161,7 +181,17 @@ fn setup() -> (IWorldDispatcher, ICombatContractDispatcher, ID, ID, ID, ID, ID, starknet::testing::set_contract_address(contract_address_const::()); let player_3_realm_id = realm_system_dispatcher .create( - 1, 1, 1, 1, 1, 1, 1, 1, 1, Position { entity_id: 0, x: PLAYER_3_REALM_COORD_X, y: PLAYER_3_REALM_COORD_Y } + 'Mysticora3', + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + Position { entity_id: 0, x: PLAYER_3_REALM_COORD_X, y: PLAYER_3_REALM_COORD_Y } ); mint( world, diff --git a/contracts/src/systems/map/tests.cairo b/contracts/src/systems/map/tests.cairo index e1cc25a88..63fd15f59 100644 --- a/contracts/src/systems/map/tests.cairo +++ b/contracts/src/systems/map/tests.cairo @@ -57,9 +57,9 @@ use eternum::utils::testing::{ use starknet::contract_address_const; -const INITIAL_WHEAT_BALANCE: u128 = 1_000_000; -const INITIAL_FISH_BALANCE: u128 = 1_000_000; -const INITIAL_KNIGHT_BALANCE: u128 = 10_000; +const INITIAL_WHEAT_BALANCE: u128 = 10_000_000; +const INITIAL_FISH_BALANCE: u128 = 10_000_000; +const INITIAL_KNIGHT_BALANCE: u128 = 10_000_000; const TIMESTAMP: u64 = 10_000; diff --git a/contracts/src/systems/realm/tests.cairo b/contracts/src/systems/realm/tests.cairo index 9b67e5c29..ed2bfee08 100644 --- a/contracts/src/systems/realm/tests.cairo +++ b/contracts/src/systems/realm/tests.cairo @@ -84,6 +84,7 @@ fn test_realm_create() { let realm_entity_id = realm_systems_dispatcher .create( + 'Mysticora', realm_id, resource_types_packed, resource_types_count, diff --git a/contracts/src/systems/trade/tests/trade_systems_tests/accept_order.cairo b/contracts/src/systems/trade/tests/trade_systems_tests/accept_order.cairo index ae3690d99..4f2a51e7a 100644 --- a/contracts/src/systems/trade/tests/trade_systems_tests/accept_order.cairo +++ b/contracts/src/systems/trade/tests/trade_systems_tests/accept_order.cairo @@ -226,7 +226,7 @@ fn test_caller_not_taker() { #[available_gas(3000000000000)] #[should_panic( expected: ( - "not enough resources, Resource (entity id: 3, resource type: DONKEY, balance: 0). deduction: 1000", + "not enough resources, Resource (entity id: 4, resource type: DONKEY, balance: 0). deduction: 1000", 'ENTRYPOINT_FAILED' ) )] diff --git a/contracts/src/utils/testing/general.cairo b/contracts/src/utils/testing/general.cairo index e306150e9..e8f0f3230 100644 --- a/contracts/src/utils/testing/general.cairo +++ b/contracts/src/utils/testing/general.cairo @@ -16,6 +16,7 @@ use eternum::utils::map::biomes::Biome; fn spawn_realm(world: IWorldDispatcher, realm_systems_dispatcher: IRealmSystemsDispatcher, position: Position) -> ID { let realm_entity_id = realm_systems_dispatcher .create( + 'Mysticora', 1, // realm id 0x20309, // resource_types_packed // 2,3,9 // stone, coal, gold 3, // resource_types_count