Rename to ComputeBudgetProgram and enable tests

solana-labs · Apr 26, 2022 · 09848b3 · 09848b3
1 parent 958fcc3
commit 09848b3
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 13 deletions.
diff --git a/web3.js/src/compute-budget.ts b/web3.js/src/compute-budget.ts
@@ -1,4 +1,5 @@
 import * as BufferLayout from '@solana/buffer-layout';
+
 import {
   encodeData,
   decodeData,
@@ -79,7 +80,7 @@ export class ComputeBudgetInstruction {
    * @internal
    */
   static checkProgramId(programId: PublicKey) {
-    if (!programId.equals(ComputeBudget.programId)) {
+    if (!programId.equals(ComputeBudgetProgram.programId)) {
       throw new Error(
         'invalid instruction; programId is not ComputeBudgetProgram',
       );
@@ -151,7 +152,7 @@ export const COMPUTE_BUDGET_INSTRUCTION_LAYOUTS = Object.freeze<{
 /**
  * Factory class for transaction instructions to interact with the Compute Budget program
  */
-export class ComputeBudget {
+export class ComputeBudgetProgram {
   /**
    * @internal
    */

diff --git a/web3.js/test/compute-budget.test.ts b/web3.js/test/compute-budget.test.ts
@@ -6,7 +6,7 @@ import {
   Connection,
   LAMPORTS_PER_SOL,
   Transaction,
-  ComputeBudget,
+  ComputeBudgetProgram,
   ComputeBudgetInstruction,
   PublicKey,
   SystemProgram,
@@ -17,14 +17,14 @@ import {url} from './url';
 
 use(chaiAsPromised);
 
-describe.skip('ComputeBudget', () => {
+describe('ComputeBudgetProgram', () => {
   it('requestUnits', () => {
     const params = {
       units: 150000,
       additionalFee: 0,
     };
     const transaction = new Transaction().add(
-      ComputeBudget.requestUnits(params),
+      ComputeBudgetProgram.requestUnits(params),
     );
     expect(transaction.instructions).to.have.length(1);
     const [computeBudgetInstruction] = transaction.instructions;
@@ -38,7 +38,7 @@ describe.skip('ComputeBudget', () => {
       bytes: 33 * 1024,
     };
     const transaction = new Transaction().add(
-      ComputeBudget.requestHeapFrame(params),
+      ComputeBudgetProgram.requestHeapFrame(params),
     );
     expect(transaction.instructions).to.have.length(1);
     const [computeBudgetInstruction] = transaction.instructions;
@@ -47,12 +47,14 @@ describe.skip('ComputeBudget', () => {
     );
   });
 
-  it('ComputeBudgetInstruction', async () => {
-    const requestUnits = ComputeBudget.requestUnits({
+  it('ComputeBudgetInstruction', () => {
+    const requestUnits = ComputeBudgetProgram.requestUnits({
       units: 150000,
       additionalFee: 0,
     });
-    const requestHeapFrame = ComputeBudget.requestHeapFrame({bytes: 33 * 1024});
+    const requestHeapFrame = ComputeBudgetProgram.requestHeapFrame({
+      bytes: 33 * 1024,
+    });
 
     const requestUnitsTransaction = new Transaction().add(requestUnits);
     expect(requestUnitsTransaction.instructions).to.have.length(1);
@@ -113,7 +115,10 @@ describe.skip('ComputeBudget', () => {
       };
 
       const createAccountFeeTooHighTransaction = new Transaction().add(
-        ComputeBudget.requestUnits({units: 2, additionalFee: 2 * FEE_AMOUNT}),
+        ComputeBudgetProgram.requestUnits({
+          units: 2,
+          additionalFee: 2 * FEE_AMOUNT,
+        }),
         SystemProgram.createAccountWithSeed(createAccountWithSeedParams),
       );
       await expect(
@@ -130,7 +135,10 @@ describe.skip('ComputeBudget', () => {
       );
 
       const createAccountFeeTransaction = new Transaction().add(
-        ComputeBudget.requestUnits({units: 2, additionalFee: FEE_AMOUNT}),
+        ComputeBudgetProgram.requestUnits({
+          units: 2,
+          additionalFee: FEE_AMOUNT,
+        }),
         SystemProgram.createAccountWithSeed(createAccountWithSeedParams),
       );
       await sendAndConfirmTransaction(
@@ -145,7 +153,7 @@ describe.skip('ComputeBudget', () => {
 
       async function expectRequestHeapFailure(bytes: number) {
         const requestHeapFrameTransaction = new Transaction().add(
-          ComputeBudget.requestHeapFrame({bytes}),
+          ComputeBudgetProgram.requestHeapFrame({bytes}),
         );
         await expect(
           sendAndConfirmTransaction(
@@ -165,7 +173,7 @@ describe.skip('ComputeBudget', () => {
 
       const VALID_BYTES = 33 * 1024;
       const requestHeapFrameTransaction = new Transaction().add(
-        ComputeBudget.requestHeapFrame({bytes: VALID_BYTES}),
+        ComputeBudgetProgram.requestHeapFrame({bytes: VALID_BYTES}),
       );
       await sendAndConfirmTransaction(
         connection,