Skip to content

Commit

Permalink
test: removed maturity from policy tests due to inconsistency
Browse files Browse the repository at this point in the history
  • Loading branch information
@maschad
maschad committed Jul 12, 2024
1 parent 9d306ed commit e7b0287
Showing 1 changed file with 16 additions and 65 deletions.
81 changes: 16 additions & 65 deletions packages/fuel-gauge/src/policies.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import PayableAnnotationAbiHex from '../test/typegen/contracts/PayableAnnotation
* @group node
* @group browser
*/
describe.skip('Policies', () => {
describe('Policies', () => {
type CustomTxParams = {
gasLimit?: BigNumberish;
maturity?: number;
Expand All @@ -31,11 +31,6 @@ describe.skip('Policies', () => {
return randomValue;
};

const randomMaturity = async (provider: Provider) => {
const { latestBlock } = await provider.fetchChain();
return randomNumber(1, latestBlock.height.toNumber());
};

const validatePolicies = ({
transaction,
params,
Expand All @@ -47,10 +42,8 @@ describe.skip('Policies', () => {
expect(bn(transaction.policies?.[0].data).eq(bn(params.tip))).toBeTruthy();
expect(transaction.policies?.[1].type).toBe(PolicyType.WitnessLimit);
expect(bn(transaction.policies?.[1].data).eq(bn(params.witnessLimit))).toBeTruthy();
expect(transaction.policies?.[2].type).toBe(PolicyType.Maturity);
expect(transaction.policies?.[2]?.data).toBe(params.maturity);
expect(transaction.policies?.[3].type).toBe(PolicyType.MaxFee);
expect(bn(transaction.policies?.[3]?.data).lte(bn(params.maxFee))).toBeTruthy();
expect(transaction.policies?.[2].type).toBe(PolicyType.MaxFee);
expect(bn(transaction.policies?.[2]?.data).lte(bn(params.maxFee))).toBeTruthy();
};

it('should ensure optional TX policies are not set when not informed', () => {
Expand Down Expand Up @@ -116,11 +109,7 @@ describe.skip('Policies', () => {
});

it('should ensure TX policies are properly set (ScriptTransactionRequest)', async () => {
using launched = await launchTestNode({
nodeOptions: {
args: ['--poa-instant', 'false', '--poa-interval-period', '10ms'],
},
});
using launched = await launchTestNode();

const {
provider,
Expand All @@ -131,7 +120,6 @@ describe.skip('Policies', () => {

const txParams: CustomTxParams = {
tip: 10,
maturity: await randomMaturity(provider),
witnessLimit: randomNumber(800, 900),
maxFee: 1000,
};
Expand All @@ -151,8 +139,8 @@ describe.skip('Policies', () => {

const { transaction } = await tx.waitForResult();

expect(transaction.policyTypes).toBe(15);
expect(transaction.policies?.length).toBe(4);
expect(transaction.policyTypes).toBe(11);
expect(transaction.policies?.length).toBe(3);

validatePolicies({
transaction,
Expand All @@ -161,11 +149,7 @@ describe.skip('Policies', () => {
});

it('should ensure TX policies are properly set (CreateTransactionRequest)', async () => {
using launched = await launchTestNode({
nodeOptions: {
args: ['--poa-instant', 'false', '--poa-interval-period', '10ms'],
},
});
using launched = await launchTestNode();

const {
provider,
Expand All @@ -181,7 +165,6 @@ describe.skip('Policies', () => {
const txParams: CustomTxParams = {
tip: 11,
witnessLimit: 2000,
maturity: await randomMaturity(provider),
maxFee: 70_000,
};

Expand Down Expand Up @@ -214,13 +197,12 @@ describe.skip('Policies', () => {
});

const {
provider,
contracts: [contract],
} = launched;

const callScope = contract.functions.payable().txParams({
tip: 5,
maturity: await randomMaturity(provider),

witnessLimit: randomNumber(800, 900),
maxFee: 70_000,
});
Expand All @@ -240,11 +222,7 @@ describe.skip('Policies', () => {
});

it('should ensure TX policies are properly set (ScriptInvocationScope)', async () => {
using launched = await launchTestNode({
nodeOptions: {
args: ['--poa-instant', 'false', '--poa-interval-period', '10ms'],
},
});
using launched = await launchTestNode();

const {
provider,

Check warning on line 228 in packages/fuel-gauge/src/policies.test.ts

View workflow job for this annotation

GitHub Actions / Lint 

'provider' is assigned a value but never used
Expand All @@ -259,7 +237,7 @@ describe.skip('Policies', () => {

const callScope = scriptInstance.functions.main(33).txParams({
tip: 2,
maturity: await randomMaturity(provider),

witnessLimit: randomNumber(800, 900),
maxFee: 70_000,
});
Expand All @@ -279,11 +257,7 @@ describe.skip('Policies', () => {
});

it('should ensure TX policies are properly set (Account Transfer)', async () => {
using launched = await launchTestNode({
nodeOptions: {
args: ['--poa-instant', 'false', '--poa-interval-period', '10ms'],
},
});
using launched = await launchTestNode();

const {
provider,
Expand All @@ -294,7 +268,7 @@ describe.skip('Policies', () => {

const txParams: CustomTxParams = {
tip: 4,
maturity: await randomMaturity(provider),

witnessLimit: randomNumber(800, 900),
maxFee: 70_000,
};
Expand Down Expand Up @@ -322,9 +296,6 @@ describe.skip('Policies', () => {
bytecode: PayableAnnotationAbiHex,
},
],
nodeOptions: {
args: ['--poa-instant', 'false', '--poa-interval-period', '10ms'],
},
});

const {
Expand All @@ -335,7 +306,7 @@ describe.skip('Policies', () => {

const txParams: CustomTxParams = {
tip: 1,
maturity: await randomMaturity(provider),

witnessLimit: randomNumber(800, 900),
maxFee: 70_000,
};
Expand All @@ -356,11 +327,7 @@ describe.skip('Policies', () => {
});

it('should ensure TX witnessLimit policy limits tx execution as expected', async () => {
using launched = await launchTestNode({
nodeOptions: {
args: ['--poa-instant', 'false', '--poa-interval-period', '10ms'],
},
});
using launched = await launchTestNode();

const {
provider,
Expand All @@ -370,7 +337,6 @@ describe.skip('Policies', () => {
const receiver = Wallet.generate({ provider });

const txParams: CustomTxParams = {
maturity: await randomMaturity(provider),
witnessLimit: 0,
};

Expand All @@ -388,11 +354,7 @@ describe.skip('Policies', () => {

describe('should ensure TX maxFee policy limits TX execution as expected', () => {
it('on account transfer', async () => {
using launched = await launchTestNode({
nodeOptions: {
args: ['--poa-instant', 'false', '--poa-interval-period', '10ms'],
},
});
using launched = await launchTestNode();

const {
provider,
Expand All @@ -404,7 +366,6 @@ describe.skip('Policies', () => {
const maxFee = 1;

const txParams: CustomTxParams = {
maturity: await randomMaturity(provider),
witnessLimit: 800,
maxFee,
};
Expand Down Expand Up @@ -439,7 +400,6 @@ describe.skip('Policies', () => {
const maxFee = 1;

const txParams: CustomTxParams = {
maturity: await randomMaturity(provider),
witnessLimit: 800,
maxFee,
};
Expand Down Expand Up @@ -467,7 +427,6 @@ describe.skip('Policies', () => {
const receiver = Wallet.generate({ provider });

const txParams: CustomTxParams = {
maturity: await randomMaturity(provider),
witnessLimit: 800,
maxFee,
};
Expand All @@ -479,14 +438,9 @@ describe.skip('Policies', () => {
});

it('on ContractFactory when deploying contracts', async () => {
using launched = await launchTestNode({
nodeOptions: {
args: ['--poa-instant', 'false', '--poa-interval-period', '10ms'],
},
});
using launched = await launchTestNode();

const {
provider,
wallets: [wallet],
} = launched;

Expand All @@ -499,7 +453,6 @@ describe.skip('Policies', () => {
);

const txParams: CustomTxParams = {
maturity: await randomMaturity(provider),
witnessLimit: 800,
maxFee,
};
Expand All @@ -522,12 +475,10 @@ describe.skip('Policies', () => {
});

const {
provider,
contracts: [contract],
} = launched;

const txParams: CustomTxParams = {
maturity: await randomMaturity(provider),
witnessLimit: 800,
maxFee,
};
Expand Down

0 comments on commit e7b0287

Please sign in to comment.