refactor: combine both proposals

thomas-waite · thomas-waite · commit e86046df0c61 · 2022-06-23T15:49:23.000+01:00
diff --git a/block.txt b/block.txt
@@ -1 +1 @@
-15008550
+15013451
diff --git a/proposals/dao/cr_oracle_cleanup.ts b/proposals/dao/cr_oracle_cleanup.ts
@@ -33,8 +33,31 @@ const deploy: DeployUpgradeFunc = async (deployAddress: string, addresses: Named
   await voltOracle.deployed();
   logging && console.log(`voltOracle: ${voltOracle.address}`);
 
+  ////// Deploy empty PCV deposits for remaining PCV assets
+  // Deploy empty PCV deposits for ERC20 assets
+  const ERC20HoldingPCVDepositFactory = await ethers.getContractFactory('ERC20HoldingPCVDeposit');
+  const wethHoldingDeposit = await ERC20HoldingPCVDepositFactory.deploy(addresses.core, addresses.weth);
+  await wethHoldingDeposit.deployTransaction.wait();
+  logging && console.log('WETH holding deposit deployed to: ', wethHoldingDeposit.address);
+
+  const lusdHoldingDeposit = await ERC20HoldingPCVDepositFactory.deploy(addresses.core, addresses.lusd);
+  await lusdHoldingDeposit.deployTransaction.wait();
+  logging && console.log('LUSD holding deposit deployed to: ', lusdHoldingDeposit.address);
+
+  const voltHoldingDeposit = await ERC20HoldingPCVDepositFactory.deploy(addresses.core, addresses.volt);
+  await voltHoldingDeposit.deployTransaction.wait();
+  logging && console.log('VOLT holding deposit deployed to: ', voltHoldingDeposit.address);
+
+  const daiHoldingDeposit = await ERC20HoldingPCVDepositFactory.deploy(addresses.core, addresses.dai);
+  await daiHoldingDeposit.deployTransaction.wait();
+  logging && console.log('DAI holding deposit deployed to: ', daiHoldingDeposit.address);
+
   return {
-    voltOracle
+    voltOracle,
+    wethHoldingDeposit,
+    lusdHoldingDeposit,
+    voltHoldingDeposit,
+    daiHoldingDeposit
   };
 };
 
@@ -68,32 +91,6 @@ const setup: SetupUpgradeFunc = async (addresses, oldContracts, contracts, loggi
   const cycleEnd: BigNumber = await tokemakManager.nextCycleStartTime();
   await time.increaseTo(cycleEnd.add(1));
   await tokemakManager.completeRollover(IPFS_JSON_FILE_HASH);
-
-  ////// Deploy empty PCV deposits for remaining PCV assets
-  // Deploy empty PCV deposits for ERC20 assets
-  const ERC20HoldingPCVDepositFactory = await ethers.getContractFactory('ERC20HoldingPCVDeposit');
-  const wethHoldingDeposit = await ERC20HoldingPCVDepositFactory.deploy(addresses.core, addresses.weth);
-  await wethHoldingDeposit.deployTransaction.wait();
-  logging && console.log('WETH holding deposit deployed to: ', wethHoldingDeposit.address);
-
-  const lusdHoldingDeposit = await ERC20HoldingPCVDepositFactory.deploy(addresses.core, addresses.lusd);
-  await lusdHoldingDeposit.deployTransaction.wait();
-  logging && console.log('LUSD holding deposit deployed to: ', lusdHoldingDeposit.address);
-
-  const voltHoldingDeposit = await ERC20HoldingPCVDepositFactory.deploy(addresses.core, addresses.volt);
-  await voltHoldingDeposit.deployTransaction.wait();
-  logging && console.log('VOLT holding deposit deployed to: ', voltHoldingDeposit.address);
-
-  const daiHoldingDeposit = await ERC20HoldingPCVDepositFactory.deploy(addresses.core, addresses.dai);
-  await daiHoldingDeposit.deployTransaction.wait();
-  logging && console.log('DAI holding deposit deployed to: ', daiHoldingDeposit.address);
-
-  return {
-    wethHoldingDeposit,
-    lusdHoldingDeposit,
-    voltHoldingDeposit,
-    daiHoldingDeposit
-  };
 };
 
 // Tears down any changes made in setup() that need to be
diff --git a/protocol-configuration/proposalsConfig.ts b/protocol-configuration/proposalsConfig.ts
@@ -1,6 +1,6 @@
 import { ProposalCategory, TemplatedProposalsConfigMap } from '@custom-types/types';
 import cr_oracle_cleanup from '@proposals/description/cr_oracle_cleanup';
-import pod_executor_v2 from '@proposals/description/pod_exec_v2';
+import pod_exec_v2 from '@proposals/description/pod_exec_v2';
 
 const proposals: TemplatedProposalsConfigMap = {
   cr_oracle_cleanup: {
@@ -15,7 +15,7 @@ const proposals: TemplatedProposalsConfigMap = {
   pod_exec_v2: {
     deploy: false, // deploy flag for whether to run deploy action during e2e tests or use mainnet state
     totalValue: 0, // amount of ETH to send to DAO execution
-    proposal: pod_executor_v2, // full proposal file, imported from '@proposals/description/fip_xx.ts'
+    proposal: pod_exec_v2, // full proposal file, imported from '@proposals/description/fip_xx.ts'
     proposalId: '',
     affectedContractSignoff: [],
     deprecatedContractSignoff: [],
