fix: deprecate createNewDAO for createDAOProxy

aragon · Mar 4, 2024 · 06aab6a · 06aab6a
1 parent 0502e92
commit 06aab6a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 20 deletions.
diff --git a/packages/contracts/test/10_unit-testing/governance-erc20/11_governance-erc20.ts b/packages/contracts/test/10_unit-testing/governance-erc20/11_governance-erc20.ts
@@ -5,7 +5,7 @@ import {
   IERC20Upgradeable__factory,
   IVotesUpgradeable__factory,
 } from '../../../typechain';
-import {deployNewDAO} from '../../test-utils/dao';
+import {EMPTY_DATA, createDaoProxy} from '../../test-utils/dao';
 import {
   GovernanceERC20__factory,
   GovernanceERC20,
@@ -42,7 +42,7 @@ describe('GovernanceERC20', function () {
 
   before(async () => {
     signers = await ethers.getSigners();
-    dao = await deployNewDAO(signers[0]);
+    dao = await createDaoProxy(signers[0], EMPTY_DATA);
     GovernanceERC20 = new GovernanceERC20__factory(signers[0]);
 
     from = signers[0];

diff --git a/packages/contracts/test/10_unit-testing/majority-voting/11_majority-voting.ts b/packages/contracts/test/10_unit-testing/majority-voting/11_majority-voting.ts
@@ -7,7 +7,7 @@ import {
   MajorityVotingMock__factory,
   IProtocolVersion__factory,
 } from '../../../typechain';
-import {deployNewDAO} from '../../test-utils/dao';
+import {EMPTY_DATA, createDaoProxy} from '../../test-utils/dao';
 import {MAJORITY_VOTING_BASE_INTERFACE} from '../../test-utils/majority-voting-constants';
 import {deployWithProxy} from '../../test-utils/proxy';
 import {VotingSettings, VotingMode} from '../../test-utils/voting-helpers';
@@ -30,7 +30,7 @@ describe('MajorityVotingMock', function () {
     signers = await ethers.getSigners();
     ownerAddress = await signers[0].getAddress();
 
-    dao = await deployNewDAO(signers[0]);
+    dao = await createDaoProxy(signers[0], EMPTY_DATA);
   });
 
   beforeEach(async () => {

diff --git a/packages/contracts/test/10_unit-testing/token-voting/11_token-voting.ts b/packages/contracts/test/10_unit-testing/token-voting/11_token-voting.ts
@@ -14,7 +14,7 @@ import {
 } from '../../../typechain/src/TokenVoting';
 import {ExecutedEvent} from '../../../typechain/src/mocks/DAOMock';
 import {VITALIK} from '../../test-utils/address';
-import {deployNewDAO} from '../../test-utils/dao';
+import {EMPTY_DATA, createDaoProxy} from '../../test-utils/dao';
 import {
   MAJORITY_VOTING_BASE_INTERFACE,
   VOTING_EVENTS,
@@ -91,7 +91,7 @@ describe('TokenVoting', function () {
       ethers.utils.toUtf8Bytes('0x123456789')
     );
 
-    dao = await deployNewDAO(signers[0]);
+    dao = await createDaoProxy(signers[0], EMPTY_DATA);
   });
 
   beforeEach(async function () {

diff --git a/packages/contracts/test/10_unit-testing/token-voting/12_token-voting-setup.ts b/packages/contracts/test/10_unit-testing/token-voting/12_token-voting-setup.ts
@@ -10,7 +10,7 @@ import {
   TokenVotingSetup__factory,
   TokenVoting__factory,
 } from '../../../typechain';
-import {deployNewDAO} from '../../test-utils/dao';
+import {createDaoProxy, EMPTY_DATA} from '../../test-utils/dao';
 import {TOKEN_VOTING_INTERFACE} from '../../test-utils/token-voting-constants';
 import {VotingMode, VotingSettings} from '../../test-utils/voting-helpers';
 import {Operation} from '@aragon/osx-commons-sdk';
@@ -29,7 +29,6 @@ let defaultMintSettings: {receivers: string[]; amounts: number[]};
 
 const abiCoder = ethers.utils.defaultAbiCoder;
 const AddressZero = ethers.constants.AddressZero;
-const EMPTY_DATA = '0x';
 
 const prepareInstallationDataTypes = getNamedTypesFromMetadata(
   metadata.pluginSetup.prepareInstallation.inputs
@@ -59,7 +58,7 @@ describe('TokenVotingSetup', function () {
 
   before(async () => {
     signers = await ethers.getSigners();
-    targetDao = await deployNewDAO(signers[0]);
+    targetDao = await createDaoProxy(signers[0], EMPTY_DATA);
 
     defaultVotingSettings = {
       votingMode: VotingMode.EarlyExecution,

diff --git a/packages/contracts/test/test-utils/dao.ts b/packages/contracts/test/test-utils/dao.ts
@@ -9,6 +9,7 @@ import {ethers} from 'hardhat';
 export const ZERO_BYTES32 =
   '0x0000000000000000000000000000000000000000000000000000000000000000';
 export const daoExampleURI = 'https://example.com';
+export const EMPTY_DATA = '0x';
 
 export const TOKEN_INTERFACE_IDS = {
   erc721ReceivedId: '0x150b7a02',
@@ -45,17 +46,6 @@ export async function createDaoProxy(
   return dao;
 }
 
-const dummyMetadata = ethers.utils.hexlify(
-  ethers.utils.toUtf8Bytes('0x123456789')
-);
-
-export async function deployNewDAO(
-  signer: SignerWithAddress,
-  metadata = dummyMetadata
-): Promise<DAO> {
-  return await createDaoProxy(signer, metadata);
-}
-
 export function getERC20TransferAction(
   tokenAddress: string,
   to: string,