From 962a5023e63525a3c8291be878bd3d402e524492 Mon Sep 17 00:00:00 2001 From: teryanarmen Date: Tue, 14 Jun 2022 16:52:57 -0700 Subject: [PATCH] remove commented code, fix some old scripts --- .../harnesses/GovernorPreventLateQuorumHarness.sol | 11 ----------- certora/harnesses/WizardControlFirstPriority.sol | 1 + certora/harnesses/WizardFirstTry.sol | 3 ++- .../scripts/old/GovernorCountingSimple-counting.sh | 2 -- certora/scripts/verifyERC1155All.sh | 2 +- 5 files changed, 4 insertions(+), 15 deletions(-) diff --git a/certora/harnesses/GovernorPreventLateQuorumHarness.sol b/certora/harnesses/GovernorPreventLateQuorumHarness.sol index 84858c710..7cc9f5b97 100644 --- a/certora/harnesses/GovernorPreventLateQuorumHarness.sol +++ b/certora/harnesses/GovernorPreventLateQuorumHarness.sol @@ -104,17 +104,6 @@ contract GovernorPreventLateQuorumHarness is Governor, GovernorCountingSimple, G return deltaWeight; } - /* - function castVote( - uint256 proposalId, - address account, - uint8 support, - string memory reason, - bytes memory params - ) public returns(uint256) { - return _castVote(proposalId, account, support, reason, params); - } - */ function lateQuorumVoteExtension() public view virtual override returns (uint64) { return super.lateQuorumVoteExtension(); diff --git a/certora/harnesses/WizardControlFirstPriority.sol b/certora/harnesses/WizardControlFirstPriority.sol index 5ae7fe066..da9fe8581 100644 --- a/certora/harnesses/WizardControlFirstPriority.sol +++ b/certora/harnesses/WizardControlFirstPriority.sol @@ -7,6 +7,7 @@ import "../munged/governance/extensions/GovernorVotes.sol"; import "../munged/governance/extensions/GovernorVotesQuorumFraction.sol"; import "../munged/governance/extensions/GovernorTimelockControl.sol"; import "../munged/governance/extensions/GovernorProposalThreshold.sol"; +import "../munged/token/ERC20/extensions/ERC20Votes.sol"; /* Wizard options: diff --git a/certora/harnesses/WizardFirstTry.sol b/certora/harnesses/WizardFirstTry.sol index 83fece04f..4e986ed32 100644 --- a/certora/harnesses/WizardFirstTry.sol +++ b/certora/harnesses/WizardFirstTry.sol @@ -6,6 +6,7 @@ import "../munged/governance/extensions/GovernorCountingSimple.sol"; import "../munged/governance/extensions/GovernorVotes.sol"; import "../munged/governance/extensions/GovernorVotesQuorumFraction.sol"; import "../munged/governance/extensions/GovernorTimelockCompound.sol"; +import "../munged/token/ERC20/extensions/ERC20Votes.sol"; /* Wizard options: @@ -83,7 +84,7 @@ contract WizardFirstTry is Governor, GovernorCountingSimple, GovernorVotes, Gove function getVotes(address account, uint256 blockNumber) public view - override(IGovernor, GovernorVotes) + override(IGovernor, Governor) returns (uint256) { return super.getVotes(account, blockNumber); diff --git a/certora/scripts/old/GovernorCountingSimple-counting.sh b/certora/scripts/old/GovernorCountingSimple-counting.sh index 9ed8fe34c..e3b86b555 100644 --- a/certora/scripts/old/GovernorCountingSimple-counting.sh +++ b/certora/scripts/old/GovernorCountingSimple-counting.sh @@ -3,8 +3,6 @@ make -C certora munged certoraRun certora/harnesses/ERC20VotesHarness.sol certora/harnesses/GovernorBasicHarness.sol \ --verify GovernorBasicHarness:certora/specs/GovernorCountingSimple.spec \ --solc solc8.2 \ - --staging shelly/forSasha \ --optimistic_loop \ --settings -copyLoopUnroll=4 \ - --rule hasVotedCorrelation \ --msg "$1" diff --git a/certora/scripts/verifyERC1155All.sh b/certora/scripts/verifyERC1155All.sh index fbde87f24..865374543 100644 --- a/certora/scripts/verifyERC1155All.sh +++ b/certora/scripts/verifyERC1155All.sh @@ -8,4 +8,4 @@ certoraRun \ --loop_iter 3 \ --cloud \ --send_only \ - --msg "ERC1155 Burnable verification all rules" \ No newline at end of file + --msg "ERC1155 verification all rules " \ No newline at end of file