From 739b2738a1f98351b64de534ae28c2c300d001f6 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Fri, 25 Oct 2024 16:04:07 -0400 Subject: [PATCH 1/3] -- duplicate test --- .../protocol/test-sol/unit/governance/voting/Election.t.sol | 6 ------ 1 file changed, 6 deletions(-) diff --git a/packages/protocol/test-sol/unit/governance/voting/Election.t.sol b/packages/protocol/test-sol/unit/governance/voting/Election.t.sol index c500628b1b7..de5c60b62d2 100644 --- a/packages/protocol/test-sol/unit/governance/voting/Election.t.sol +++ b/packages/protocol/test-sol/unit/governance/voting/Election.t.sol @@ -2948,12 +2948,6 @@ contract ElectionTest_HasActivatablePendingVotes is ElectionTest { function test_ReturnsTrue_WhenUserHasVoted() public { assertTrue(election.hasActivatablePendingVotes(voter, group)); } - - function test_ReturnsTrue_WhenUserHasVotedOnL2() public { - _whenL2(); - - assertTrue(election.hasActivatablePendingVotes(voter, group)); - } } contract ElectionTest_HasActivatablePendingVotes_L2 is From 64de5dd912357498a24c696e2a2ed10c79c901fb Mon Sep 17 00:00:00 2001 From: Marcin Chrzanowski Date: Mon, 28 Oct 2024 14:20:02 +0100 Subject: [PATCH 2/3] Remove unnecessary comment --- packages/protocol/test-sol/unit/governance/voting/Election.t.sol | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/protocol/test-sol/unit/governance/voting/Election.t.sol b/packages/protocol/test-sol/unit/governance/voting/Election.t.sol index de5c60b62d2..04fb1b14ab4 100644 --- a/packages/protocol/test-sol/unit/governance/voting/Election.t.sol +++ b/packages/protocol/test-sol/unit/governance/voting/Election.t.sol @@ -1968,7 +1968,6 @@ contract ElectionTest_ElectValidatorsAccounts is ElectionTest_ElectValidatorsAbs } } -// reruns all the ElectionTest_ElectValidatorsAccounts with L2 turned on contract ElectionTest_ElectValidatorsAccountsL2 is ElectionTest_ElectValidatorsAccounts, TransitionToL2After From 0840c611ef677594dc4243541f24bf221960bbac Mon Sep 17 00:00:00 2001 From: Marcin Chrzanowski Date: Mon, 28 Oct 2024 14:20:14 +0100 Subject: [PATCH 3/3] Add whitespace --- packages/protocol/test-sol/unit/governance/voting/Election.t.sol | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/protocol/test-sol/unit/governance/voting/Election.t.sol b/packages/protocol/test-sol/unit/governance/voting/Election.t.sol index 04fb1b14ab4..cf23ec39262 100644 --- a/packages/protocol/test-sol/unit/governance/voting/Election.t.sol +++ b/packages/protocol/test-sol/unit/governance/voting/Election.t.sol @@ -2944,6 +2944,7 @@ contract ElectionTest_HasActivatablePendingVotes is ElectionTest { election.vote(group, value, address(0), address(0)); travelNEpoch(1); } + function test_ReturnsTrue_WhenUserHasVoted() public { assertTrue(election.hasActivatablePendingVotes(voter, group)); }