Skip to content

Commit

Permalink
try to solve predicate test concurrency problem
Browse files Browse the repository at this point in the history
  • Loading branch information
Torres-ssf committed May 24, 2024
1 parent 5358ea9 commit 9fc8cb1
Showing 1 changed file with 13 additions and 12 deletions.
25 changes: 13 additions & 12 deletions packages/fuel-gauge/src/predicate/predicate-arguments.test.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { seedTestWallet } from '@fuel-ts/account/test-utils';
import type { WalletLocked, WalletUnlocked, BigNumberish } from 'fuels';
import { Provider, FUEL_NETWORK_URL, toHex, Predicate } from 'fuels';

import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../../test/fixtures';
import type { Validation } from '../types/predicate';

import { setupWallets, assertBalances, fundPredicate } from './utils/predicate';
import { setupWallets, assertBalances } from './utils/predicate';

/**
* @group node
Expand All @@ -31,7 +32,7 @@ describe('Predicate', () => {
let provider: Provider;
let baseAssetId: string;
const amountToReceiver = 50;
const amountToPredicate = 300_000;
const amountToPredicate = 900_000;

beforeAll(async () => {
provider = await Provider.create(FUEL_NETWORK_URL);
Expand All @@ -51,7 +52,7 @@ describe('Predicate', () => {
inputData: ['0xef86afa9696cf0dc6385e2c407a6e159a1103cefb7e2ae0636fb33d3cb2a9e4a'],
});

await fundPredicate(wallet, predicate, amountToPredicate);
await seedTestWallet(predicate, [[amountToPredicate, baseAssetId]], 3);
const initialReceiverBalance = await receiver.getBalance();

const tx = await predicate.transfer(receiver.address, amountToReceiver, baseAssetId, {
Expand All @@ -70,7 +71,7 @@ describe('Predicate', () => {
provider,
inputData: ['0xbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbada'],
});
await fundPredicate(wallet, predicate, amountToPredicate);
await seedTestWallet(predicate, [[amountToPredicate, baseAssetId]], 3);
const initialReceiverBalance = await receiver.getBalance();

expect(initialReceiverBalance.toHex()).toEqual(toHex(0));
Expand All @@ -88,7 +89,7 @@ describe('Predicate', () => {
inputData: [1078],
});

await fundPredicate(wallet, predicate, amountToPredicate);
await seedTestWallet(predicate, [[amountToPredicate, baseAssetId]], 3);
const initialReceiverBalance = await receiver.getBalance();

const tx = await predicate.transfer(receiver.address, amountToReceiver, baseAssetId, {
Expand All @@ -108,7 +109,7 @@ describe('Predicate', () => {
inputData: [100],
});

await fundPredicate(wallet, predicate, amountToPredicate);
await seedTestWallet(predicate, [[amountToPredicate, baseAssetId]], 3);
const initialReceiverBalance = await receiver.getBalance();

expect(initialReceiverBalance.toHex()).toEqual(toHex(0));
Expand All @@ -127,7 +128,7 @@ describe('Predicate', () => {
provider,
inputData: [{ has_account: true, total_complete: 100 }],
});
await fundPredicate(wallet, predicateInstanceForBalance, amountToPredicate);
await seedTestWallet(predicateInstanceForBalance, [[amountToPredicate, baseAssetId]], 3);
const initialReceiverBalance = await receiver.getBalance();

// #region predicate-struct-arg
Expand Down Expand Up @@ -160,7 +161,7 @@ describe('Predicate', () => {
],
});

await fundPredicate(wallet, predicate, amountToPredicate);
await seedTestWallet(predicate, [[amountToPredicate, baseAssetId]], 3);

await expect(
predicate.transfer(receiver.address, 50, baseAssetId, { gasLimit: 1000 })
Expand All @@ -175,7 +176,7 @@ describe('Predicate', () => {
inputData: [[42]],
});

await fundPredicate(wallet, predicate, amountToPredicate);
await seedTestWallet(predicate, [[amountToPredicate, baseAssetId]], 3);
const initialReceiverBalance = await receiver.getBalance();

const tx = await predicate.transfer(receiver.address, amountToReceiver, baseAssetId, {
Expand All @@ -195,7 +196,7 @@ describe('Predicate', () => {
inputData: [20, 30],
});

await fundPredicate(wallet, predicateForBalance, amountToPredicate);
await seedTestWallet(predicateForBalance, [[amountToPredicate, baseAssetId]], 3);
const initialReceiverBalance = await receiver.getBalance();

// #region predicate-multi-args
Expand Down Expand Up @@ -223,7 +224,7 @@ describe('Predicate', () => {
inputData: [20, 30],
});

await fundPredicate(wallet, predicate, amountToPredicate);
await seedTestWallet(predicate, [[amountToPredicate, baseAssetId]], 3);
const initialReceiverBalance = await receiver.getBalance();

const tx = await predicate.transfer(receiver.address, amountToReceiver, baseAssetId, {
Expand All @@ -243,7 +244,7 @@ describe('Predicate', () => {
inputData: [20, 20],
});

await fundPredicate(wallet, predicate, amountToPredicate);
await seedTestWallet(predicate, [[amountToPredicate, baseAssetId]], 3);

await expect(
predicate.transfer(receiver.address, 50, baseAssetId, { gasLimit: 1000 })
Expand Down

0 comments on commit 9fc8cb1

Please sign in to comment.