Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

scripts cleanup #465

Merged
merged 7 commits into from
Jan 15, 2022
Merged

scripts cleanup #465

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f09b5c3
scripts cleanup
Jan 14, 2022
e1f6eca
.only
Jan 15, 2022
2cba62b
reorg tests
Jan 15, 2022
d35e6e1
unskip
Jan 15, 2022
e10b4a3
delet
Jan 15, 2022
945956a
Merge pull request #467 from fei-protocol/feat/tests2
Joeysantoro Jan 15, 2022
cc9c06e
Merge pull request #466 from fei-protocol/feat/tests
Joeysantoro Jan 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion proposals/dao/fip_54.ts → proposals/dao/old/fip_54.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
SetupUpgradeFunc,
TeardownUpgradeFunc,
ValidateUpgradeFunc
} from '../../types/types';
} from '../../../types/types';

chai.use(CBN(ethers.BigNumber));

Expand Down
0 proposals/dao/fip_60.ts → proposals/dao/old/fip_60.ts
View file
Open in desktop
File renamed without changes.
0 proposals/dao/fip_61.ts → proposals/dao/old/fip_61.ts
View file
Open in desktop
File renamed without changes.
0 proposals/dao/fip_62.ts → proposals/dao/old/fip_62.ts
View file
Open in desktop
File renamed without changes.
0 proposals/dao/fip_bribe.ts → proposals/dao/old/fip_bribe.ts
View file
Open in desktop
File renamed without changes.
0 proposals/description/fip_54.ts → proposals/description/old/fip_54.ts
View file
Open in desktop
File renamed without changes.
0 proposals/description/fip_60.ts → proposals/description/old/fip_60.ts
View file
Open in desktop
File renamed without changes.
0 proposals/description/fip_60b.ts → proposals/description/old/fip_60b.ts
View file
Open in desktop
File renamed without changes.
0 proposals/description/fip_61.ts → proposals/description/old/fip_61.ts
View file
Open in desktop
File renamed without changes.
0 proposals/description/fip_62.ts → proposals/description/old/fip_62.ts
View file
Open in desktop
File renamed without changes.
26 changes: 0 additions & 26 deletions scripts/coverage.js
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion scripts/deploy/optimisticTimelock.ts → scripts/deploy/old/optimisticTimelock.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { DeployUpgradeFunc } from '../../types/types';
import { DeployUpgradeFunc } from '../../../types/types';
import { ethers } from 'hardhat';

const fourDays = 4 * 24 * 60 * 60;
Expand Down
37 changes: 0 additions & 37 deletions scripts/sortAddresses.js
View file
Open in desktop

This file was deleted.

0 scripts/abis.js → scripts/utils/abis.js
View file
Open in desktop
File renamed without changes.
22 changes: 1 addition & 21 deletions test/integration/proposals_config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand All @@ -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,
Expand Down