From c8c8246acf7c2a90281fd2eca10200025a6cdeb6 Mon Sep 17 00:00:00 2001 From: MantisClone Date: Mon, 2 Jan 2023 19:09:21 -0600 Subject: [PATCH 1/2] Add afterAll to reset aggregators - Before this change, admin tasks tests would fail on subsequent runs --- .../contracts/ChainlinkConversionPath.test.ts | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/packages/smart-contracts/test/contracts/ChainlinkConversionPath.test.ts b/packages/smart-contracts/test/contracts/ChainlinkConversionPath.test.ts index f30fbb7633..3f06f4ab09 100644 --- a/packages/smart-contracts/test/contracts/ChainlinkConversionPath.test.ts +++ b/packages/smart-contracts/test/contracts/ChainlinkConversionPath.test.ts @@ -6,6 +6,7 @@ import { chainlinkConversionPath as chainlinkConvArtifact } from '../../src/lib' import { ChainlinkConversionPath } from '../../src/types'; import { localERC20AlphaArtifact, localUSDTArtifact } from './localArtifacts'; +const address0 = '0x0000000000000000000000000000000000000000'; const address1 = '0x1111111111111111111111111111111111111111'; const address2 = '0x2222222222222222222222222222222222222222'; const address3 = '0x3333333333333333333333333333333333333333'; @@ -30,9 +31,18 @@ describe('contract: ChainlinkConversionPath', () => { }); describe('admin tasks', async () => { + // Reset all aggregators to 0x000... + afterAll(async () => { + await conversionPathInstance.updateAggregatorsList( + [address1, address4], + [address2, address5], + [address0, address0], + ); + }); + it('can updateAggregator and updateAggregatorsList', async () => { let addressAggregator = await conversionPathInstance.allAggregators(address1, address2); - expect(addressAggregator).equal('0x0000000000000000000000000000000000000000'); + expect(addressAggregator).equal(address0); await conversionPathInstance.updateAggregator(address1, address2, address3); @@ -40,9 +50,7 @@ describe('contract: ChainlinkConversionPath', () => { expect(addressAggregator).equal(address3); addressAggregator = await conversionPathInstance.allAggregators(address4, address5); - expect(addressAggregator, 'addressAggregator must be 0x').equal( - '0x0000000000000000000000000000000000000000', - ); + expect(addressAggregator, 'addressAggregator must be 0x').equal(address0); await conversionPathInstance.updateAggregatorsList( [address1, address4], From eefa1c8339c7b490d478dee94ae4e28f5c877f47 Mon Sep 17 00:00:00 2001 From: MantisClone Date: Mon, 2 Jan 2023 21:12:18 -0600 Subject: [PATCH 2/2] Fix syntax error --- .../test/contracts/ChainlinkConversionPath.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/smart-contracts/test/contracts/ChainlinkConversionPath.test.ts b/packages/smart-contracts/test/contracts/ChainlinkConversionPath.test.ts index 3f06f4ab09..60c46c716c 100644 --- a/packages/smart-contracts/test/contracts/ChainlinkConversionPath.test.ts +++ b/packages/smart-contracts/test/contracts/ChainlinkConversionPath.test.ts @@ -32,7 +32,7 @@ describe('contract: ChainlinkConversionPath', () => { describe('admin tasks', async () => { // Reset all aggregators to 0x000... - afterAll(async () => { + before(async () => { await conversionPathInstance.updateAggregatorsList( [address1, address4], [address2, address5],