refactor: revert proxy factory addition

aragon · Oct 24, 2023 · 0717be2 · 0717be2
1 parent e673b0e
commit 0717be2
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 334 deletions.
diff --git a/contracts/src/utils/proxy/ProxyFactory.sol b/contracts/src/utils/proxy/ProxyFactory.sol
diff --git a/contracts/src/utils/proxy/ProxyLib.sol b/contracts/src/utils/proxy/ProxyLib.sol
diff --git a/contracts/test/plugin/majority-voting/majority-voting.ts b/contracts/test/plugin/majority-voting/majority-voting.ts
@@ -10,7 +10,7 @@ import {
   IProtocolVersion__factory,
 } from '../../../typechain';
 import {getInterfaceId} from '../../../utils/interfaces';
-import {deployUUPSProxy} from '../../../utils/proxy';
+import {deployWithProxy} from '../../../utils/proxy';
 import {pctToRatio} from '../../utils/math/ratio';
 import {VotingSettings, VotingMode, ONE_HOUR, ONE_YEAR} from './voting-helpers';
 import {SignerWithAddress} from '@nomiclabs/hardhat-ethers/signers';
@@ -38,10 +38,8 @@ describe('MajorityVotingMock', function () {
     signers = await ethers.getSigners();
     ownerAddress = await signers[0].getAddress();
 
-    dao = await deployUUPSProxy<DAO>(new DAO__factory(signers[0]), {
-      initializerName: 'initialize',
-      args: [[], ownerAddress, ethers.constants.AddressZero, 'examplURI'],
-    });
+    dao = await deployWithProxy<DAO>(new DAO__factory(signers[0]));
+    dao.initialize([], ownerAddress, ethers.constants.AddressZero, 'examplURI');
   });
 
   beforeEach(async () => {
@@ -55,7 +53,7 @@ describe('MajorityVotingMock', function () {
 
     const MajorityVotingBase = new MajorityVotingMock__factory(signers[0]);
 
-    votingBase = await deployUUPSProxy(MajorityVotingBase);
+    votingBase = await deployWithProxy<MajorityVotingMock>(MajorityVotingBase);
     await dao.grant(
       votingBase.address,
       ownerAddress,

diff --git a/contracts/test/token/erc20/governance-erc20.ts b/contracts/test/token/erc20/governance-erc20.ts
@@ -9,8 +9,8 @@ import {
   IERC20Upgradeable__factory,
   IVotesUpgradeable__factory,
 } from '../../../typechain';
-import {deployUUPSProxy} from '../../../utils/events';
 import {getInterfaceId} from '../../../utils/interfaces';
+import {deployWithProxy} from '../../../utils/proxy';
 import {SignerWithAddress} from '@nomiclabs/hardhat-ethers/signers';
 import {expect} from 'chai';
 import {ethers} from 'hardhat';
@@ -26,7 +26,7 @@ const governanceERC20Symbol = 'GOV';
 
 const addressZero = ethers.constants.AddressZero;
 
-describe('GovernanceERC20', function () {
+describe.only('GovernanceERC20', function () {
   let signers: SignerWithAddress[];
   let dao: DAO;
   let token: GovernanceERC20;
@@ -43,10 +43,8 @@ describe('GovernanceERC20', function () {
     signers = await ethers.getSigners();
     GovernanceERC20 = new GovernanceERC20__factory(signers[0]);
 
-    dao = await deployUUPSProxy<DAO>(new DAO__factory(signers[0]), {
-      initializerName: 'initialize',
-      args: [[], signers[0].address, addressZero, 'exampleURI'],
-    });
+    dao = await deployWithProxy<DAO>(new DAO__factory(signers[0]));
+    await dao.initialize([], signers[0].address, addressZero, 'exampleURI');
 
     from = signers[0];
     to = signers[1];

diff --git a/contracts/test/utils/proxy/proxy-factory.ts b/contracts/test/utils/proxy/proxy-factory.ts