🔥 remove nonce and battle_id as key in Battle event, battle_id is now data

Author: Matth26

src/events.cairo

@@ -36,11 +36,8 @@ struct Battle {
     #[key]
     game_id: u32,
     #[key]
-    nonce: u32,
-    #[key]
-    battle_id: u32,
-    #[key]
     tx_hash: felt252,
+    battle_id: u32,
     duel_id: u32,
     attacker_index: u32,
     defender_index: u32,

src/models/tile.cairo

@@ -327,7 +327,6 @@ fn _duel(
         };
         let battle = Battle {
             game_id: 0,
-            nonce: 0,
             battle_id: battle_id,
             tx_hash: 0,
             duel_id: duel_id,
@@ -349,7 +348,6 @@ fn _duel(
         let offensive_value = *offensive.pop_front().unwrap();
         let battle = Battle {
             game_id: 0,
-            nonce: 0,
             battle_id: battle_id,
             tx_hash: 0,
             duel_id: duel_id,
@@ -370,7 +368,6 @@ fn _duel(
         let defensive_value = *defensive.pop_front().unwrap();
         let battle = Battle {
             game_id: 0,
-            nonce: 0,
             battle_id: battle_id,
             tx_hash: 0,
             duel_id: duel_id,
@@ -480,7 +477,9 @@ fn _connected_iter(
             }
             return _connected_iter(target, owner, tiles, ref visiteds, ref unvisiteds);
         },
-        Option::None => { return false; },
+        Option::None => {
+            return false;
+        },
     }
 }
 
@@ -507,7 +506,9 @@ fn _owned_dedup(ref array: Span<u8>, tiles: Span<Tile>, drops: Span<u8>, owner:
                     result.append(element);
                 };
             },
-            Option::None => { break; },
+            Option::None => {
+                break;
+            },
         };
     };
     result.span()
@@ -661,7 +662,9 @@ mod tests {
                         break index;
                     };
                 },
-                Option::None => { panic(array!['Tile: foreigner not found']); },
+                Option::None => {
+                    panic(array!['Tile: foreigner not found']);
+                },
             };
         };
         let mut to = TileTrait::new(GAME_ID, *index, 2, PLAYER_1);
@@ -765,10 +768,14 @@ mod tests {
         let mut allies = config::neighbors(attacker.id).expect('Tile: invalid id');
         let index = loop {
             match allies.pop_front() {
-                Option::Some(index) => { if index != @defender.id {
-                    break index;
-                }; },
-                Option::None => { panic(array!['Tile: ally not found']); },
+                Option::Some(index) => {
+                    if index != @defender.id {
+                        break index;
+                    };
+                },
+                Option::None => {
+                    panic(array!['Tile: ally not found']);
+                },
             };
         };
         let mut ally = TileTrait::new(GAME_ID, *index, 2, PLAYER_1);
@@ -852,7 +859,9 @@ mod tests {
                         break index;
                     };
                 },
-                Option::None => { panic(array!['Tile: foreigner not found']); },
+                Option::None => {
+                    panic(array!['Tile: foreigner not found']);
+                },
             };
         };
         let mut foreigner = TileTrait::new(GAME_ID, *index, 2, PLAYER_2);
@@ -946,7 +955,9 @@ mod tests {
                         break index;
                     };
                 },
-                Option::None => { panic(array!['Tile: ally not found']); },
+                Option::None => {
+                    panic(array!['Tile: ally not found']);
+                },
             };
         };
         attacker.attack(1, ref defender, 'ATTACK');

src/systems/play.cairo

@@ -218,15 +218,16 @@ mod play {
                     Option::Some(battle) => {
                         let mut battle = battle;
                         battle.game_id = game_id;
-                        battle.nonce = game.nonce.into();
                         battle.attacker_index = player.index;
                         battle.defender_index = defender_player.index;
                         battle.attacker_troops = attacker_troops;
                         battle.defender_troops = defender_troops;
                         battle.tx_hash = get_tx_info().unbox().transaction_hash;
                         emit!(world, battle);
                     },
-                    Option::None => { break; },
+                    Option::None => {
+                        break;
+                    },
                 };
             };
         }
@@ -456,7 +457,9 @@ mod play {
                         let hand = HandTrait::load(player);
                         deck.remove(hand.cards.span());
                     },
-                    Option::None => { break; },
+                    Option::None => {
+                        break;
+                    },
                 };
             };
 
@@ -495,8 +498,12 @@ mod play {
             let mut tiles: Array<Tile> = array![];
             loop {
                 match player_tiles.pop_front() {
-                    Option::Some(tile) => { tiles.append(*tile); },
-                    Option::None => { break; },
+                    Option::Some(tile) => {
+                        tiles.append(*tile);
+                    },
+                    Option::None => {
+                        break;
+                    },
                 };
             };
             tiles.span()