Skip to content

Commit

Permalink
refactor: use vm.getBlockTimestamp()
Browse files Browse the repository at this point in the history
  • Loading branch information
@1kresh
1kresh committed Dec 10, 2024
1 parent e91ecc2 commit 9c9b1b4
Show file tree
Hide file tree
Showing 8 changed files with 144 additions and 144 deletions.
30 changes: 15 additions & 15 deletions test/delegator/FullRestakeDelegator.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ contract FullRestakeDelegatorTest is Test {
vm.assume(amount2 != amount3);
vm.assume(amount3 != amount4);

uint256 blockTimestamp = block.timestamp * block.timestamp / block.timestamp * block.timestamp / block.timestamp;
uint256 blockTimestamp = vm.getBlockTimestamp();
blockTimestamp = blockTimestamp + 1_720_700_948;
vm.warp(blockTimestamp);

Expand Down Expand Up @@ -503,7 +503,7 @@ contract FullRestakeDelegatorTest is Test {
vm.assume(amount2 != amount3);
vm.assume(amount3 != amount4);

uint256 blockTimestamp = block.timestamp * block.timestamp / block.timestamp * block.timestamp / block.timestamp;
uint256 blockTimestamp = vm.getBlockTimestamp();
blockTimestamp = blockTimestamp + 1_720_700_948;
vm.warp(blockTimestamp);

Expand Down Expand Up @@ -573,7 +573,7 @@ contract FullRestakeDelegatorTest is Test {
amount2 = bound(amount2, 1, type(uint256).max / 2);
vm.assume(amount3 < amount2);

uint256 blockTimestamp = block.timestamp * block.timestamp / block.timestamp * block.timestamp / block.timestamp;
uint256 blockTimestamp = vm.getBlockTimestamp();
blockTimestamp = blockTimestamp + 1_720_700_948;
vm.warp(blockTimestamp);

Expand Down Expand Up @@ -610,7 +610,7 @@ contract FullRestakeDelegatorTest is Test {
epochDuration = uint48(bound(uint256(epochDuration), 1, 100 days));
amount1 = bound(amount1, 1, type(uint256).max / 2);

uint256 blockTimestamp = block.timestamp * block.timestamp / block.timestamp * block.timestamp / block.timestamp;
uint256 blockTimestamp = vm.getBlockTimestamp();
blockTimestamp = blockTimestamp + 1_720_700_948;
vm.warp(blockTimestamp);

Expand Down Expand Up @@ -639,7 +639,7 @@ contract FullRestakeDelegatorTest is Test {

vm.assume(0 != networkLimit1);

uint256 blockTimestamp = block.timestamp * block.timestamp / block.timestamp * block.timestamp / block.timestamp;
uint256 blockTimestamp = vm.getBlockTimestamp();
blockTimestamp = blockTimestamp + 1_720_700_948;
vm.warp(blockTimestamp);

Expand Down Expand Up @@ -727,7 +727,7 @@ contract FullRestakeDelegatorTest is Test {

vm.assume(operatorNetworkLimit2 - 1 != operatorNetworkLimit3);

uint256 blockTimestamp = block.timestamp * block.timestamp / block.timestamp * block.timestamp / block.timestamp;
uint256 blockTimestamp = vm.getBlockTimestamp();
blockTimestamp = blockTimestamp + 1_720_700_948;
vm.warp(blockTimestamp);

Expand Down Expand Up @@ -923,7 +923,7 @@ contract FullRestakeDelegatorTest is Test {
slashAmount1 = bound(slashAmount1, 1, type(uint256).max);
slashAmount2 = bound(slashAmount2, 1, type(uint256).max);

uint256 blockTimestamp = block.timestamp * block.timestamp / block.timestamp * block.timestamp / block.timestamp;
uint256 blockTimestamp = vm.getBlockTimestamp();
blockTimestamp = blockTimestamp + 1_720_700_948;
vm.warp(blockTimestamp);

Expand Down Expand Up @@ -989,7 +989,7 @@ contract FullRestakeDelegatorTest is Test {
slashAmount2 = bound(slashAmount2, 1, type(uint256).max);
vm.assume(slashAmount1 < Math.min(depositAmount, Math.min(type(uint256).max, operatorNetworkLimit1)));

uint256 blockTimestamp = block.timestamp * block.timestamp / block.timestamp * block.timestamp / block.timestamp;
uint256 blockTimestamp = vm.getBlockTimestamp();
blockTimestamp = blockTimestamp + 1_720_700_948;
vm.warp(blockTimestamp);

Expand Down Expand Up @@ -1101,7 +1101,7 @@ contract FullRestakeDelegatorTest is Test {
totalGas = bound(totalGas, 1, 20_000_000);
vm.assume(slashAmount1 < Math.min(depositAmount, Math.min(type(uint256).max, operatorNetworkLimit1)));

uint256 blockTimestamp = block.timestamp * block.timestamp / block.timestamp * block.timestamp / block.timestamp;
uint256 blockTimestamp = vm.getBlockTimestamp();
blockTimestamp = blockTimestamp + 1_720_700_948;
vm.warp(blockTimestamp);

Expand Down Expand Up @@ -1262,7 +1262,7 @@ contract FullRestakeDelegatorTest is Test {
// hintStruct.num = bound(hintStruct.num, 0, 25);
// hintStruct.secondsAgo = bound(hintStruct.secondsAgo, 0, 1_720_700_948);

// uint256 blockTimestamp = block.timestamp * block.timestamp / block.timestamp * block.timestamp / block.timestamp;
// uint256 blockTimestamp = vm.getBlockTimestamp();
// blockTimestamp = blockTimestamp + 1_720_700_948;
// vm.warp(blockTimestamp);

Expand Down Expand Up @@ -1307,7 +1307,7 @@ contract FullRestakeDelegatorTest is Test {
// hintStruct.num = bound(hintStruct.num, 0, 25);
// hintStruct.secondsAgo = bound(hintStruct.secondsAgo, 0, 1_720_700_948);

// uint256 blockTimestamp = block.timestamp * block.timestamp / block.timestamp * block.timestamp / block.timestamp;
// uint256 blockTimestamp = vm.getBlockTimestamp();
// blockTimestamp = blockTimestamp + 1_720_700_948;
// vm.warp(blockTimestamp);

Expand Down Expand Up @@ -1367,7 +1367,7 @@ contract FullRestakeDelegatorTest is Test {
// uint32(bound(stakeBaseHintsUint32.operatorNetworkOptInHint, 0, 10 * hintStruct.num));
// }

// uint256 blockTimestamp = block.timestamp * block.timestamp / block.timestamp * block.timestamp / block.timestamp;
// uint256 blockTimestamp = vm.getBlockTimestamp();
// blockTimestamp = blockTimestamp + 1_720_700_948;
// vm.warp(blockTimestamp);

Expand Down Expand Up @@ -1482,7 +1482,7 @@ contract FullRestakeDelegatorTest is Test {
// uint32(bound(stakeHintsUint32.operatorNetworkLimitHint, 0, 10 * hintStruct.num));
// }

// uint256 blockTimestamp = block.timestamp * block.timestamp / block.timestamp * block.timestamp / block.timestamp;
// uint256 blockTimestamp = vm.getBlockTimestamp();
// blockTimestamp = blockTimestamp + 1_720_700_948;
// vm.warp(blockTimestamp);

Expand Down Expand Up @@ -1607,7 +1607,7 @@ contract FullRestakeDelegatorTest is Test {
// uint32(bound(stakeHintsUint32.operatorNetworkLimitHint, 0, 10 * hintStruct.num));
// }

// uint256 blockTimestamp = block.timestamp * block.timestamp / block.timestamp * block.timestamp / block.timestamp;
// uint256 blockTimestamp = vm.getBlockTimestamp();
// blockTimestamp = blockTimestamp + 1_720_700_948;
// vm.warp(blockTimestamp);

Expand Down Expand Up @@ -1737,7 +1737,7 @@ contract FullRestakeDelegatorTest is Test {
// uint32(bound(onSlashHintsUint32.hints.operatorNetworkLimitHint, 0, 10 * hintStruct.num));
// }

// uint256 blockTimestamp = block.timestamp * block.timestamp / block.timestamp * block.timestamp / block.timestamp;
// uint256 blockTimestamp = vm.getBlockTimestamp();
// blockTimestamp = blockTimestamp + 1_720_700_948;
// vm.warp(blockTimestamp);

Expand Down
30 changes: 15 additions & 15 deletions test/delegator/NetworkRestakeDelegator.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ contract NetworkRestakeDelegatorTest is Test {
vm.assume(amount2 != amount3);
vm.assume(amount3 != amount4);

uint256 blockTimestamp = block.timestamp * block.timestamp / block.timestamp * block.timestamp / block.timestamp;
uint256 blockTimestamp = vm.getBlockTimestamp();
blockTimestamp = blockTimestamp + 1_720_700_948;
vm.warp(blockTimestamp);

Expand Down Expand Up @@ -504,7 +504,7 @@ contract NetworkRestakeDelegatorTest is Test {
vm.assume(amount1 != amount3);
vm.assume(amount2 != amount3);

uint256 blockTimestamp = block.timestamp * block.timestamp / block.timestamp * block.timestamp / block.timestamp;
uint256 blockTimestamp = vm.getBlockTimestamp();
blockTimestamp = blockTimestamp + 1_720_700_948;
vm.warp(blockTimestamp);

Expand Down Expand Up @@ -723,7 +723,7 @@ contract NetworkRestakeDelegatorTest is Test {
epochDuration = uint48(bound(uint256(epochDuration), 1, 100 days));
amount1 = bound(amount1, 1, type(uint256).max / 2);

uint256 blockTimestamp = block.timestamp * block.timestamp / block.timestamp * block.timestamp / block.timestamp;
uint256 blockTimestamp = vm.getBlockTimestamp();
blockTimestamp = blockTimestamp + 1_720_700_948;
vm.warp(blockTimestamp);

Expand Down Expand Up @@ -752,7 +752,7 @@ contract NetworkRestakeDelegatorTest is Test {

vm.assume(0 != networkLimit1);

uint256 blockTimestamp = block.timestamp * block.timestamp / block.timestamp * block.timestamp / block.timestamp;
uint256 blockTimestamp = vm.getBlockTimestamp();
blockTimestamp = blockTimestamp + 1_720_700_948;
vm.warp(blockTimestamp);

Expand Down Expand Up @@ -843,7 +843,7 @@ contract NetworkRestakeDelegatorTest is Test {

vm.assume(operatorNetworkShares2 - 1 != operatorNetworkShares3);

uint256 blockTimestamp = block.timestamp * block.timestamp / block.timestamp * block.timestamp / block.timestamp;
uint256 blockTimestamp = vm.getBlockTimestamp();
blockTimestamp = blockTimestamp + 1_720_700_948;
vm.warp(blockTimestamp);

Expand Down Expand Up @@ -1042,7 +1042,7 @@ contract NetworkRestakeDelegatorTest is Test {
slashAmount1 = bound(slashAmount1, 1, type(uint256).max);
slashAmount2 = bound(slashAmount2, 1, type(uint256).max);

uint256 blockTimestamp = block.timestamp * block.timestamp / block.timestamp * block.timestamp / block.timestamp;
uint256 blockTimestamp = vm.getBlockTimestamp();
blockTimestamp = blockTimestamp + 1_720_700_948;
vm.warp(blockTimestamp);

Expand Down Expand Up @@ -1196,7 +1196,7 @@ contract NetworkRestakeDelegatorTest is Test {
slashAmount2 = bound(slashAmount2, 1, type(uint256).max);
vm.assume(slashAmount1 < Math.min(depositAmount, Math.min(type(uint256).max, operatorNetworkShares1)));

uint256 blockTimestamp = block.timestamp * block.timestamp / block.timestamp * block.timestamp / block.timestamp;
uint256 blockTimestamp = vm.getBlockTimestamp();
blockTimestamp = blockTimestamp + 1_720_700_948;
vm.warp(blockTimestamp);

Expand Down Expand Up @@ -1335,7 +1335,7 @@ contract NetworkRestakeDelegatorTest is Test {
totalGas = bound(totalGas, 1, 20_000_000);
vm.assume(slashAmount1 < Math.min(depositAmount, Math.min(type(uint256).max, operatorNetworkShares1)));

uint256 blockTimestamp = block.timestamp * block.timestamp / block.timestamp * block.timestamp / block.timestamp;
uint256 blockTimestamp = vm.getBlockTimestamp();
blockTimestamp = blockTimestamp + 1_720_700_948;
vm.warp(blockTimestamp);

Expand Down Expand Up @@ -1498,7 +1498,7 @@ contract NetworkRestakeDelegatorTest is Test {
// hintStruct.num = bound(hintStruct.num, 0, 25);
// hintStruct.secondsAgo = bound(hintStruct.secondsAgo, 0, 1_720_700_948);

// uint256 blockTimestamp = block.timestamp * block.timestamp / block.timestamp * block.timestamp / block.timestamp;
// uint256 blockTimestamp = vm.getBlockTimestamp();
// blockTimestamp = blockTimestamp + 1_720_700_948;
// vm.warp(blockTimestamp);

Expand Down Expand Up @@ -1543,7 +1543,7 @@ contract NetworkRestakeDelegatorTest is Test {
// hintStruct.num = bound(hintStruct.num, 0, 25);
// hintStruct.secondsAgo = bound(hintStruct.secondsAgo, 0, 1_720_700_948);

// uint256 blockTimestamp = block.timestamp * block.timestamp / block.timestamp * block.timestamp / block.timestamp;
// uint256 blockTimestamp = vm.getBlockTimestamp();
// blockTimestamp = blockTimestamp + 1_720_700_948;
// vm.warp(blockTimestamp);

Expand Down Expand Up @@ -1587,7 +1587,7 @@ contract NetworkRestakeDelegatorTest is Test {
// hintStruct.num = bound(hintStruct.num, 0, 25);
// hintStruct.secondsAgo = bound(hintStruct.secondsAgo, 0, 1_720_700_948);

// uint256 blockTimestamp = block.timestamp * block.timestamp / block.timestamp * block.timestamp / block.timestamp;
// uint256 blockTimestamp = vm.getBlockTimestamp();
// blockTimestamp = blockTimestamp + 1_720_700_948;
// vm.warp(blockTimestamp);

Expand Down Expand Up @@ -1647,7 +1647,7 @@ contract NetworkRestakeDelegatorTest is Test {
// uint32(bound(stakeBaseHintsUint32.operatorNetworkOptInHint, 0, 10 * hintStruct.num));
// }

// uint256 blockTimestamp = block.timestamp * block.timestamp / block.timestamp * block.timestamp / block.timestamp;
// uint256 blockTimestamp = vm.getBlockTimestamp();
// blockTimestamp = blockTimestamp + 1_720_700_948;
// vm.warp(blockTimestamp);

Expand Down Expand Up @@ -1768,7 +1768,7 @@ contract NetworkRestakeDelegatorTest is Test {
// uint32(bound(stakeHintsUint32.totalOperatorNetworkSharesHint, 0, 10 * hintStruct.num));
// }

// uint256 blockTimestamp = block.timestamp * block.timestamp / block.timestamp * block.timestamp / block.timestamp;
// uint256 blockTimestamp = vm.getBlockTimestamp();
// blockTimestamp = blockTimestamp + 1_720_700_948;
// vm.warp(blockTimestamp);

Expand Down Expand Up @@ -1900,7 +1900,7 @@ contract NetworkRestakeDelegatorTest is Test {
// uint32(bound(stakeHintsUint32.totalOperatorNetworkSharesHint, 0, 10 * hintStruct.num));
// }

// uint256 blockTimestamp = block.timestamp * block.timestamp / block.timestamp * block.timestamp / block.timestamp;
// uint256 blockTimestamp = vm.getBlockTimestamp();
// blockTimestamp = blockTimestamp + 1_720_700_948;
// vm.warp(blockTimestamp);

Expand Down Expand Up @@ -2039,7 +2039,7 @@ contract NetworkRestakeDelegatorTest is Test {
// uint32(bound(onSlashHintsUint32.hints.totalOperatorNetworkSharesHint, 0, 10 * hintStruct.num));
// }

// uint256 blockTimestamp = block.timestamp * block.timestamp / block.timestamp * block.timestamp / block.timestamp;
// uint256 blockTimestamp = vm.getBlockTimestamp();
// blockTimestamp = blockTimestamp + 1_720_700_948;
// vm.warp(blockTimestamp);

Expand Down
22 changes: 11 additions & 11 deletions test/delegator/OperatorSpecificDelegator.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ contract OperatorSpecificDelegatorTest is Test {
vm.assume(amount2 != amount3);
vm.assume(amount3 != amount4);

uint256 blockTimestamp = block.timestamp * block.timestamp / block.timestamp * block.timestamp / block.timestamp;
uint256 blockTimestamp = vm.getBlockTimestamp();
blockTimestamp = blockTimestamp + 1_720_700_948;
vm.warp(blockTimestamp);

Expand Down Expand Up @@ -454,7 +454,7 @@ contract OperatorSpecificDelegatorTest is Test {

vm.assume(0 != networkLimit1);

uint256 blockTimestamp = block.timestamp * block.timestamp / block.timestamp * block.timestamp / block.timestamp;
uint256 blockTimestamp = vm.getBlockTimestamp();
blockTimestamp = blockTimestamp + 1_720_700_948;
vm.warp(blockTimestamp);

Expand Down Expand Up @@ -541,7 +541,7 @@ contract OperatorSpecificDelegatorTest is Test {

vm.assume(networkLimit1 != networkLimit2);

uint256 blockTimestamp = block.timestamp * block.timestamp / block.timestamp * block.timestamp / block.timestamp;
uint256 blockTimestamp = vm.getBlockTimestamp();
blockTimestamp = blockTimestamp + 1_720_700_948;
vm.warp(blockTimestamp);

Expand Down Expand Up @@ -633,7 +633,7 @@ contract OperatorSpecificDelegatorTest is Test {
slashAmount1 = bound(slashAmount1, 1, type(uint256).max);
slashAmount2 = bound(slashAmount2, 1, type(uint256).max);

uint256 blockTimestamp = block.timestamp * block.timestamp / block.timestamp * block.timestamp / block.timestamp;
uint256 blockTimestamp = vm.getBlockTimestamp();
blockTimestamp = blockTimestamp + 1_720_700_948;
vm.warp(blockTimestamp);

Expand Down Expand Up @@ -708,7 +708,7 @@ contract OperatorSpecificDelegatorTest is Test {
slashAmount2 = bound(slashAmount2, 1, type(uint256).max);
vm.assume(slashAmount1 < Math.min(depositAmount, type(uint256).max));

uint256 blockTimestamp = block.timestamp * block.timestamp / block.timestamp * block.timestamp / block.timestamp;
uint256 blockTimestamp = vm.getBlockTimestamp();
blockTimestamp = blockTimestamp + 1_720_700_948;
vm.warp(blockTimestamp);

Expand Down Expand Up @@ -800,7 +800,7 @@ contract OperatorSpecificDelegatorTest is Test {
totalGas = bound(totalGas, 1, 20_000_000);
vm.assume(slashAmount1 < Math.min(depositAmount, type(uint256).max));

uint256 blockTimestamp = block.timestamp * block.timestamp / block.timestamp * block.timestamp / block.timestamp;
uint256 blockTimestamp = vm.getBlockTimestamp();
blockTimestamp = blockTimestamp + 1_720_700_948;
vm.warp(blockTimestamp);

Expand Down Expand Up @@ -947,7 +947,7 @@ contract OperatorSpecificDelegatorTest is Test {
// hintStruct.num = bound(hintStruct.num, 0, 25);
// hintStruct.secondsAgo = bound(hintStruct.secondsAgo, 0, 1_720_700_948);

// uint256 blockTimestamp = block.timestamp * block.timestamp / block.timestamp * block.timestamp / block.timestamp;
// uint256 blockTimestamp = vm.getBlockTimestamp();
// blockTimestamp = blockTimestamp + 1_720_700_948;
// vm.warp(blockTimestamp);

Expand Down Expand Up @@ -1008,7 +1008,7 @@ contract OperatorSpecificDelegatorTest is Test {
// uint32(bound(stakeBaseHintsUint32.operatorNetworkOptInHint, 0, 10 * hintStruct.num));
// }

// uint256 blockTimestamp = block.timestamp * block.timestamp / block.timestamp * block.timestamp / block.timestamp;
// uint256 blockTimestamp = vm.getBlockTimestamp();
// blockTimestamp = blockTimestamp + 1_720_700_948;
// vm.warp(blockTimestamp);

Expand Down Expand Up @@ -1117,7 +1117,7 @@ contract OperatorSpecificDelegatorTest is Test {
// stakeHintsUint32.networkLimitHint = uint32(bound(stakeHintsUint32.networkLimitHint, 0, 10 * hintStruct.num));
// }

// uint256 blockTimestamp = block.timestamp * block.timestamp / block.timestamp * block.timestamp / block.timestamp;
// uint256 blockTimestamp = vm.getBlockTimestamp();
// blockTimestamp = blockTimestamp + 1_720_700_948;
// vm.warp(blockTimestamp);

Expand Down Expand Up @@ -1235,7 +1235,7 @@ contract OperatorSpecificDelegatorTest is Test {
// stakeHintsUint32.networkLimitHint = uint32(bound(stakeHintsUint32.networkLimitHint, 0, 10 * hintStruct.num));
// }

// uint256 blockTimestamp = block.timestamp * block.timestamp / block.timestamp * block.timestamp / block.timestamp;
// uint256 blockTimestamp = vm.getBlockTimestamp();
// blockTimestamp = blockTimestamp + 1_720_700_948;
// vm.warp(blockTimestamp);

Expand Down Expand Up @@ -1360,7 +1360,7 @@ contract OperatorSpecificDelegatorTest is Test {
// uint32(bound(onSlashHintsUint32.hints.networkLimitHint, 0, 10 * hintStruct.num));
// }

// uint256 blockTimestamp = block.timestamp * block.timestamp / block.timestamp * block.timestamp / block.timestamp;
// uint256 blockTimestamp = vm.getBlockTimestamp();
// blockTimestamp = blockTimestamp + 1_720_700_948;
// vm.warp(blockTimestamp);

Expand Down
Loading

0 comments on commit 9c9b1b4

Please sign in to comment.