[ FIX ] Cleanup

.github/workflows/ci-contracts.yml

@@ -2,18 +2,14 @@ name: ci-contracts
 
 on:
  push:
- branches: [main]
+ branches: [master]
  paths:
  - "src/**"
  pull_request:
- branches: [main]
+ branches: [master]
  paths:
  - "src/**"
 
-defaults:
- run:
- working-directory: contracts
-
 env:
  CARGO_TERM_COLOR: always
  RUST_VERSION: 1.80.1

src/constants.cairo

@@ -71,4 +71,3 @@ const NEEDED_YES_PX: u32 = 1;
 // for additional rules
 const DISASTER_SIZE: u32 = 5;
 
-

src/lib.cairo

@@ -2,28 +2,28 @@ mod constants;
 mod systems {
  mod actions;
  mod apps;
+ mod guilds;
  mod propose;
  mod utils;
  mod voting;
- mod guilds;
 }
 
 mod models {
  mod allowed_app;
  mod allowed_color;
  mod board;
  mod game;
+ mod guilds;
  mod player;
  mod proposal;
- mod guilds;
 }
 
 #[cfg(test)]
 mod tests {
  mod test_add_color;
  mod test_create_world;
  mod test_extend_game_end;
- mod test_reset_to_white;
  mod test_guild;
+ mod test_reset_to_white;
  mod utils;
 }

src/models/guilds.cairo

@@ -1,5 +1,5 @@
-use starknet::ContractAddress;
 use dojo::world::IWorldDispatcher;
+use starknet::ContractAddress;
 
 #[derive(Copy, Drop, Serde)]
 #[dojo::model(namespace: "pixelaw", nomapping: true)]

src/models/player.cairo

@@ -5,8 +5,8 @@ use starknet::{get_block_timestamp, ContractAddress};
 struct Player {
  #[key]
  address: ContractAddress,
- // #[key] // the game_id as a key for the player should be added as players could be playing different games at once
- // game_id: usize,
+ // #[key] // the game_id as a key for the player should be added as players could be playing
+ // different games at once game_id: usize,
  // name: felt252,
  max_px: u32,
  num_owns: u32,

src/models/proposal.cairo

@@ -96,3 +96,4 @@ struct PixelRecoveryRate {
 // }
 // }
 
+