token-js: renamed getExtraAccountMetaAccount to `getExtraAccountMet…

…aAddress` (#5186) * Renamed `getExtraAccountMetaAccount` to `getExtraAccountMetaAddress` for clarity * Also renamed the function in the tests
solana-labs · Sep 1, 2023 · f1bff62 · f1bff62
1 parent eafe27f
commit f1bff62
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/token/js/src/extensions/transferHook/instructions.ts b/token/js/src/extensions/transferHook/instructions.ts
@@ -9,7 +9,7 @@ import { publicKey } from '@solana/buffer-layout-utils';
 import { createTransferCheckedInstruction } from '../../instructions/transferChecked.js';
 import { createTransferCheckedWithFeeInstruction } from '../transferFee/instructions.js';
 import { getMint } from '../../state/mint.js';
-import { getExtraAccountMetaAccount, getExtraAccountMetas, getTransferHook, resolveExtraAccountMeta } from './state.js';
+import { getExtraAccountMetaAddress, getExtraAccountMetas, getTransferHook, resolveExtraAccountMeta } from './state.js';
 
 export enum TransferHookInstruction {
     Initialize = 0,
@@ -144,7 +144,7 @@ export async function addExtraAccountsToInstruction(
         return instruction;
     }
 
-    const extraAccountsAccount = getExtraAccountMetaAccount(transferHook.programId, mint);
+    const extraAccountsAccount = getExtraAccountMetaAddress(mint, transferHook.programId);
     const extraAccountsInfo = await connection.getAccountInfo(extraAccountsAccount, commitment);
     if (extraAccountsInfo == null) {
         return instruction;

diff --git a/token/js/src/extensions/transferHook/state.ts b/token/js/src/extensions/transferHook/state.ts
@@ -53,7 +53,7 @@ export function getTransferHookAccount(account: Account): TransferHookAccount |
     }
 }
 
-export function getExtraAccountMetaAccount(programId: PublicKey, mint: PublicKey): PublicKey {
+export function getExtraAccountMetaAddress(mint: PublicKey, programId: PublicKey): PublicKey {
     const seeds = [Buffer.from('extra-account-metas'), mint.toBuffer()];
     return PublicKey.findProgramAddressSync(seeds, programId)[0];
 }

diff --git a/token/js/test/e2e-2022/transferHook.test.ts b/token/js/test/e2e-2022/transferHook.test.ts
@@ -19,7 +19,7 @@ import {
     getAssociatedTokenAddressSync,
     ASSOCIATED_TOKEN_PROGRAM_ID,
     createMintToCheckedInstruction,
-    getExtraAccountMetaAccount,
+    getExtraAccountMetaAddress,
     ExtraAccountMetaListLayout,
     ExtraAccountMetaLayout,
     transferCheckedWithTransferHook,
@@ -48,7 +48,7 @@ describe('transferHook', () => {
     beforeEach(async () => {
         const mintKeypair = Keypair.generate();
         mint = mintKeypair.publicKey;
-        pdaExtraAccountMeta = getExtraAccountMetaAccount(TRANSFER_HOOK_TEST_PROGRAM_ID, mint);
+        pdaExtraAccountMeta = getExtraAccountMetaAddress(mint, TRANSFER_HOOK_TEST_PROGRAM_ID);
         payerAta = getAssociatedTokenAddressSync(
             mint,
             payer.publicKey,