Skip to content

Commit e60144e

Browse files
fix: re-add fail(string) (#697)
Fixes #583. Co-authored-by: zerosnacks <[email protected]>
1 parent 349b909 commit e60144e

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

src/StdAssertions.sol

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,28 @@ abstract contract StdAssertions {
3333
event log_named_array(string key, int256[] val);
3434
event log_named_array(string key, address[] val);
3535

36+
bytes32 private constant FAILED_SLOT = bytes32("failed");
37+
3638
bool private _failed;
3739

3840
function failed() public view returns (bool) {
3941
if (_failed) {
40-
return _failed;
42+
return true;
4143
} else {
42-
return vm.load(address(vm), bytes32("failed")) != bytes32(0);
44+
return vm.load(address(vm), FAILED_SLOT) != bytes32(0);
4345
}
4446
}
4547

4648
function fail() internal virtual {
47-
vm.store(address(vm), bytes32("failed"), bytes32(uint256(1)));
49+
vm.store(address(vm), FAILED_SLOT, bytes32(uint256(1)));
4850
_failed = true;
4951
}
5052

53+
function fail(string memory message) internal virtual {
54+
fail();
55+
vm.assertTrue(false, message);
56+
}
57+
5158
function assertTrue(bool data) internal pure virtual {
5259
if (!data) {
5360
vm.assertTrue(data);

0 commit comments

Comments
 (0)