feat: fix typechain imports

aragon · Jan 22, 2025 · 703f2d9 · 703f2d9
1 parent 9ae2c58
commit 703f2d9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/packages/contracts/test/10_unit-testing/11_plugin.ts b/packages/contracts/test/10_unit-testing/11_plugin.ts
@@ -3,17 +3,16 @@ import {PLUGIN_CONTRACT_NAME} from '../../plugin-settings';
 import {
   Admin,
   Admin__factory,
-  AdminZkSync__factory,
   CustomExecutorMock__factory,
   IERC165Upgradeable__factory,
   IMembership__factory,
   IPlugin__factory,
   IProposal__factory,
   IProtocolVersion__factory,
-  ProxyFactory__factory,
 } from '../../typechain';
+import {ActionStruct} from '../../typechain/@aragon/osx-commons-contracts/src/executors/IExecutor';
 import {ProposalCreatedEvent} from '../../typechain/src/Admin';
-import {isZkSync, ZK_SYNC_NETWORKS} from '../../utils/zkSync';
+import {isZkSync} from '../../utils/zkSync';
 import {
   ADMIN_INTERFACE,
   EXECUTE_PROPOSAL_PERMISSION_ID,
@@ -33,7 +32,7 @@ import {
   getInterfaceId,
   DAO_PERMISSIONS,
 } from '@aragon/osx-commons-sdk';
-import {DAO, DAOEvents, DAOStructs} from '@aragon/osx-ethers';
+import {DAO, DAOEvents} from '@aragon/osx-ethers';
 import {SignerWithAddress} from '@nomiclabs/hardhat-ethers/signers';
 import {expect} from 'chai';
 import {BigNumber} from 'ethers';
@@ -44,7 +43,7 @@ let chainId: number;
 
 async function createProposalId(
   pluginAddress: string,
-  actions: DAOStructs.ActionStruct[],
+  actions: ActionStruct[],
   metadata: string
 ): Promise<BigNumber> {
   const blockNumber = (await ethers.provider.getBlock('latest')).number;
@@ -497,7 +496,7 @@ type FixtureResult = {
   initializedPlugin: Admin;
   uninitializedPlugin: Admin;
   dao: DAO;
-  dummyActions: DAOStructs.ActionStruct[];
+  dummyActions: ActionStruct[];
   dummyMetadata: string;
   targetConfig: TargetConfig;
 };
@@ -535,7 +534,7 @@ async function fixture(): Promise<FixtureResult> {
     await initializedPlugin.initialize(dao.address, targetConfig);
   }
 
-  const dummyActions: DAOStructs.ActionStruct[] = [
+  const dummyActions: ActionStruct[] = [
     {
       to: deployer.address,
       data: '0x1234',

diff --git a/packages/contracts/test/10_unit-testing/12_plugin-setup.ts b/packages/contracts/test/10_unit-testing/12_plugin-setup.ts
@@ -1,7 +1,7 @@
 import {createDaoProxy} from '../20_integration-testing/test-helpers';
 import {PLUGIN_SETUP_CONTRACT_NAME} from '../../plugin-settings';
 import buildMetadata from '../../src/build-metadata.json';
-import {AdminSetup, Admin__factory, AdminSetup__factory} from '../../typechain';
+import {AdminSetup, Admin__factory} from '../../typechain';
 import {isZkSync} from '../../utils/zkSync';
 import {
   ADMIN_INTERFACE,

diff --git a/packages/contracts/test/test-utils/wrapper/index.ts b/packages/contracts/test/test-utils/wrapper/index.ts
@@ -1,4 +1,4 @@
-import {ProxyCreatedEvent} from '../../../typechain/ProxyFactory';
+import {ProxyCreatedEvent} from '../../../typechain/@aragon/osx-commons-contracts/src/utils/deployment/ProxyFactory';
 import {HardhatClass} from './hardhat';
 import {ZkSync} from './zksync';
 import {findEvent} from '@aragon/osx-commons-sdk';