token-js: Update instruction enum for UiAmountToAmount / AmountToUiAmount (#2949)

* token-js: Unflake create native test

* Add UiAmountToAmount and AmountToUiAmount to enum

Author: joncinque

token/js/src/instructions/types.ts

@@ -23,11 +23,13 @@ export enum TokenInstruction {
     InitializeMint2 = 20,
     GetAccountDataSize = 21,
     InitializeImmutableOwner = 22,
-    InitializeMintCloseAuthority = 23,
-    TransferFeeExtension = 24,
-    ConfidentialTransferExtension = 25,
-    DefaultAccountStateExtension = 26,
-    Reallocate = 27,
-    MemoTransferExtension = 28,
-    CreateNativeMint = 29,
+    AmountToUiAmount = 23,
+    UiAmountToAmount = 24,
+    InitializeMintCloseAuthority = 25,
+    TransferFeeExtension = 26,
+    ConfidentialTransferExtension = 27,
+    DefaultAccountStateExtension = 28,
+    Reallocate = 29,
+    MemoTransferExtension = 30,
+    CreateNativeMint = 31,
 }

token/js/test/e2e/common.ts

@@ -1,5 +1,5 @@
 import { PublicKey, Keypair, Connection, Signer } from '@solana/web3.js';
-import { TOKEN_PROGRAM_ID, NATIVE_MINT, NATIVE_MINT_2022 } from '../../src';
+import { TOKEN_PROGRAM_ID } from '../../src';
 
 export async function newAccountWithLamports(connection: Connection, lamports = 1000000): Promise<Signer> {
     const account = Keypair.generate();
@@ -18,5 +18,3 @@ export async function getConnection(): Promise<Connection> {
 export const TEST_PROGRAM_ID = process.env.TEST_PROGRAM_ID
     ? new PublicKey(process.env.TEST_PROGRAM_ID)
     : TOKEN_PROGRAM_ID;
-
-export const TEST_NATIVE_MINT = TEST_PROGRAM_ID === TOKEN_PROGRAM_ID ? NATIVE_MINT : NATIVE_MINT_2022;

token/js/test/e2e/native.test.ts

@@ -13,26 +13,32 @@ import {
 } from '@solana/web3.js';
 import {
     NATIVE_MINT,
+    NATIVE_MINT_2022,
+    TOKEN_PROGRAM_ID,
     closeAccount,
     getAccount,
     createNativeMint,
     createWrappedNativeAccount,
     syncNative,
 } from '../../src';
-import { TEST_PROGRAM_ID, TEST_NATIVE_MINT, newAccountWithLamports, getConnection } from './common';
+import { TEST_PROGRAM_ID, newAccountWithLamports, getConnection } from './common';
 
 describe('native', () => {
     let connection: Connection;
     let payer: Signer;
     let owner: Keypair;
     let account: PublicKey;
     let amount: number;
+    let nativeMint: PublicKey;
     before(async () => {
         amount = 1_000_000_000;
         connection = await getConnection();
         payer = await newAccountWithLamports(connection, 100_000_000_000);
-        if (TEST_NATIVE_MINT !== NATIVE_MINT) {
-            await createNativeMint(connection, payer, undefined, TEST_PROGRAM_ID, TEST_NATIVE_MINT);
+        if (TEST_PROGRAM_ID == TOKEN_PROGRAM_ID) {
+            nativeMint = NATIVE_MINT;
+        } else {
+            nativeMint = NATIVE_MINT_2022;
+            await createNativeMint(connection, payer, undefined, TEST_PROGRAM_ID, nativeMint);
         }
     });
     beforeEach(async () => {
@@ -45,7 +51,7 @@ describe('native', () => {
             undefined,
             undefined,
             TEST_PROGRAM_ID,
-            TEST_NATIVE_MINT
+            nativeMint
         );
     });
     it('works', async () => {