Skip to content

Commit 1548edc

Browse files
authored
Bugfix CryticAsserts log emission (#8)
* Bugfix CryticAsserts log emission * chore: forge fmt * chore: slither * chore: slither
1 parent ff089ff commit 1548edc

File tree

2 files changed

+31
-20
lines changed

2 files changed

+31
-20
lines changed

src/CryticAsserts.sol

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,33 +7,45 @@ contract CryticAsserts is Asserts {
77
event Log(string);
88

99
function gt(uint256 a, uint256 b, string memory reason) internal virtual override {
10-
emit Log(reason);
11-
assert(a > b);
10+
if (!(a > b)) {
11+
emit Log(reason);
12+
assert(false);
13+
}
1214
}
1315

1416
function gte(uint256 a, uint256 b, string memory reason) internal virtual override {
15-
emit Log(reason);
16-
assert(a >= b);
17+
if (!(a >= b)) {
18+
emit Log(reason);
19+
assert(false);
20+
}
1721
}
1822

1923
function lt(uint256 a, uint256 b, string memory reason) internal virtual override {
20-
emit Log(reason);
21-
assert(a < b);
24+
if (!(a < b)) {
25+
emit Log(reason);
26+
assert(false);
27+
}
2228
}
2329

2430
function lte(uint256 a, uint256 b, string memory reason) internal virtual override {
25-
emit Log(reason);
26-
assert(a <= b);
31+
if (!(a <= b)) {
32+
emit Log(reason);
33+
assert(false);
34+
}
2735
}
2836

2937
function eq(uint256 a, uint256 b, string memory reason) internal virtual override {
30-
emit Log(reason);
31-
assert(a == b);
38+
if (!(a == b)) {
39+
emit Log(reason);
40+
assert(false);
41+
}
3242
}
3343

3444
function t(bool b, string memory reason) internal virtual override {
35-
emit Log(reason);
36-
assert(b);
45+
if (!b) {
46+
emit Log(reason);
47+
assert(false);
48+
}
3749
}
3850

3951
function between(uint256 value, uint256 low, uint256 high) internal virtual override returns (uint256) {

src/Hevm.sol

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
// SPDX-License-Identifier: Unlicense
1+
// SPDX-License-Identifier: MIT
22
pragma solidity ^0.8.0;
33

4+
// slither-disable-start shadowing-local
5+
46
interface IHevm {
57
// Set block.timestamp to newTimestamp
68
function warp(uint256 newTimestamp) external;
@@ -22,18 +24,13 @@ interface IHevm {
2224
function store(address where, bytes32 slot, bytes32 value) external;
2325

2426
// Signs data (privateKey, digest) => (r, v, s)
25-
function sign(
26-
uint256 privateKey,
27-
bytes32 digest
28-
) external returns (uint8 r, bytes32 v, bytes32 s);
27+
function sign(uint256 privateKey, bytes32 digest) external returns (uint8 r, bytes32 v, bytes32 s);
2928

3029
// Gets address for a given private key
3130
function addr(uint256 privateKey) external returns (address addr);
3231

3332
// Performs a foreign function call via terminal
34-
function ffi(
35-
string[] calldata inputs
36-
) external returns (bytes memory result);
33+
function ffi(string[] calldata inputs) external returns (bytes memory result);
3734

3835
// Performs the next smart contract call with specified `msg.sender`
3936
function prank(address newSender) external;
@@ -52,3 +49,5 @@ interface IHevm {
5249
}
5350

5451
IHevm constant vm = IHevm(0x7109709ECfa91a80626fF3989D68f67F5b1DD12D);
52+
53+
// slither-disable-end shadowing-local

0 commit comments

Comments
 (0)