Skip to content

Commit

Permalink
Testing WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
@brickpop
brickpop committed Dec 23, 2024
1 parent 94e3e4f commit e326e74
Show file tree
Hide file tree
Showing 2 changed files with 125 additions and 19 deletions.
136 changes: 118 additions & 18 deletions test/LockManager.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,9 @@ contract LockManagerTest is AragonTest {
}

modifier givenStrictModeIsSet() {
Action[] memory _actions = new Action[](0);
proposalId = plugin.createProposal(bytes(""), _actions, 0, 0, bytes(""));

_;
}

Expand All @@ -533,7 +536,14 @@ contract LockManagerTest is AragonTest {

function test_WhenTryingToUnlock1Strict() external givenStrictModeIsSet givenDidntLockAnythingStrict {
// It Should do nothing
vm.skip(true);

(UnlockMode mode) = lockManager.settings();
assertEq(uint8(mode), uint8(UnlockMode.STRICT));

// vm.startPrank(alice);
uint256 initialBalance = lockableToken.balanceOf(alice);
lockManager.unlock();
assertEq(lockableToken.balanceOf(alice), initialBalance);
}

modifier givenLockedButDidntVoteAnywhereStrict() {
Expand All @@ -542,7 +552,14 @@ contract LockManagerTest is AragonTest {

function test_WhenTryingToUnlock2Strict() external givenStrictModeIsSet givenLockedButDidntVoteAnywhereStrict {
// It Should unlock and refund the full amount right away
vm.skip(true);

// vm.startPrank(alice);
lockableToken.approve(address(lockManager), 0.1 ether);
lockManager.lock();

uint256 initialBalance = lockableToken.balanceOf(alice);
lockManager.unlock();
assertEq(lockableToken.balanceOf(alice), initialBalance + 0.1 ether);
}

modifier givenLockedButVotedOnEndedOrExecutedProposalsStrict() {
Expand All @@ -555,7 +572,20 @@ contract LockManagerTest is AragonTest {
givenLockedButVotedOnEndedOrExecutedProposalsStrict
{
// It Should unlock and refund the full amount right away
vm.skip(true);

lockableToken.approve(address(lockManager), 0.1 ether);
lockManager.lockAndVote(proposalId);

vm.expectRevert(LockManager.LocksStillActive.selector);
lockManager.unlock();

vm.startPrank(address(plugin));
lockManager.proposalEnded(proposalId);

vm.startPrank(alice);
uint256 initialBalance = lockableToken.balanceOf(alice);
lockManager.unlock();
assertEq(lockableToken.balanceOf(alice), initialBalance + 0.1 ether);
}

modifier givenLockedAnvVotedOnCurrentlyActiveProposalsStrict() {
Expand All @@ -568,10 +598,23 @@ contract LockManagerTest is AragonTest {
givenLockedAnvVotedOnCurrentlyActiveProposalsStrict
{
// It Should revert
vm.skip(true);

// vm.startPrank(alice);
lockableToken.approve(address(lockManager), 0.1 ether);
lockManager.lockAndVote(proposalId);

vm.expectRevert(LockManager.LocksStillActive.selector);
lockManager.unlock();
}

modifier givenFlexibleModeIsSet() {
(dao, plugin, lockManager, lockableToken, underlyingToken) = builder.withTokenHolder(alice, 1 ether)
.withTokenHolder(bob, 10 ether).withTokenHolder(carol, 10 ether).withTokenHolder(david, 15 ether)
.withUnlockMode(UnlockMode.EARLY).build();

Action[] memory _actions = new Action[](0);
proposalId = plugin.createProposal(bytes(""), _actions, 0, 0, bytes(""));

_;
}

Expand All @@ -581,7 +624,11 @@ contract LockManagerTest is AragonTest {

function test_WhenTryingToUnlock1Flexible() external givenFlexibleModeIsSet givenDidntLockAnythingFlexible {
// It Should do nothing
vm.skip(true);

// vm.startPrank(alice);
uint256 initialBalance = lockableToken.balanceOf(alice);
lockManager.unlock();
assertEq(lockableToken.balanceOf(alice), initialBalance);
}

modifier givenLockedButDidntVoteAnywhereFlexible() {
Expand All @@ -594,7 +641,14 @@ contract LockManagerTest is AragonTest {
givenLockedButDidntVoteAnywhereFlexible
{
// It Should unlock and refund the full amount right away
vm.skip(true);

// vm.startPrank(alice);
lockableToken.approve(address(lockManager), 0.1 ether);
lockManager.lock();

uint256 initialBalance = lockableToken.balanceOf(alice);
lockManager.unlock();
assertEq(lockableToken.balanceOf(alice), initialBalance + 0.1 ether);
}

modifier givenLockedButVotedOnEndedOrExecutedProposalsFlexible() {
Expand All @@ -607,7 +661,17 @@ contract LockManagerTest is AragonTest {
givenLockedButVotedOnEndedOrExecutedProposalsFlexible
{
// It Should unlock and refund the full amount right away
vm.skip(true);

lockableToken.approve(address(lockManager), 0.1 ether);
lockManager.lockAndVote(proposalId);

vm.startPrank(address(plugin));
lockManager.proposalEnded(proposalId);

vm.startPrank(alice);
uint256 initialBalance = lockableToken.balanceOf(alice);
lockManager.unlock();
assertEq(lockableToken.balanceOf(alice), initialBalance + 0.1 ether);
}

modifier givenLockedAnvVotedOnCurrentlyActiveProposalsFlexible() {
Expand All @@ -621,7 +685,17 @@ contract LockManagerTest is AragonTest {
{
// It Should deallocate the existing voting power from active proposals
// It Should unlock and refund the full amount
vm.skip(true);

// vm.startPrank(alice);
lockableToken.approve(address(lockManager), 0.1 ether);
lockManager.lockAndVote(proposalId);
assertEq(plugin.usedVotingPower(proposalId, alice), 0.1 ether);

uint256 initialBalance = lockableToken.balanceOf(alice);
lockManager.unlock();

assertEq(lockableToken.balanceOf(alice), initialBalance + 0.1 ether);
assertEq(plugin.usedVotingPower(proposalId, alice), 0);
}

modifier givenAProposalHasEnded() {
Expand All @@ -643,7 +717,17 @@ contract LockManagerTest is AragonTest {
givenProposalVoterCallsUnlockNoProposalEnded
{
// It Should allow voters from that proposal to unlock right away
vm.skip(true);

lockableToken.approve(address(lockManager), 0.1 ether);
lockManager.lockAndVote(proposalId);

vm.startPrank(address(plugin));
lockManager.proposalEnded(proposalId);

vm.startPrank(alice);
uint256 initialBalance = lockableToken.balanceOf(alice);
lockManager.unlock();
assertEq(lockableToken.balanceOf(alice), initialBalance + 0.1 ether);
}

function test_WhenDefeatedProposal()
Expand All @@ -653,7 +737,16 @@ contract LockManagerTest is AragonTest {
givenProposalVoterCallsUnlockNoProposalEnded
{
// It Should allow voters from that proposal to unlock right away
vm.skip(true);

lockableToken.approve(address(lockManager), 0.1 ether);
lockManager.lockAndVote(proposalId);

vm.warp(10 days + 1);

vm.startPrank(alice);
uint256 initialBalance = lockableToken.balanceOf(alice);
lockManager.unlock();
assertEq(lockableToken.balanceOf(alice), initialBalance + 0.1 ether);
}

function test_RevertWhen_ActiveProposal()
Expand All @@ -663,7 +756,12 @@ contract LockManagerTest is AragonTest {
givenProposalVoterCallsUnlockNoProposalEnded
{
// It Should revert
vm.skip(true);

lockableToken.approve(address(lockManager), 0.1 ether);
lockManager.lockAndVote(proposalId);

vm.expectRevert(LockManager.LocksStillActive.selector);
lockManager.unlock();
}

modifier whenAfterProposalEndedIsCalled() {
Expand All @@ -680,21 +778,23 @@ contract LockManagerTest is AragonTest {
vm.skip(true);
}

function test_WhenCallingPlugin() external {
function test_WhenCallingPlugin() external view {
// It Should return the right address
vm.skip(true);

assertEq(address(lockManager.plugin()), address(plugin));
}

function test_WhenCallingToken() external {
function test_WhenCallingToken() external view {
// It Should return the right address
vm.skip(true);

assertEq(address(lockManager.token()), address(lockableToken));
}

modifier givenNoUnderlyingToken() {
_;
}

function test_WhenCallingUnderlyingTokenEmpty() external givenNoUnderlyingToken {
function test_WhenCallingUnderlyingTokenEmpty() external view givenNoUnderlyingToken {
// It Should return the token address
vm.skip(true);
}
Expand All @@ -703,9 +803,9 @@ contract LockManagerTest is AragonTest {
_;
}

function test_WhenCallingUnderlyingTokenSet() external givenUnderlyingTokenDefined {
function test_WhenCallingUnderlyingTokenSet() external view givenUnderlyingTokenDefined {
// It Should return the right address
vm.skip(true);
assertEq(address(lockManager.underlyingToken()), address(underlyingToken));
}

function test_GivenPermissions() external {
Expand Down
8 changes: 7 additions & 1 deletion test/util/DaoBuilder.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ contract DaoBuilder is Test {
bool onlyListed = true;
uint32 minApprovalRatio = 1;
uint32 minProposalDuration = 10 days;
UnlockMode unlockMode = UnlockMode.STRICT;

function withDaoOwner(address newOwner) public returns (DaoBuilder) {
owner = newOwner;
Expand Down Expand Up @@ -58,6 +59,11 @@ contract DaoBuilder is Test {
return this;
}

function withUnlockMode(UnlockMode newUnlockMode) public returns (DaoBuilder) {
unlockMode = newUnlockMode;
return this;
}

/// @dev Creates a DAO with the given orchestration settings.
/// @dev The setup is done on block/timestamp 0 and tests should be made on block/timestamp 1 or later.
function build()
Expand Down Expand Up @@ -90,7 +96,7 @@ contract DaoBuilder is Test {
{
// Plugin and helper

helper = new LockManager(dao, LockManagerSettings(UnlockMode.STRICT), lockableToken, underlyingToken);
helper = new LockManager(dao, LockManagerSettings(unlockMode), lockableToken, underlyingToken);

LockToVoteSettings memory targetContractSettings =
LockToVoteSettings({minApprovalRatio: minApprovalRatio, minProposalDuration: minProposalDuration});
Expand Down

0 comments on commit e326e74

Please sign in to comment.