fix: clean up racy tests

solana-labs · Dec 24, 2020 · 9108edc · 9108edc
1 parent fdbf9d0
commit 9108edc
Show file tree

Hide file tree

Showing 9 changed files with 192 additions and 156 deletions.
diff --git a/src/connection.js b/src/connection.js
@@ -2919,7 +2919,10 @@ export class Connection {
     const signData = transaction.serializeMessage();
     const wireTransaction = transaction._serialize(signData);
     const encodedTransaction = wireTransaction.toString('base64');
-    const config: any = {encoding: 'base64'};
+    const config: any = {
+      encoding: 'base64',
+      commitment: this.commitment,
+    };
     const args = [encodedTransaction, config];
 
     if (signers) {

diff --git a/src/loader.js b/src/loader.js
@@ -128,7 +128,6 @@ export class Loader {
           [payer, program],
           {
             commitment: 'singleGossip',
-            skipPreflight: true,
           },
         );
       }
@@ -170,7 +169,6 @@ export class Loader {
       transactions.push(
         sendAndConfirmTransaction(connection, transaction, [payer, program], {
           commitment: 'singleGossip',
-          skipPreflight: true,
         }),
       );
 
@@ -211,7 +209,6 @@ export class Loader {
         [payer, program],
         {
           commitment: 'singleGossip',
-          skipPreflight: true,
         },
       );
     }

diff --git a/test/bpf-loader.test.js b/test/bpf-loader.test.js
@@ -16,7 +16,7 @@ import {BPF_LOADER_PROGRAM_ID} from '../src/bpf-loader';
 
 if (!mockRpcEnabled) {
   // The default of 5 seconds is too slow for live testing sometimes
-  jest.setTimeout(120000);
+  jest.setTimeout(240000);
 }
 
 test('load BPF C program', async () => {
@@ -54,7 +54,7 @@ test('load BPF C program', async () => {
   });
   await sendAndConfirmTransaction(connection, transaction, [from], {
     commitment: 'singleGossip',
-    skipPreflight: true,
+    preflightCommitment: 'singleGossip',
   });
 });
 
@@ -67,7 +67,6 @@ describe('load BPF Rust program', () => {
   const connection = new Connection(url, 'singleGossip');
 
   let program: Account;
-  let signature: string;
   let payerAccount: Account;
   let programData: Buffer;
 
@@ -116,26 +115,26 @@ describe('load BPF Rust program', () => {
       programData,
       BPF_LOADER_PROGRAM_ID,
     );
+  });
 
+  test('get confirmed transaction', async () => {
     const transaction = new Transaction().add({
       keys: [
         {pubkey: payerAccount.publicKey, isSigner: true, isWritable: true},
       ],
       programId: program.publicKey,
     });
 
-    signature = await sendAndConfirmTransaction(
+    const signature = await sendAndConfirmTransaction(
       connection,
       transaction,
       [payerAccount],
       {
-        commitment: 'max',
-        skipPreflight: true,
+        commitment: 'max', // `getParsedConfirmedTransaction` requires max commitment
+        preflightCommitment: connection.commitment || 'max',
       },
     );
-  });
 
-  test('get confirmed transaction', async () => {
     const parsedTx = await connection.getParsedConfirmedTransaction(signature);
     if (parsedTx === null) {
       expect(parsedTx).not.toBeNull();