[Common] update fixtures in tests

cryptoalgebra · Feb 6, 2024 · eea3a9b · eea3a9b
1 parent cb9b516
commit eea3a9b
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 9 deletions.
diff --git a/src/farming/test/shared/externalFixtures.ts b/src/farming/test/shared/externalFixtures.ts
@@ -45,7 +45,7 @@ const v3CoreFactoryFixture: () => Promise<IAlgebraFactory> = async () => {
   const _factory = (await v3FactoryFactory.deploy(poolDeployerAddress)) as any as IAlgebraFactory;
 
   const poolDeployerFactory = await ethers.getContractFactory(POOL_DEPLOYER_ABI, POOL_DEPLOYER_BYTECODE);
-  const poolDeployer = await poolDeployerFactory.deploy(_factory, vaultAddress);
+  const poolDeployer = await poolDeployerFactory.deploy(_factory);
 
   const pluginContractFactory = await ethers.getContractFactory(PLUGIN_FACTORY_ABI, PLUGIN_FACTORY_BYTECODE);
   const pluginFactory = await pluginContractFactory.deploy(_factory);

diff --git a/src/farming/test/shared/fixtures.ts b/src/farming/test/shared/fixtures.ts
@@ -60,7 +60,7 @@ const v3CoreFactoryFixture: () => Promise<[IAlgebraFactory, IAlgebraPoolDeployer
   const _factory = (await v3FactoryFactory.deploy(poolDeployerAddress)) as any as IAlgebraFactory;
 
   const poolDeployerFactory = await ethers.getContractFactory(AlgebraPoolDeployerJson.abi, AlgebraPoolDeployerJson.bytecode);
-  const _deployer = (await poolDeployerFactory.deploy(_factory, vaultAddress)) as any as IAlgebraPoolDeployer;
+  const _deployer = (await poolDeployerFactory.deploy(_factory)) as any as IAlgebraPoolDeployer;
 
   const pluginContractFactory = await ethers.getContractFactory(PLUGIN_FACTORY_ABI, PLUGIN_FACTORY_BYTECODE);
   const pluginFactory = (await pluginContractFactory.deploy(_factory)) as any as IBasePluginV1Factory;

diff --git a/src/periphery/test/shared/externalFixtures.ts b/src/periphery/test/shared/externalFixtures.ts
@@ -42,7 +42,7 @@ const v3CoreFactoryFixture: () => Promise<IAlgebraFactory> = async () => {
   const _factory = (await v3FactoryFactory.deploy(poolDeployerAddress)) as any as IAlgebraFactory;
 
   const poolDeployerFactory = await ethers.getContractFactory(POOL_DEPLOYER_ABI, POOL_DEPLOYER_BYTECODE);
-  const poolDeployer = await poolDeployerFactory.deploy(_factory, vaultAddress);
+  const poolDeployer = await poolDeployerFactory.deploy(_factory);
 
   return _factory;
 };

diff --git a/src/plugin/test/AlgebraPool.gas.spec.ts b/src/plugin/test/AlgebraPool.gas.spec.ts
@@ -22,6 +22,7 @@ import {
   MaxUint128,
   SwapToPriceFunction,
 } from '../../core/test/shared/utilities';
+import { ZERO_ADDRESS } from './shared/fixtures';
 
 describe('AlgebraPool gas tests [ @skip-on-coverage ]', () => {
   let wallet: Wallet, other: Wallet;
@@ -44,7 +45,7 @@ describe('AlgebraPool gas tests [ @skip-on-coverage ]', () => {
     const mockPluginFactoryFactory = await ethers.getContractFactory('MockTimeDSFactory');
     const mockPluginFactory = (await mockPluginFactoryFactory.deploy(fix.factory)) as any as MockTimeDSFactory;
 
-    await mockPluginFactory.createPlugin(pool);
+    await mockPluginFactory.createPlugin(pool, ZERO_ADDRESS, ZERO_ADDRESS);
     const pluginAddress = await mockPluginFactory.pluginByPool(pool);
 
     const mockDSOperatorFactory = await ethers.getContractFactory('MockTimeAlgebraBasePluginV1');
@@ -68,6 +69,7 @@ describe('AlgebraPool gas tests [ @skip-on-coverage ]', () => {
     const virtualPoolMock = (await virtualPoolMockFactory.deploy()) as any as MockTimeVirtualPool;
 
     await pool.initialize(encodePriceSqrt(1, 1));
+    await pool.setCommunityVault(wallet.address);
 
     await advanceTime(1);
     await mint(wallet.address, minTick, maxTick, expandTo18Decimals(2));

diff --git a/src/plugin/test/BasePluginV1Factory.spec.ts b/src/plugin/test/BasePluginV1Factory.spec.ts
@@ -22,15 +22,15 @@ describe('BasePluginV1Factory', () => {
 
   describe('#Create plugin', () => {
     it('only factory', async () => {
-      expect(pluginFactory.createPlugin(wallet.address)).to.be.revertedWithoutReason;
+      expect(pluginFactory.createPlugin(wallet.address, ZERO_ADDRESS, ZERO_ADDRESS)).to.be.revertedWithoutReason;
     });
 
     it('factory can create plugin', async () => {
       const pluginFactoryFactory = await ethers.getContractFactory('BasePluginV1Factory');
       const pluginFactoryMock = (await pluginFactoryFactory.deploy(wallet.address)) as any as BasePluginV1Factory;
 
-      const pluginAddress = await pluginFactoryMock.createPlugin.staticCall(wallet.address);
-      await pluginFactoryMock.createPlugin(wallet.address);
+      const pluginAddress = await pluginFactoryMock.createPlugin.staticCall(wallet.address, ZERO_ADDRESS, ZERO_ADDRESS);
+      await pluginFactoryMock.createPlugin(wallet.address, ZERO_ADDRESS, ZERO_ADDRESS);
 
       const pluginMock = (await ethers.getContractFactory('AlgebraBasePluginV1')).attach(pluginAddress) as any as AlgebraBasePluginV1;
       const feeConfig = await pluginMock.feeConfig();

diff --git a/src/plugin/test/shared/externalFixtures.ts b/src/plugin/test/shared/externalFixtures.ts
@@ -78,7 +78,7 @@ export const algebraPoolDeployerMockFixture: () => Promise<MockPoolDeployerFixtu
     token1,
     factory,
     createPool: async (firstToken = token0, secondToken = token1) => {
-      await poolDeployer.deployMock(factory, ZERO_ADDRESS, firstToken, secondToken);
+      await poolDeployer.deployMock(factory, firstToken, secondToken);
 
       const sortedTokens =
         BigInt(await firstToken.getAddress()) < BigInt(await secondToken.getAddress())

diff --git a/src/plugin/test/shared/fixtures.ts b/src/plugin/test/shared/fixtures.ts
@@ -34,7 +34,7 @@ export const pluginFixture: Fixture<PluginFixture> = async function (): Promise<
   const mockPoolFactory = await ethers.getContractFactory('MockPool');
   const mockPool = (await mockPoolFactory.deploy()) as any as MockPool;
 
-  await mockPluginFactory.createPlugin(mockPool);
+  await mockPluginFactory.createPlugin(mockPool, ZERO_ADDRESS, ZERO_ADDRESS);
   const pluginAddress = await mockPluginFactory.pluginByPool(mockPool);
 
   const mockDSOperatorFactory = await ethers.getContractFactory('MockTimeAlgebraBasePluginV1');