Skip to content

fix: use invariant signatures instead of names in resuts #3137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gakonst merged 2 commits into from
Sep 9, 2022
Merged

fix: use invariant signatures instead of names in resuts #3137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9abb161
fix: use invariant signatures instead of names in resuts
mattsse Sep 8, 2022
c825661
update tests
mattsse Sep 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions cli/src/cmd/forge/snapshot.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,4 +503,18 @@ mod tests {
}
);
}

#[test]
fn can_parse_invariant_snapshot_entry2() {
let s = "ERC20Invariants:invariantBalanceSum() (runs: 256, calls: 3840, reverts: 2388)";
let entry = SnapshotEntry::from_str(s).unwrap();
assert_eq!(
entry,
SnapshotEntry {
contract_name: "ERC20Invariants".to_string(),
signature: "invariantBalanceSum()".to_string(),
gas_used: TestKindReport::Invariant { runs: 256, calls: 3840, reverts: 2388 }
}
);
}
}
2 changes: 1 addition & 1 deletion forge/src/runner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ impl<'a> ContractRunner<'a> {
results.into_iter().zip(functions.iter()).for_each(|(result, function)| {
match result.kind {
TestKind::Invariant(ref _cases, _) => {
test_results.insert(function.name.clone(), result);
test_results.insert(function.signature(), result);
}
_ => unreachable!(),
}
Expand Down
1 change: 1 addition & 0 deletions forge/tests/it/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ pub fn rpc_endpoints() -> RpcEndpoints {
}

/// A helper to assert the outcome of multiple tests with helpful assert messages
#[track_caller]
pub fn assert_multiple(
actuals: &BTreeMap<String, SuiteResult>,
expecteds: BTreeMap<
Expand Down
36 changes: 18 additions & 18 deletions forge/tests/it/invariant.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,54 +22,54 @@ fn test_invariant() {
BTreeMap::from([
(
"fuzz/invariant/common/InvariantInnerContract.t.sol:InvariantInnerContract",
vec![("invariantHideJesus", false, Some("jesus betrayed.".into()), None, None)],
vec![("invariantHideJesus()", false, Some("jesus betrayed.".into()), None, None)],
),
(
"fuzz/invariant/common/InvariantReentrancy.t.sol:InvariantReentrancy",
vec![("invariantNotStolen", true, None, None, None)],
vec![("invariantNotStolen()", true, None, None, None)],
),
(
"fuzz/invariant/common/InvariantTest1.t.sol:InvariantTest",
vec![("invariant_neverFalse", false, Some("false.".into()), None, None)],
vec![("invariant_neverFalse()", false, Some("false.".into()), None, None)],
),
(
"fuzz/invariant/target/ExcludeContracts.t.sol:ExcludeContracts",
vec![("invariantTrueWorld", true, None, None, None)],
vec![("invariantTrueWorld()", true, None, None, None)],
),
(
"fuzz/invariant/target/TargetContracts.t.sol:TargetContracts",
vec![("invariantTrueWorld", true, None, None, None)],
vec![("invariantTrueWorld()", true, None, None, None)],
),
(
"fuzz/invariant/target/TargetSenders.t.sol:TargetSenders",
vec![("invariantTrueWorld", false, Some("false world.".into()), None, None)],
vec![("invariantTrueWorld()", false, Some("false world.".into()), None, None)],
),
(
"fuzz/invariant/target/ExcludeSenders.t.sol:ExcludeSenders",
vec![("invariantTrueWorld", true, None, None, None)],
vec![("invariantTrueWorld()", true, None, None, None)],
),
(
"fuzz/invariant/target/TargetSelectors.t.sol:TargetSelectors",
vec![("invariantTrueWorld", true, None, None, None)],
vec![("invariantTrueWorld()", true, None, None, None)],
),
(
"fuzz/invariant/targetAbi/ExcludeArtifacts.t.sol:ExcludeArtifacts",
vec![("invariantShouldPass", true, None, None, None)],
vec![("invariantShouldPass()", true, None, None, None)],
),
(
"fuzz/invariant/targetAbi/TargetArtifacts.t.sol:TargetArtifacts",
vec![
("invariantShouldPass", true, None, None, None),
("invariantShouldFail", false, Some("false world.".into()), None, None),
("invariantShouldPass()", true, None, None, None),
("invariantShouldFail()", false, Some("false world.".into()), None, None),
],
),
(
"fuzz/invariant/targetAbi/TargetArtifactSelectors.t.sol:TargetArtifactSelectors",
vec![("invariantShouldPass", true, None, None, None)],
vec![("invariantShouldPass()", true, None, None, None)],
),
(
"fuzz/invariant/targetAbi/TargetArtifactSelectors2.t.sol:TargetArtifactSelectors2",
vec![("invariantShouldFail", false, Some("its false.".into()), None, None)],
vec![("invariantShouldFail()", false, Some("its false.".into()), None, None)],
),
]),
);
Expand All @@ -95,7 +95,7 @@ fn test_invariant_override() {
&results,
BTreeMap::from([(
"fuzz/invariant/common/InvariantReentrancy.t.sol:InvariantReentrancy",
vec![("invariantNotStolen", false, Some("stolen.".into()), None, None)],
vec![("invariantNotStolen()", false, Some("stolen.".into()), None, None)],
)]),
);
}
Expand All @@ -122,10 +122,10 @@ fn test_invariant_storage() {
BTreeMap::from([(
"fuzz/invariant/storage/InvariantStorageTest.t.sol:InvariantStorageTest",
vec![
("invariantChangeAddress", false, Some("changedAddr".into()), None, None),
("invariantChangeString", false, Some("changedStr".into()), None, None),
("invariantChangeUint", false, Some("changedUint".into()), None, None),
("invariantPush", false, Some("pushUint".into()), None, None),
("invariantChangeAddress()", false, Some("changedAddr".into()), None, None),
("invariantChangeString()", false, Some("changedStr".into()), None, None),
("invariantChangeUint()", false, Some("changedUint".into()), None, None),
("invariantPush()", false, Some("pushUint".into()), None, None),
],
)]),
);
Expand Down