From 627ace93b467b0a0ae1007309dfbaf20e1ff0656 Mon Sep 17 00:00:00 2001 From: Keating Date: Mon, 18 Sep 2023 19:49:18 -0400 Subject: [PATCH] Fix ci --- src/WormholeL1VotePool.sol | 2 +- test/WormholeL1VotePool.t.sol | 1 - test/WormholeL2VoteAggregator.t.sol | 8 ++++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/WormholeL1VotePool.sol b/src/WormholeL1VotePool.sol index 31027a71..6f3121a2 100644 --- a/src/WormholeL1VotePool.sol +++ b/src/WormholeL1VotePool.sol @@ -31,8 +31,8 @@ contract WormholeL1VotePool is L1VotePool { _castVote( proposalId, ProposalVote( - forVotes - existingProposalVote.forVotes, againstVotes - existingProposalVote.againstVotes, + forVotes - existingProposalVote.forVotes, abstainVotes - existingProposalVote.abstainVotes ) ); diff --git a/test/WormholeL1VotePool.t.sol b/test/WormholeL1VotePool.t.sol index 869ac9b2..f9c7ba6c 100644 --- a/test/WormholeL1VotePool.t.sol +++ b/test/WormholeL1VotePool.t.sol @@ -203,7 +203,6 @@ contract _ReceiveCastVoteWormholeMessages is L1VotePoolTest { vm.selectFork(targetFork); (uint128 l1Against, uint128 l1For, uint128 l1Abstain) = l1VotePool.proposalVotes(_proposalId); - l1VotePool.proposalVotes(_proposalId); assertEq(l1Against, _l2Against, "Against value was not bridged correctly"); assertEq(l1For, _l2For, "For value was not bridged correctly"); diff --git a/test/WormholeL2VoteAggregator.t.sol b/test/WormholeL2VoteAggregator.t.sol index 3e39a44c..ae81cb18 100644 --- a/test/WormholeL2VoteAggregator.t.sol +++ b/test/WormholeL2VoteAggregator.t.sol @@ -162,7 +162,7 @@ contract Constructor is L2VoteAggregatorTest { contract CastVote is L2VoteAggregatorTest { function testFuzz_RevertWhen_BeforeProposalStart(uint96 _amount, uint8 _support) public { vm.assume(_support < 3); - L2VoteAggregator.VoteType _voteType = L2VoteAggregator.VoteType(_support); + L2VoteAggregator.VoteType _voteType = L2VoteAggregator.VoteType(_support); l2Erc20.mint(address(this), _amount); @@ -179,7 +179,7 @@ contract CastVote is L2VoteAggregatorTest { ) public { vm.assume(_amount != 0); vm.assume(_support < 3); - L2VoteAggregator.VoteType _voteType = L2VoteAggregator.VoteType(_support); + L2VoteAggregator.VoteType _voteType = L2VoteAggregator.VoteType(_support); _proposalDuration = uint64( bound(_proposalDuration, l2VoteAggregator.CAST_VOTE_WINDOW(), type(uint64).max - block.number) @@ -202,7 +202,7 @@ contract CastVote is L2VoteAggregatorTest { function testFuzz_RevertWhen_VoterHasAlreadyVoted(uint96 _amount, uint8 _support) public { vm.assume(_amount != 0); vm.assume(_support < 3); - L2VoteAggregator.VoteType _voteType = L2VoteAggregator.VoteType(_support); + L2VoteAggregator.VoteType _voteType = L2VoteAggregator.VoteType(_support); l2Erc20.mint(address(this), _amount); @@ -219,7 +219,7 @@ contract CastVote is L2VoteAggregatorTest { function testFuzz_RevertWhen_VoterHasNoWeight(uint96 _amount, uint8 _support) public { vm.assume(_amount != 0); vm.assume(_support < 3); - L2VoteAggregator.VoteType _voteType = L2VoteAggregator.VoteType(_support); + L2VoteAggregator.VoteType _voteType = L2VoteAggregator.VoteType(_support); L2GovernorMetadata.Proposal memory l2Proposal = l2VoteAggregator.GOVERNOR_METADATA().getProposal(1);