refactor: deduplicate PDA derivation and fix naming

Author: arihantbansal

blackjack/encrypted-ixs/src/lib.rs

@@ -88,12 +88,12 @@ mod circuits {
         player_hand_size: u8,
         dealer_hand_size: u8,
     ) -> (Enc<Shared, Hand>, bool) {
-        let deck_array = deck_ctxt.to_arcis().unpack();
+        let deck = deck_ctxt.to_arcis().unpack();
 
         let mut player_hand = player_hand_ctxt.to_arcis().unpack();
 
         let card_index = (player_hand_size + dealer_hand_size) as usize;
-        player_hand[player_hand_size as usize] = deck_array[card_index];
+        player_hand[player_hand_size as usize] = deck[card_index];
 
         let is_bust = calculate_hand_value(&player_hand, player_hand_size + 1) > 21;
 

voting/tests/voting.ts

@@ -157,6 +157,8 @@ describe("Voting", () => {
 
     // Cast votes for each poll with different outcomes
     const voteOutcomes = [true, false, true]; // Different outcomes for each poll
+    let firstPollPDA: PublicKey;
+    let firstVoterRecordPDA: PublicKey;
     for (let i = 0; i < POLL_IDS.length; i++) {
       const POLL_ID = POLL_IDS[i];
       const vote = BigInt(voteOutcomes[i]);
@@ -182,6 +184,11 @@ describe("Voting", () => {
         program.programId
       );
 
+      if (i === 0) {
+        firstPollPDA = pollPDA;
+        firstVoterRecordPDA = voterRecordPDA;
+      }
+
       const voteComputationOffset = new anchor.BN(randomBytes(8), "hex");
 
       const queueVoteSig = await program.methods
@@ -234,22 +241,12 @@ describe("Voting", () => {
     }
 
     // Test double-vote prevention: attempt to vote again on the first poll
+    // Reuse firstPollPDA and firstVoterRecordPDA derived during the voting loop
     console.log("\n--- Testing double-vote prevention ---");
     const DOUBLE_VOTE_POLL_ID = POLL_IDS[0];
     const doubleVoteNonce = randomBytes(16);
     const doubleVoteCiphertext = cipher.encrypt([BigInt(true)], doubleVoteNonce);
 
-    const doubleVotePollIdBuffer = Buffer.alloc(4);
-    doubleVotePollIdBuffer.writeUInt32LE(DOUBLE_VOTE_POLL_ID);
-    const [doubleVotePollPDA] = PublicKey.findProgramAddressSync(
-      [Buffer.from("poll"), owner.publicKey.toBuffer(), doubleVotePollIdBuffer],
-      program.programId
-    );
-    const [doubleVoteVoterRecordPDA] = PublicKey.findProgramAddressSync(
-      [Buffer.from("voter"), doubleVotePollPDA.toBuffer(), owner.publicKey.toBuffer()],
-      program.programId
-    );
-
     const doubleVoteComputationOffset = new anchor.BN(randomBytes(8), "hex");
 
     try {
@@ -277,8 +274,8 @@ describe("Voting", () => {
             Buffer.from(getCompDefAccOffset("vote")).readUInt32LE()
           ),
           authority: owner.publicKey,
-          pollAcc: doubleVotePollPDA,
-          voterRecord: doubleVoteVoterRecordPDA,
+          pollAcc: firstPollPDA,
+          voterRecord: firstVoterRecordPDA,
         })
         .rpc({
           preflightCommitment: "confirmed",