fix: wrong imports

aragon · Oct 4, 2023 · 98b3201 · 98b3201
1 parent b662dde
commit 98b3201
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 12 deletions.
diff --git a/packages/contracts/test/plugins/governance/admin/admin-setup.ts b/packages/contracts/test/plugins/governance/admin/admin-setup.ts
@@ -8,9 +8,8 @@ import {
   Admin__factory,
 } from '../../../../typechain';
 import {deployNewDAO} from '../../../test-utils/dao';
-import {getInterfaceID} from '../../../test-utils/interfaces';
+import {ADMIN_INTERFACE, getInterfaceID} from '../../../test-utils/interfaces';
 import metadata from '../../../../src/plugins/governance/admin/build-metadata.json';
-import {adminInterface} from './admin';
 import {getNamedTypesFromMetadata} from '../../../../utils/metadata';
 
 const abiCoder = ethers.utils.defaultAbiCoder;
@@ -59,7 +58,7 @@ describe('AdminSetup', function () {
 
     expect(
       await adminAddressContract.supportsInterface(
-        getInterfaceID(adminInterface)
+        getInterfaceID(ADMIN_INTERFACE)
       )
     ).to.be.eq(true);
   });

diff --git a/...contracts/test/plugins/governance/majority-voting/addresslist/addresslist-voting-setup.ts b/...contracts/test/plugins/governance/majority-voting/addresslist/addresslist-voting-setup.ts
@@ -8,7 +8,10 @@ import {
   AddresslistVoting__factory,
 } from '../../../../../typechain';
 import {deployNewDAO} from '../../../../test-utils/dao';
-import {getInterfaceID} from '../../../../test-utils/interfaces';
+import {
+  ADDRESSLIST_VOTING_INTERFACE,
+  getInterfaceID,
+} from '../../../../test-utils/interfaces';
 import {Operation} from '../../../../../utils/types';
 import {
   VotingSettings,
@@ -17,7 +20,6 @@ import {
   ONE_HOUR,
 } from '../../../../test-utils/voting';
 import metadata from '../../../../../src/plugins/governance/majority-voting/addresslist/build-metadata.json';
-import {addresslistVotingInterface} from './addresslist-voting';
 import {getNamedTypesFromMetadata} from '../../../../../utils/metadata';
 
 let defaultData: any;
@@ -83,7 +85,7 @@ describe('AddresslistVotingSetup', function () {
 
     expect(
       await addresslistVotingContract.supportsInterface(
-        getInterfaceID(addresslistVotingInterface)
+        getInterfaceID(ADDRESSLIST_VOTING_INTERFACE)
       )
     ).to.be.eq(true);
   });

diff --git a/packages/contracts/test/plugins/governance/majority-voting/token/token-voting-setup.ts b/packages/contracts/test/plugins/governance/majority-voting/token/token-voting-setup.ts
@@ -14,7 +14,10 @@ import {
   TokenVoting__factory,
 } from '../../../../../typechain';
 import {deployNewDAO} from '../../../../test-utils/dao';
-import {getInterfaceID} from '../../../../test-utils/interfaces';
+import {
+  TOKEN_VOTING_INTERFACE,
+  getInterfaceID,
+} from '../../../../test-utils/interfaces';
 import {Operation} from '../../../../../utils/types';
 import metadata from '../../../../../src/plugins/governance/majority-voting/token/build-metadata.json';
 
@@ -24,7 +27,6 @@ import {
   pctToRatio,
   ONE_HOUR,
 } from '../../../../test-utils/voting';
-import {tokenVotingInterface} from './token-voting';
 import {getNamedTypesFromMetadata} from '../../../../../utils/metadata';
 
 let defaultData: any;
@@ -137,7 +139,9 @@ describe('TokenVotingSetup', function () {
     const tokenVoting = factory.attach(implementationAddress);
 
     expect(
-      await tokenVoting.supportsInterface(getInterfaceID(tokenVotingInterface))
+      await tokenVoting.supportsInterface(
+        getInterfaceID(TOKEN_VOTING_INTERFACE)
+      )
     ).to.be.eq(true);
   });
 

diff --git a/packages/contracts/test/plugins/governance/multisig/multisig-setup.ts b/packages/contracts/test/plugins/governance/multisig/multisig-setup.ts
@@ -16,11 +16,14 @@ import {
   PluginSetupProcessor__factory,
 } from '../../../../typechain';
 import {deployNewDAO} from '../../../test-utils/dao';
-import {getInterfaceID} from '../../../test-utils/interfaces';
+import {
+  MULTISIG_INTERFACE,
+  getInterfaceID,
+} from '../../../test-utils/interfaces';
 import {Operation} from '../../../../utils/types';
 import metadata from '../../../../src/plugins/governance/multisig/build-metadata.json';
 import {SignerWithAddress} from '@nomiclabs/hardhat-ethers/signers';
-import {MultisigSettings, multisigInterface} from './multisig';
+import {MultisigSettings} from './multisig';
 import {deployWithProxy} from '../../../test-utils/proxy';
 import {findEvent} from '../../../../utils/event';
 import {
@@ -87,7 +90,7 @@ describe('MultisigSetup', function () {
 
     expect(
       await multisigContract.supportsInterface(
-        getInterfaceID(multisigInterface)
+        getInterfaceID(MULTISIG_INTERFACE)
       )
     ).to.be.true;
   });