Merge pull request #240 from fei-protocol/feat/remove-run

remove run

Author: Joeysantoro

proposals/dao/fip_x.ts

@@ -3,7 +3,6 @@ import { expect } from 'chai';
 import {
   DeployUpgradeFunc,
   NamedAddresses,
-  RunUpgradeFunc,
   SetupUpgradeFunc,
   TeardownUpgradeFunc,
   ValidateUpgradeFunc
@@ -40,12 +39,6 @@ const setup: SetupUpgradeFunc = async (addresses, oldContracts, contracts, loggi
   console.log(`No actions to complete in setup for fip${fipNumber}`);
 };
 
-// Here we'll mock the DAO proposal steps (in simulation).
-// We don't need to do any checks here, as those will be in validate.
-const run: RunUpgradeFunc = async (addresses, oldContracts, contracts, logging = false) => {
-  console.log(`No actions to complete in run for fip${fipNumber}`);
-};
-
 // Tears down any changes made in setup() that need to be
 // cleaned up before doing any validation checks.
 const teardown: TeardownUpgradeFunc = async (addresses, oldContracts, contracts, logging) => {
@@ -54,8 +47,8 @@ const teardown: TeardownUpgradeFunc = async (addresses, oldContracts, contracts,
 
 // Run any validations required on the fip using mocha or console logging
 // IE check balances, check state of contracts, etc.
-const validate: ValidateUpgradeFunc = async (addresses, oldContracts, contracts) => {
+const validate: ValidateUpgradeFunc = async (addresses, oldContracts, contracts, logging) => {
   console.log(`No actions to complete in validate for fip${fipNumber}`);
 };
 
-export { deploy, setup, run, teardown, validate };
+export { deploy, setup, teardown, validate };

test/integration/setup/index.ts

@@ -17,7 +17,6 @@ import {
   NamedContracts,
   DeployUpgradeFunc,
   SetupUpgradeFunc,
-  RunUpgradeFunc,
   TeardownUpgradeFunc,
   ValidateUpgradeFunc
 } from '../../../types/types';
@@ -84,9 +83,11 @@ export class TestEndtoEndCoordinator implements TestCoordinator {
   ): Promise<NamedContracts> {
     let deployedUpgradedContracts = {};
 
+    // Get the upgrade setup and teardown scripts
+    const { deploy, setup, teardown, validate } = await import('@proposals/dao/' + proposalName);
+
     if (config['deploy']) {
       this.config.logging && console.log(`Applying upgrade for proposal: ${proposalName}`);
-      const { deploy } = await import('../../../scripts/deploy/' + proposalName);
       const deployTyped = deploy as DeployUpgradeFunc;
       deployedUpgradedContracts = await deployTyped(
         this.config.deployAddress,
@@ -109,29 +110,24 @@ export class TestEndtoEndCoordinator implements TestCoordinator {
       ...getAllContractAddresses()
     };
 
-    // Get the upgrade setup, run and teardown scripts
-    const { setup, run, teardown, validate } = await import('../../../proposals/dao/' + proposalName);
-
     // setup the DAO proposal
-    await setup(contractAddresses, existingContracts, contracts, this.config.logging);
+    const setupTyped = setup as SetupUpgradeFunc;
+    await setupTyped(contractAddresses, existingContracts, contracts, this.config.logging);
 
     // Simulate the DAO proposal
-    if (config.exec) {
-      const proposal = await constructProposal(proposalName, this.config.logging);
-      this.config.logging && console.log(`Simulating proposal...`);
-      await proposal.simulate();
-    } else {
-      this.config.logging && console.log(`Running proposal...`);
-      await run(contractAddresses, existingContracts, contracts, this.config.logging);
-    }
+    const proposal = await constructProposal(proposalName, this.config.logging);
+    this.config.logging && console.log(`Simulating proposal...`);
+    await proposal.simulate();
 
     // teardown the DAO proposal
     this.config.logging && console.log(`Running proposal teardown...`);
-    await teardown(contractAddresses, existingContracts, contracts);
+    const teardownTyped = teardown as TeardownUpgradeFunc;
+    await teardownTyped(contractAddresses, existingContracts, contracts, this.config.logging);
 
     if (validate) {
       this.config.logging && console.log(`Running proposal validation...`);
-      await validate(contractAddresses, existingContracts, contracts);
+      const validateTyped = validate as ValidateUpgradeFunc;
+      await validateTyped(contractAddresses, existingContracts, contracts, this.config.logging);
     }
 
     return contracts;