chore: adjust test scripts for createInstruction

coral-xyz · Oct 13, 2023 · 0cf191d · 0cf191d
1 parent 5fe49da
commit 0cf191d
Show file tree

Hide file tree

Showing 24 changed files with 76 additions and 76 deletions.
diff --git a/tests/bench/tests/compute-units.ts b/tests/bench/tests/compute-units.ts
@@ -121,7 +121,7 @@ describe("Compute units", () => {
     const mintKp = new anchor.web3.Keypair();
     mintPk = mintKp.publicKey;
     const createMintIx = await tokenProgram.account.mint.createInstruction(
-      mintKp
+      mintPk
     );
     const initMintIx = await tokenProgram.methods
       .initializeMint2(0, owner, null)
@@ -133,7 +133,7 @@ describe("Compute units", () => {
     const tokenKp = new anchor.web3.Keypair();
     tokenPk = tokenKp.publicKey;
     const createTokenIx = await tokenProgram.account.account.createInstruction(
-      tokenKp
+      tokenPk
     );
     const initTokenIx = await tokenProgram.methods
       .initializeAccount3(owner)

diff --git a/tests/cashiers-check/tests/cashiers-check.js b/tests/cashiers-check/tests/cashiers-check.js
@@ -57,7 +57,7 @@ describe("cashiers-check", () => {
       },
       signers: [check, vault],
       instructions: [
-        await program.account.check.createInstruction(check, 300),
+        await program.account.check.createInstruction(check.publicKey, 300),
         ...(await serumCmn.createTokenAccountInstrs(
           program.provider,
           vault.publicKey,

diff --git a/tests/cfo/tests/utils/stake.js b/tests/cfo/tests/utils/stake.js
@@ -78,8 +78,8 @@ async function setupStakePool(mint, god) {
       },
       signers: [registrar, rewardQ],
       instructions: [
-        await registry.account.registrar.createInstruction(registrar),
-        await registry.account.rewardQueue.createInstruction(rewardQ, 8250),
+        await registry.account.registrar.createInstruction(registrar.publicKey),
+        await registry.account.rewardQueue.createInstruction(rewardQ.publicKey, 8250),
       ],
     }
   );

diff --git a/tests/composite/tests/composite.js b/tests/composite/tests/composite.js
@@ -21,8 +21,8 @@ describe("composite", () => {
       },
       signers: [dummyA, dummyB],
       instructions: [
-        await program.account.dummyA.createInstruction(dummyA),
-        await program.account.dummyB.createInstruction(dummyB),
+        await program.account.dummyA.createInstruction(dummyA.publicKey),
+        await program.account.dummyB.createInstruction(dummyB.publicKey),
       ],
     });
 

diff --git a/tests/custom-coder/tests/spl-associated-token-coder.ts b/tests/custom-coder/tests/spl-associated-token-coder.ts
@@ -44,7 +44,7 @@ describe("spl-associated-token-coder", () => {
       })
       .preInstructions(
         await Promise.all([
-          tokenProgram.account.mint.createInstruction(mintKeypair),
+          tokenProgram.account.mint.createInstruction(mintKeypair.publicKey),
           tokenProgram.methods
             .initializeMint(mintDecimals, provider.wallet.publicKey, null)
             .accounts({

diff --git a/tests/custom-coder/tests/spl-token-coder.ts b/tests/custom-coder/tests/spl-token-coder.ts
@@ -29,7 +29,7 @@ describe("spl-token", () => {
       })
       .signers([mintKeypair])
       .preInstructions([
-        await program.account.mint.createInstruction(mintKeypair),
+        await program.account.mint.createInstruction(mintKeypair.publicKey),
       ])
       .rpc();
     const mintAccount = await program.account.mint.fetch(mintKeypair.publicKey);
@@ -53,7 +53,7 @@ describe("spl-token", () => {
       })
       .signers([aliceTokenKeypair])
       .preInstructions([
-        await program.account.account.createInstruction(aliceTokenKeypair),
+        await program.account.account.createInstruction(aliceTokenKeypair.publicKey),
       ])
       .rpc();
     const token = await program.account.account.fetch(
@@ -98,7 +98,7 @@ describe("spl-token", () => {
       })
       .signers([bobTokenKeypair])
       .preInstructions([
-        await program.account.account.createInstruction(bobTokenKeypair),
+        await program.account.account.createInstruction(bobTokenKeypair.publicKey),
       ])
       .rpc();
   });

diff --git a/tests/errors/tests/errors.ts b/tests/errors/tests/errors.ts
@@ -203,7 +203,7 @@ describe("errors", () => {
           },
           // this initializes the account.owner variable with Pubkey::default
           instructions: [
-            await program.account.hasOneAccount.createInstruction(account),
+            await program.account.hasOneAccount.createInstruction(account.publicKey),
           ],
           signers: [account],
         });

diff --git a/tests/idl/tests/client-interactions.ts b/tests/idl/tests/client-interactions.ts
@@ -21,7 +21,7 @@ describe("Client interactions", () => {
       .int(i8, i16, i32, i64, i128)
       .accounts({ account: kp.publicKey })
       .signers([kp])
-      .preInstructions([await program.account.intAccount.createInstruction(kp)])
+      .preInstructions([await program.account.intAccount.createInstruction(kp.publicKey)])
       .rpc();
 
     const account = await program.account.intAccount.fetch(kp.publicKey);
@@ -46,7 +46,7 @@ describe("Client interactions", () => {
       .accounts({ account: kp.publicKey })
       .signers([kp])
       .preInstructions([
-        await program.account.unsignedIntAccount.createInstruction(kp),
+        await program.account.unsignedIntAccount.createInstruction(kp.publicKey),
       ])
       .rpc();
 
@@ -70,7 +70,7 @@ describe("Client interactions", () => {
         .accounts({ account: kp.publicKey })
         .signers([kp])
         .preInstructions([
-          await program.account.enumAccount.createInstruction(kp),
+          await program.account.enumAccount.createInstruction(kp.publicKey),
         ])
         .rpc();
       return await program.account.enumAccount.fetch(kp.publicKey);
@@ -135,7 +135,7 @@ describe("Client interactions", () => {
       .typeAlias(typeAliasU8, typeAliasU8Array, typeAliasStruct)
       .accounts({ account: kp.publicKey })
       .signers([kp])
-      .preInstructions([await program.account.intAccount.createInstruction(kp)])
+      .preInstructions([await program.account.intAccount.createInstruction(kp.publicKey)])
       .rpc();
 
     const account = await program.account.typeAliasAccount.fetch(kp.publicKey);

diff --git a/tests/idl/tests/idl-build-features.ts b/tests/idl/tests/idl-build-features.ts
@@ -18,7 +18,7 @@ describe("idl-build features", () => {
       .fullPath(outerMyStructArg, someModuleMyStructArg)
       .accounts({ account: kp.publicKey })
       .preInstructions([
-        await program.account.fullPathAccount.createInstruction(kp),
+        await program.account.fullPathAccount.createInstruction(kp.publicKey),
       ])
       .signers([kp])
       .rpc();

diff --git a/tests/lockup/migrations/deploy.js b/tests/lockup/migrations/deploy.js
@@ -168,8 +168,8 @@ async function registrarInit(
       },
       signers: [registrar, rewardQ],
       instructions: [
-        await registry.account.registrar.createInstruction(registrar),
-        await registry.account.rewardQueue.createInstruction(rewardQ, 8250),
+        await registry.account.registrar.createInstruction(registrar.publicKey),
+        await registry.account.rewardQueue.createInstruction(rewardQ.publicKey, 8250),
       ],
     }
   );

diff --git a/tests/lockup/tests/lockup.js b/tests/lockup/tests/lockup.js
@@ -178,7 +178,7 @@ describe("Lockup and Registry", () => {
         },
         signers: [vesting, vault],
         instructions: [
-          await lockup.account.vesting.createInstruction(vesting),
+          await lockup.account.vesting.createInstruction(vesting.publicKey),
           ...(await serumCmn.createTokenAccountInstrs(
             provider,
             vault.publicKey,
@@ -323,8 +323,8 @@ describe("Lockup and Registry", () => {
         },
         signers: [registrar, rewardQ],
         instructions: [
-          await registry.account.registrar.createInstruction(registrar),
-          await registry.account.rewardQueue.createInstruction(rewardQ, 8250),
+          await registry.account.registrar.createInstruction(registrar.publicKey),
+          await registry.account.rewardQueue.createInstruction(rewardQ.publicKey, 8250),
         ],
       }
     );
@@ -381,7 +381,7 @@ describe("Lockup and Registry", () => {
         tokenProgram: TOKEN_PROGRAM_ID,
         rent: anchor.web3.SYSVAR_RENT_PUBKEY,
       },
-      instructions: [await registry.account.member.createInstruction(member)],
+      instructions: [await registry.account.member.createInstruction(member.publicKey)],
     });
 
     const signers = [member, provider.wallet.payer];
@@ -515,7 +515,7 @@ describe("Lockup and Registry", () => {
             mint,
             unlockedVendorSigner
           )),
-          await registry.account.rewardVendor.createInstruction(unlockedVendor),
+          await registry.account.rewardVendor.createInstruction(unlockedVendor.publicKey),
         ],
       }
     );
@@ -634,7 +634,7 @@ describe("Lockup and Registry", () => {
             mint,
             lockedVendorSigner
           )),
-          await registry.account.rewardVendor.createInstruction(lockedVendor),
+          await registry.account.rewardVendor.createInstruction(lockedVendor.publicKey),
         ],
       }
     );
@@ -721,7 +721,7 @@ describe("Lockup and Registry", () => {
       remainingAccounts,
       signers: [vendoredVesting, vendoredVestingVault],
       instructions: [
-        await lockup.account.vesting.createInstruction(vendoredVesting),
+        await lockup.account.vesting.createInstruction(vendoredVesting.publicKey),
         ...(await serumCmn.createTokenAccountInstrs(
           provider,
           vendoredVestingVault.publicKey,
@@ -834,7 +834,7 @@ describe("Lockup and Registry", () => {
       signers: [pendingWithdrawal],
       instructions: [
         await registry.account.pendingWithdrawal.createInstruction(
-          pendingWithdrawal
+          pendingWithdrawal.publicKey
         ),
       ],
     });

diff --git a/tests/misc/tests/misc/misc.ts b/tests/misc/tests/misc/misc.ts
@@ -48,7 +48,7 @@ const miscTest = (
           .initialize(udata, idata)
           .accounts({ data: data.publicKey })
           .signers([data])
-          .preInstructions([await program.account.data.createInstruction(data)])
+          .preInstructions([await program.account.data.createInstruction(data.publicKey)])
           .rpc();
         const dataAccount = await program.account.data.fetch(data.publicKey);
         assert(dataAccount.udata.eq(udata));
@@ -155,7 +155,7 @@ const miscTest = (
         await program.methods
           .initialize(new anchor.BN(10), new anchor.BN(10))
           .accounts({ data: data.publicKey })
-          .preInstructions([await program.account.data.createInstruction(data)])
+          .preInstructions([await program.account.data.createInstruction(data.publicKey)])
           .signers([data])
           .rpc();
 
@@ -205,7 +205,7 @@ const miscTest = (
         await program.methods
           .initialize(new anchor.BN(10), new anchor.BN(10))
           .accounts({ data: data.publicKey })
-          .preInstructions([await program.account.data.createInstruction(data)])
+          .preInstructions([await program.account.data.createInstruction(data.publicKey)])
           .signers([data])
           .rpc();
 
@@ -1342,7 +1342,7 @@ const miscTest = (
         },
         signers: [data],
         instructions: [
-          await program.account.dataConstArraySize.createInstruction(data),
+          await program.account.dataConstArraySize.createInstruction(data.publicKey),
         ],
       });
       const dataAccount = await program.account.dataConstArraySize.fetch(
@@ -1360,7 +1360,7 @@ const miscTest = (
         },
         signers: [data],
         instructions: [
-          await program.account.dataConstArraySize.createInstruction(data),
+          await program.account.dataConstArraySize.createInstruction(data.publicKey),
         ],
       });
       const dataAccount = await program.account.dataConstArraySize.fetch(
@@ -2420,7 +2420,7 @@ const miscTest = (
         signers: [data],
         instructions: [
           await program.account.dataMultidimensionalArray.createInstruction(
-            data
+            data.publicKey
           ),
         ],
       });
@@ -2440,7 +2440,7 @@ const miscTest = (
         signers: [data],
         instructions: [
           await program.account.dataMultidimensionalArrayConstSizes.createInstruction(
-            data
+            data.publicKey
           ),
         ],
       });

diff --git a/tests/multisig/tests/multisig.js b/tests/multisig/tests/multisig.js
@@ -30,7 +30,7 @@ describe("multisig", () => {
       },
       instructions: [
         await program.account.multisig.createInstruction(
-          multisig,
+          multisig.publicKey,
           multisigSize
         ),
       ],
@@ -74,7 +74,7 @@ describe("multisig", () => {
       },
       instructions: [
         await program.account.transaction.createInstruction(
-          transaction,
+          transaction.publicKey,
           txSize
         ),
       ],

diff --git a/tests/optional/tests/optional.ts b/tests/optional/tests/optional.ts
@@ -60,7 +60,7 @@ describe("Optional", () => {
   ): Promise<[web3.Keypair, web3.TransactionInstruction]> => {
     const keypair = requiredKeypair ?? new web3.Keypair();
     const createIx = await program.account.dataAccount.createInstruction(
-      keypair
+      keypair.publicKey
     );
     return [keypair, createIx];
   };

diff --git a/tests/spl/token-proxy/tests/token-proxy.js b/tests/spl/token-proxy/tests/token-proxy.js
@@ -266,7 +266,7 @@ async function getMintInfo(provider, mintAddr) {
 async function createMint(tokenProgram) {
   const mint = anchor.web3.Keypair.generate();
   const authority = tokenProgram.provider.wallet.publicKey;
-  const createMintIx = await tokenProgram.account.mint.createInstruction(mint);
+  const createMintIx = await tokenProgram.account.mint.createInstruction(mint.publicKey);
   const initMintIx = await tokenProgram.methods
     .initializeMint2(0, authority, null)
     .accounts({ mint: mint.publicKey })
@@ -284,7 +284,7 @@ async function createTokenAccount(tokenProgram, mint, owner) {
   const vault = anchor.web3.Keypair.generate();
   const tx = new anchor.web3.Transaction();
   const createTokenAccountIx =
-    await tokenProgram.account.account.createInstruction(vault);
+    await tokenProgram.account.account.createInstruction(vault.publicKey);
   const initTokenAccountIx = await tokenProgram.methods
     .initializeAccount3(owner)
     .accounts({ account: vault.publicKey, mint })

diff --git a/tests/tictactoe/tests/tictactoe.js b/tests/tictactoe/tests/tictactoe.js
@@ -16,7 +16,7 @@ describe("tictactoe", () => {
       },
       signers: [dashboard],
       instructions: [
-        await program.account.dashboard.createInstruction(dashboard),
+        await program.account.dashboard.createInstruction(dashboard.publicKey),
       ],
     });
 
@@ -32,7 +32,7 @@ describe("tictactoe", () => {
         rent: anchor.web3.SYSVAR_RENT_PUBKEY,
       },
       signers: [game],
-      instructions: [await program.account.game.createInstruction(game)],
+      instructions: [await program.account.game.createInstruction(game.publicKey)],
     });
 
     console.log("transaction: ", tx);

diff --git a/tests/zero-copy/tests/zero-copy.js b/tests/zero-copy/tests/zero-copy.js
@@ -19,7 +19,7 @@ describe("zero-copy", () => {
         authority: program.provider.wallet.publicKey,
         rent: anchor.web3.SYSVAR_RENT_PUBKEY,
       },
-      instructions: [await program.account.foo.createInstruction(foo)],
+      instructions: [await program.account.foo.createInstruction(foo.publicKey)],
       signers: [foo],
     });
     const account = await program.account.foo.fetch(foo.publicKey);
@@ -161,7 +161,7 @@ describe("zero-copy", () => {
         rent: anchor.web3.SYSVAR_RENT_PUBKEY,
       },
       instructions: [
-        await program.account.eventQ.createInstruction(eventQ, size),
+        await program.account.eventQ.createInstruction(eventQ.publicKey, size),
       ],
       signers: [eventQ],
     });

diff --git a/ts/tests/src/spl/binary-oracle-pair.ts b/ts/tests/src/spl/binary-oracle-pair.ts
@@ -54,7 +54,7 @@ export async function binaryOraclePairTests() {
     const poolKp = new Keypair();
     poolPk = poolKp.publicKey;
     const createPoolAccountIx = await program.account.pool.createInstruction(
-      poolKp
+      poolPk
     );
     // Accounts that are expected to be initialized
     poolDepositMintPk = await createMint();
@@ -64,18 +64,18 @@ export async function binaryOraclePairTests() {
     poolDepositTokenAccountPk = depositTokenAccountKp.publicKey;
     const createDepositTokenAccountIx =
       await tokenProgram.account.account.createInstruction(
-        depositTokenAccountKp
+        poolDepositTokenAccountPk
       );
 
     const tokenPassMintKp = new Keypair();
     tokenPassMintPk = tokenPassMintKp.publicKey;
     const createTokenPassMintIx =
-      await tokenProgram.account.mint.createInstruction(tokenPassMintKp);
+      await tokenProgram.account.mint.createInstruction(tokenPassMintPk);
 
     const tokenFailMintKp = new Keypair();
     tokenFailMintPk = tokenFailMintKp.publicKey;
     const createTokenFailMintIx =
-      await tokenProgram.account.mint.createInstruction(tokenFailMintKp);
+      await tokenProgram.account.mint.createInstruction(tokenFailMintPk);
 
     const [authorityPk, bump] = await PublicKey.findProgramAddress(
       [poolPk.toBuffer()],

diff --git a/ts/tests/src/spl/record.ts b/ts/tests/src/spl/record.ts
@@ -28,7 +28,7 @@ export async function recordTests() {
     const recordKp = new Keypair();
     recordPk = recordKp.publicKey;
     const createRecordAccountIx =
-      await program.account.recordData.createInstruction(recordKp);
+      await program.account.recordData.createInstruction(recordPk);
     const initIx = await program.methods
       .initialize()
       .accounts({