diff --git a/test/integration/adjust-rate-per-second/adjustRatePerSecond.t.sol b/test/integration/adjust-rate-per-second/adjustRatePerSecond.t.sol index 5ca7deaa..bba3c90e 100644 --- a/test/integration/adjust-rate-per-second/adjustRatePerSecond.t.sol +++ b/test/integration/adjust-rate-per-second/adjustRatePerSecond.t.sol @@ -72,7 +72,7 @@ contract AdjustRatePerSecond_Integration_Test is Integration_Test { givenNotNull givenNotCanceled whenCallerAuthorized - whenRatePerSecondNonZero + whenRatePerSecondIsNotZero { vm.expectRevert( abi.encodeWithSelector(Errors.SablierV2OpenEnded_RatePerSecondNotDifferent.selector, RATE_PER_SECOND) @@ -86,7 +86,7 @@ contract AdjustRatePerSecond_Integration_Test is Integration_Test { givenNotNull givenNotCanceled whenCallerAuthorized - whenRatePerSecondNonZero + whenRatePerSecondIsNotZero whenRatePerSecondNotDifferent { vm.warp({ newTimestamp: WARP_ONE_MONTH }); diff --git a/test/integration/create/create.t.sol b/test/integration/create/create.t.sol index 1ea68d1a..b67a9a10 100644 --- a/test/integration/create/create.t.sol +++ b/test/integration/create/create.t.sol @@ -33,7 +33,7 @@ contract Create_Integration_Test is Integration_Test { }); } - function test_RevertWhen_RecipientZeroAddress() external whenNotDelegateCalled whenSenderNonZeroAddress { + function test_RevertWhen_RecipientZeroAddress() external whenNotDelegateCalled whenSenderIsNotZeroAddress { vm.expectRevert(abi.encodeWithSelector(IERC721Errors.ERC721InvalidReceiver.selector, address(0))); openEnded.create({ sender: users.sender, @@ -47,7 +47,7 @@ contract Create_Integration_Test is Integration_Test { function test_RevertWhen_ratePerSecondZero() external whenNotDelegateCalled - whenSenderNonZeroAddress + whenSenderIsNotZeroAddress whenRecipientNonZeroAddress { vm.expectRevert(Errors.SablierV2OpenEnded_RatePerSecondZero.selector); @@ -63,9 +63,9 @@ contract Create_Integration_Test is Integration_Test { function test_RevertWhen_AssetNotContract() external whenNotDelegateCalled - whenSenderNonZeroAddress + whenSenderIsNotZeroAddress whenRecipientNonZeroAddress - whenRatePerSecondNonZero + whenRatePerSecondIsNotZero { address nonContract = address(8128); vm.expectRevert( @@ -83,9 +83,9 @@ contract Create_Integration_Test is Integration_Test { function test_Create() external whenNotDelegateCalled - whenSenderNonZeroAddress + whenSenderIsNotZeroAddress whenRecipientNonZeroAddress - whenRatePerSecondNonZero + whenRatePerSecondIsNotZero whenAssetContract { uint256 expectedStreamId = openEnded.nextStreamId(); diff --git a/test/integration/restart-stream/restartStream.t.sol b/test/integration/restart-stream/restartStream.t.sol index 37fa9d67..52741c42 100644 --- a/test/integration/restart-stream/restartStream.t.sol +++ b/test/integration/restart-stream/restartStream.t.sol @@ -74,7 +74,7 @@ contract RestartStream_Integration_Test is Integration_Test { givenNotNull givenCanceled whenCallerAuthorized - whenRatePerSecondNonZero + whenRatePerSecondIsNotZero { vm.expectEmit({ emitter: address(openEnded) }); emit RestartOpenEndedStream({ diff --git a/test/utils/Modifiers.sol b/test/utils/Modifiers.sol index d68aff9c..175ffe1c 100644 --- a/test/utils/Modifiers.sol +++ b/test/utils/Modifiers.sol @@ -50,10 +50,6 @@ abstract contract Modifiers { _; } - modifier whenRatePerSecondNonZero() { - _; - } - modifier whenRatePerSecondIsNotZero() { _; } @@ -106,10 +102,6 @@ abstract contract Modifiers { _; } - modifier whenSenderNonZeroAddress() { - _; - } - /*////////////////////////////////////////////////////////////////////////// DEPOSIT //////////////////////////////////////////////////////////////////////////*/