Merge pull request #465 from fei-protocol/feat/cleanup-scripts

scripts cleanup
fei-protocol · Jan 15, 2022 · 26b4ee1 · 26b4ee1
2 parents 69de1a0 + cc9c06e
commit 26b4ee1
Show file tree

Hide file tree

Showing 64 changed files with 39 additions and 1,144 deletions.
diff --git a/contracts/pcv/uniswap/PCVSwapperUniswap.sol b/contracts/pcv/uniswap/PCVSwapperUniswap.sol
diff --git a/package.json b/package.json
@@ -6,8 +6,7 @@
   "files": [],
   "scripts": {
     "compile": "npx hardhat compile",
-    "coverage": "scripts/coverage.js",
-    "coverage:hardhat": "npx hardhat coverage",
+    "coverage": "npx hardhat coverage",
     "console": "npx hardhat console",
     "console:rinkeby": "npx hardhat console --network rinkeby",
     "console:ropsten": "npx hardhat console --network ropsten",
@@ -27,9 +26,7 @@
     "deploy:fuse": "DEPLOY_FILE=compoundPCVDeposit npx hardhat run --network mainnet scripts/deploy/migrations.ts",
     "deploy:timelock": "DEPLOY_FILE=optimisticTimelockDeploy npx hardhat run --network mainnet scripts/deploy/migrations.ts",
     "deploy:stw": "DEPLOY_FILE=deployStakedTokenWrapper npx hardhat run --network mainnet scripts/deploy/migrations.ts",
-    "deploy:ropsten": "npx hardhat run --network ropsten scripts/deploy/migrations.ts",
-    "deploy:rinkeby": "npx hardhat run --network rinkeby scripts/deploy/migrations.ts",
-    "abis": "node scripts/abis.js",
+    "abis": "node scripts/utils/abis.js",
     "calldata": "npx hardhat run scripts/utils/getProposalCalldata.ts",
     "check-proposal": "ENABLE_MAINNET_FORKING=true npx hardhat run scripts/utils/checkProposal.ts",
     "prettier-format": "prettier --config .prettierrc './**/*.ts' --write",

diff --git a/proposals/dao/fip_54.ts → proposals/dao/old/fip_54.ts b/proposals/dao/fip_54.ts → proposals/dao/old/fip_54.ts
@@ -7,7 +7,7 @@ import {
   SetupUpgradeFunc,
   TeardownUpgradeFunc,
   ValidateUpgradeFunc
-} from '../../types/types';
+} from '../../../types/types';
 
 chai.use(CBN(ethers.BigNumber));
 

diff --git a/proposals/dao/fip_60.ts → proposals/dao/old/fip_60.ts b/proposals/dao/fip_60.ts → proposals/dao/old/fip_60.ts
diff --git a/proposals/dao/fip_61.ts → proposals/dao/old/fip_61.ts b/proposals/dao/fip_61.ts → proposals/dao/old/fip_61.ts
diff --git a/proposals/dao/fip_62.ts → proposals/dao/old/fip_62.ts b/proposals/dao/fip_62.ts → proposals/dao/old/fip_62.ts
diff --git a/proposals/dao/fip_bribe.ts → proposals/dao/old/fip_bribe.ts b/proposals/dao/fip_bribe.ts → proposals/dao/old/fip_bribe.ts
diff --git a/proposals/description/fip_54.ts → proposals/description/old/fip_54.ts b/proposals/description/fip_54.ts → proposals/description/old/fip_54.ts
diff --git a/proposals/description/fip_60.ts → proposals/description/old/fip_60.ts b/proposals/description/fip_60.ts → proposals/description/old/fip_60.ts
diff --git a/proposals/description/fip_60b.ts → proposals/description/old/fip_60b.ts b/proposals/description/fip_60b.ts → proposals/description/old/fip_60b.ts
diff --git a/proposals/description/fip_61.ts → proposals/description/old/fip_61.ts b/proposals/description/fip_61.ts → proposals/description/old/fip_61.ts
diff --git a/proposals/description/fip_62.ts → proposals/description/old/fip_62.ts b/proposals/description/fip_62.ts → proposals/description/old/fip_62.ts
diff --git a/scripts/coverage.js b/scripts/coverage.js
diff --git a/scripts/deploy/optimisticTimelock.ts → scripts/deploy/old/optimisticTimelock.ts b/scripts/deploy/optimisticTimelock.ts → scripts/deploy/old/optimisticTimelock.ts
@@ -1,4 +1,4 @@
-import { DeployUpgradeFunc } from '../../types/types';
+import { DeployUpgradeFunc } from '../../../types/types';
 import { ethers } from 'hardhat';
 
 const fourDays = 4 * 24 * 60 * 60;

diff --git a/scripts/sortAddresses.js b/scripts/sortAddresses.js
diff --git a/scripts/abis.js → scripts/utils/abis.js b/scripts/abis.js → scripts/utils/abis.js
diff --git a/test/integration/proposals_config.ts b/test/integration/proposals_config.ts
@@ -2,8 +2,7 @@ import { ProposalCategory, ProposalsConfigMap } from '@custom-types/types';
 
 // import fip_xx_proposal from '@proposals/description/fip_xx';
 
-import fip_54 from '@proposals/description/fip_54';
-import fip_60b from '@proposals/description/fip_60b';
+import fip_60b from '@proposals/description/old/fip_60b';
 import fip_63 from '@proposals/description/fip_63';
 import fip_64 from '@proposals/description/fip_64';
 
@@ -16,25 +15,6 @@ const proposals: ProposalsConfigMap = {
         proposal: fip_xx_proposal // full proposal file, imported from '@proposals/description/fip_xx.ts'
     }
     */
-  fip_54: {
-    deploy: false,
-    proposalId: undefined,
-    affectedContractSignoff: [
-      'restrictedPermissions',
-      'fei',
-      'core',
-      'ethPSMFeiSkimmer',
-      'daiPSMFeiSkimmer',
-      'rariInfraTribeTimelock',
-      'rariInfraFeiTimelock',
-      'votiumBriberD3pool',
-      'opsOptimisticTimelock'
-    ],
-    deprecatedContractSignoff: [],
-    category: ProposalCategory.DAO,
-    totalValue: 0,
-    proposal: fip_54
-  },
   fip_60b: {
     deploy: false,
     proposalId: undefined,