Skip to content

N
nebula
Commit 2f3965fc authored by Maurelian's avatar Maurelian
Browse files
Options

test(ctb): Refactor tests to use owner management lib utils

parent e3ac8519
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 10 deletions
packages/contracts-bedrock/test/LivenessGuard.t.sol
View file @ 2f3965fc
...@@ -134,11 +134,7 @@ contract LivenessGuard_OwnerManagement_Test is LivenessGuard_TestInit { ...@@ -134,11 +134,7 @@ contract LivenessGuard_OwnerManagement_Test is LivenessGuard_TestInit {
assertGe(livenessGuard.lastLive(ownerToRemove), 0); assertGe(livenessGuard.lastLive(ownerToRemove), 0);
assertTrue(safeInstance.safe.isOwner(ownerToRemove)); assertTrue(safeInstance.safe.isOwner(ownerToRemove));
safeInstance.execTransaction({ safeInstance.removeOwner({ prevOwner: address(0), owner: ownerToRemove, threshold: 1 });
to: address(safeInstance.safe),
value: 0,
data: abi.encodeWithSelector(OwnerManager.removeOwner.selector, SafeTestLib.SENTINEL_OWNERS, ownerToRemove, 1)
});
assertFalse(safeInstance.safe.isOwner(ownerToRemove)); assertFalse(safeInstance.safe.isOwner(ownerToRemove));
assertEq(livenessGuard.lastLive(ownerToRemove), 0); assertEq(livenessGuard.lastLive(ownerToRemove), 0);
...@@ -150,11 +146,26 @@ contract LivenessGuard_OwnerManagement_Test is LivenessGuard_TestInit { ...@@ -150,11 +146,26 @@ contract LivenessGuard_OwnerManagement_Test is LivenessGuard_TestInit {
assertEq(livenessGuard.lastLive(ownerToAdd), 0); assertEq(livenessGuard.lastLive(ownerToAdd), 0);
assertFalse(safeInstance.safe.isOwner(ownerToAdd)); assertFalse(safeInstance.safe.isOwner(ownerToAdd));
safeInstance.execTransaction({ safeInstance.addOwnerWithThreshold({ owner: ownerToAdd, threshold: 1 });
to: address(safeInstance.safe),
value: 0, assertTrue(safeInstance.safe.isOwner(ownerToAdd));
data: abi.encodeWithSelector(OwnerManager.addOwnerWithThreshold.selector, ownerToAdd, 1) assertEq(livenessGuard.lastLive(ownerToAdd), block.timestamp);
}); }
/// @dev Tests that the guard correctly adds an owner to the lastLive mapping when it is added
function test_swapOwner_succeeds() external {
address ownerToRemove = safeInstance.owners[0];
assertGe(livenessGuard.lastLive(ownerToRemove), 0);
assertTrue(safeInstance.safe.isOwner(ownerToRemove));
address ownerToAdd = makeAddr("new owner");
assertEq(livenessGuard.lastLive(ownerToAdd), 0);
assertFalse(safeInstance.safe.isOwner(ownerToAdd));
safeInstance.swapOwner({ prevOwner: address(0), oldOwner: ownerToRemove, newOwner: ownerToAdd });
assertFalse(safeInstance.safe.isOwner(ownerToRemove));
assertEq(livenessGuard.lastLive(ownerToRemove), 0);
assertTrue(safeInstance.safe.isOwner(ownerToAdd)); assertTrue(safeInstance.safe.isOwner(ownerToAdd));
assertEq(livenessGuard.lastLive(ownerToAdd), block.timestamp); assertEq(livenessGuard.lastLive(ownerToAdd), block.timestamp);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment