fix player count

dejavu-money · Oct 12, 2022 · 5e6813c · 5e6813c
1 parent 4e95db0
commit 5e6813c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/programs/dejavu-football/src/lib.rs b/programs/dejavu-football/src/lib.rs
@@ -103,7 +103,7 @@ pub mod dejavu_football {
         ctx.accounts.player_metadata.room = ctx.accounts.room.key();
         ctx.accounts.player_metadata.token_account = ctx.accounts.player_token_account.key();
         ctx.accounts.player_metadata.key = player_bet[2];
-        ctx.accounts.room.players_count += 1;
+        ctx.accounts.room.players_count = 2;
         ctx.accounts.players.add_bet(player_bet)?;
 
         // transfer
@@ -367,6 +367,7 @@ pub struct CreateRoomInstruction<'info> {
 pub struct JoinRoomInstruction<'info> {
     oracle: Account<'info, Oracle>,
     mint: Account<'info, Mint>,
+    #[account(mut)]
     room: Account<'info, Room>,
     #[account(
         init,

diff --git a/tests/room_instructions.ts b/tests/room_instructions.ts
@@ -17,11 +17,6 @@ describe("Program Authorizer methods", () => {
   //provider
   anchor.setProvider(provider);
   const program = anchor.workspace.DejavuFootball as Program<DejavuFootball>;
-
-  // anchor.web3.Keypair.fromSecretKey()
-
-  // new anchor.web3.Keypair('3WHWwZTJbP2V5KWAMgUBzS7PKzdQU1cf7uKvPHRCppNRpwfEqCbpSauS8QtUtVfYnLFLHqBafG48438MzFLwMbYj')
-
   const payer = anchor.web3.Keypair.fromSecretKey(
     Buffer.from(
       JSON.parse(
@@ -126,6 +121,12 @@ describe("Program Authorizer methods", () => {
         "checks if player mint account was decreased a token by the program"
       );
 
+      assert.equal(
+        Number(roomData.playersCount),
+        1,
+        "checks if room player count is assigned"
+      );
+
       assert.equal(
         Number(vaultMintAccountBalance.value.amount),
         1,
@@ -241,10 +242,8 @@ describe("Program Authorizer methods", () => {
 
       const { room, roomPlayers, vault } = response.accounts;
 
-
       // join room
 
-
       const joinRoomResponse = await joinRoom(program, {
         inputs: {
           teamAResult: 0,
@@ -261,7 +260,7 @@ describe("Program Authorizer methods", () => {
           vaultAccount: vault
         }
       });
-
+      const roomData = await program.account.room.fetch(room);
       const { joinPlayerMetadata } = joinRoomResponse.accounts;
 
 
@@ -281,6 +280,12 @@ describe("Program Authorizer methods", () => {
           playerMintTokenAccount
         );
 
+      assert.equal(
+        Number(roomData.playersCount),
+        2,
+        "checks if room player count is assigned"
+      );
+
       assert.equal(
         Number(vaultMintAccountBalance.value.amount),
         2,