refactor: PR feedback

FuelLabs · Jul 17, 2024 · 755f8e0 · 755f8e0
1 parent 1083c0c
commit 755f8e0
Show file tree

Hide file tree

Showing 29 changed files with 94 additions and 518 deletions.
diff --git a/apps/demo-typegen/src/demo.test.ts b/apps/demo-typegen/src/demo.test.ts
@@ -16,11 +16,7 @@ import { ScriptAbi__factory } from './script-types';
  */
 describe('ExampleContract', () => {
   it('with imported storage slots', async () => {
-    using launched = await launchTestNode({
-      walletsConfig: {
-        amountPerCoin: 500_000,
-      },
-    });
+    using launched = await launchTestNode({});
 
     const {
       wallets: [wallet],
@@ -38,11 +34,7 @@ describe('ExampleContract', () => {
     expect(contract.id).toBeTruthy();
   });
   it('should return the input', async () => {
-    using launched = await launchTestNode({
-      walletsConfig: {
-        amountPerCoin: 500_000,
-      },
-    });
+    using launched = await launchTestNode({});
 
     const {
       wallets: [wallet],
@@ -73,11 +65,7 @@ describe('ExampleContract', () => {
   });
 
   it('deployContract method', async () => {
-    using launched = await launchTestNode({
-      walletsConfig: {
-        amountPerCoin: 500_000,
-      },
-    });
+    using launched = await launchTestNode({});
 
     const {
       wallets: [wallet],
@@ -104,11 +92,7 @@ describe('ExampleContract', () => {
 // #endregion Testing-in-ts-ts
 
 it('should throw when simulating via contract factory with wallet with no resources', async () => {
-  using launched = await launchTestNode({
-    walletsConfig: {
-      amountPerCoin: 500_000,
-    },
-  });
+  using launched = await launchTestNode({});
 
   const {
     provider,
@@ -128,11 +112,7 @@ it('should throw when simulating via contract factory with wallet with no resour
 });
 
 it('should not throw when dry running via contract factory with wallet with no resources', async () => {
-  using launched = await launchTestNode({
-    walletsConfig: {
-      amountPerCoin: 500_000,
-    },
-  });
+  using launched = await launchTestNode({});
 
   const {
     provider,
@@ -149,11 +129,7 @@ it('should not throw when dry running via contract factory with wallet with no r
 });
 
 test('Example script', async () => {
-  using launched = await launchTestNode({
-    walletsConfig: {
-      amountPerCoin: 500_000,
-    },
-  });
+  using launched = await launchTestNode({});
 
   const {
     wallets: [wallet],
@@ -175,11 +151,7 @@ test('Example predicate', async () => {
   // #context import { PredicateAbi__factory } from './types';
 
   // In this exchange, we are first transferring some coins to the predicate
-  using launched = await launchTestNode({
-    walletsConfig: {
-      amountPerCoin: 500_000,
-    },
-  });
+  using launched = await launchTestNode({});
 
   const {
     provider,

diff --git a/packages/fuel-gauge/src/advanced-logging.test.ts b/packages/fuel-gauge/src/advanced-logging.test.ts
@@ -225,9 +225,6 @@ describe('Advanced Logging', () => {
           { deployer: ConfigurableContractAbi__factory, bytecode: ConfigurableContractAbiHex },
           { deployer: CoverageContractAbi__factory, bytecode: CoverageContractAbiHex },
         ],
-        walletsConfig: {
-          amountPerCoin: 500_000,
-        },
       });
 
       const {
@@ -288,8 +285,6 @@ describe('Advanced Logging', () => {
       amount,
     ];
 
-    beforeAll(async () => {});
-
     it('when using InvocationScope', async () => {
       using launched = await launchTestNode({
         contractsConfigs: [
@@ -299,9 +294,6 @@ describe('Advanced Logging', () => {
             bytecode: AdvancedLoggingOtherContractAbiHex,
           },
         ],
-        walletsConfig: {
-          amountPerCoin: 300_000,
-        },
       });
 
       const {
@@ -334,9 +326,6 @@ describe('Advanced Logging', () => {
             bytecode: AdvancedLoggingOtherContractAbiHex,
           },
         ],
-        walletsConfig: {
-          amountPerCoin: 300_000,
-        },
       });
 
       const {

diff --git a/packages/fuel-gauge/src/await-execution.test.ts b/packages/fuel-gauge/src/await-execution.test.ts
@@ -40,11 +40,7 @@ describe('await-execution', () => {
   });
 
   test.skip('transferring funds with awaitExecution works', async () => {
-    using launched = await launchTestNode({
-      walletsConfig: {
-        amountPerCoin: 1_000_000,
-      },
-    });
+    using launched = await launchTestNode({});
 
     const { provider } = launched;
 
@@ -66,11 +62,7 @@ describe('await-execution', () => {
   });
 
   test('withdrawToBaseLayer works with awaitExecution', async () => {
-    using launched = await launchTestNode({
-      walletsConfig: {
-        amountPerCoin: 1_000_000,
-      },
-    });
+    using launched = await launchTestNode({});
 
     const {
       provider,

diff --git a/packages/fuel-gauge/src/bytes.test.ts b/packages/fuel-gauge/src/bytes.test.ts
@@ -92,9 +92,6 @@ describe('Bytes Tests', () => {
           bytecode: BytesAbiHex,
         },
       ],
-      walletsConfig: {
-        amountPerCoin: 1_000_000,
-      },
     });
 
     const {
@@ -153,11 +150,7 @@ describe('Bytes Tests', () => {
   });
 
   it('should test bytes input [script-bytes]', async () => {
-    using launched = await launchTestNode({
-      walletsConfig: {
-        amountPerCoin: 500_000,
-      },
-    });
+    using launched = await launchTestNode({});
 
     const {
       wallets: [wallet],

diff --git a/packages/fuel-gauge/src/configurable-contract.test.ts b/packages/fuel-gauge/src/configurable-contract.test.ts
@@ -25,7 +25,7 @@ const defaultValues = {
   },
 };
 
-async function setupContract(configurableConstants?: { [name: string]: unknown }) {
+function setupContract(configurableConstants?: { [name: string]: unknown }) {
   return launchTestNode({
     contractsConfigs: [
       {

diff --git a/packages/fuel-gauge/src/contract-factory.test.ts b/packages/fuel-gauge/src/contract-factory.test.ts
@@ -102,11 +102,7 @@ describe('Contract Factory', () => {
   });
 
   it('should not override user input maxFee when calling deployContract', async () => {
-    using launched = await launchTestNode({
-      walletsConfig: {
-        amountPerCoin: 5_000_000,
-      },
-    });
+    using launched = await launchTestNode({});
     const {
       wallets: [wallet],
     } = launched;
@@ -137,24 +133,24 @@ describe('Contract Factory', () => {
       storageSlots: StorageTestContractAbi__factory.storageSlots,
     });
 
-    const { waitForResult } = await contract.functions.return_var1().call();
-    const { value: var1 } = await waitForResult();
+    const call1 = await contract.functions.return_var1().call();
+    const { value: var1 } = await call1.waitForResult();
     expect(var1.toHex()).toEqual(toHex(0));
 
-    const { waitForResult: waitForSecondResult } = await contract.functions.return_var2().call();
-    const { value: var2 } = await waitForSecondResult();
+    const call2 = await contract.functions.return_var2().call();
+    const { value: var2 } = await call2.waitForResult();
     expect(var2).toEqual(20);
 
-    const { waitForResult: waitForThirdResult } = await contract.functions.return_var3().call();
-    const { value: var3 } = await waitForThirdResult();
+    const call3 = await contract.functions.return_var3().call();
+    const { value: var3 } = await call3.waitForResult();
     expect(var3).toEqual(30);
 
-    const { waitForResult: waitForFourthResult } = await contract.functions.return_var4().call();
-    const { value: var4 } = await waitForFourthResult();
+    const call4 = await contract.functions.return_var4().call();
+    const { value: var4 } = await call4.waitForResult();
     expect(var4).toEqual(true);
 
-    const { waitForResult: waitForFifthResult } = await contract.functions.return_var5().call();
-    const { value: var5 } = await waitForFifthResult();
+    const call5 = await contract.functions.return_var5().call();
+    const { value: var5 } = await call5.waitForResult();
     expect(JSON.stringify(var5)).toEqual(
       JSON.stringify({
         v1: true,
@@ -164,11 +160,7 @@ describe('Contract Factory', () => {
   });
 
   it('Creates a contract with initial storage (dynamic key)', async () => {
-    using launched = await launchTestNode({
-      walletsConfig: {
-        amountPerCoin: 5_000_000,
-      },
-    });
+    using launched = await launchTestNode({});
     const {
       wallets: [wallet],
     } = launched;
@@ -192,11 +184,7 @@ describe('Contract Factory', () => {
   });
 
   it('Creates a contract with initial storage. Both dynamic key and fixed vars', async () => {
-    using launched = await launchTestNode({
-      walletsConfig: {
-        amountPerCoin: 5_000_000,
-      },
-    });
+    using launched = await launchTestNode({});
     const {
       wallets: [wallet],
     } = launched;