Clippy and more tests

Author: grandizzy

crates/config/src/lib.rs

@@ -4433,6 +4433,7 @@ mod tests {
                     runs: 512,
                     depth: 10,
                     failure_persist_dir: Some(PathBuf::from("cache/invariant")),
+                    corpus_dir: Some(PathBuf::from("cache/invariant/corpus"),),
                     ..Default::default()
                 }
             );

crates/evm/evm/src/executors/invariant/mod.rs

@@ -348,7 +348,7 @@ impl Corpus {
             let one = &self.corpus[idx1];
             let two = &self.corpus[idx2];
             let mut new_seq = vec![];
-            // TOOD rounds of mutations on elements?
+            // TODO rounds of mutations on elements?
             match rng.gen_range(0..3) {
                 // TODO expose config and add tests
                 // splice
@@ -359,13 +359,14 @@ impl Corpus {
                     let start2 = rng.gen_range(0..two.len());
                     let end2 = rng.gen_range(start2..two.len());
 
-                    for i in start1..end1 {
-                        new_seq.push(one[i].clone());
+                    for tx in one.iter().take(end1).skip(start1) {
+                        new_seq.push(tx.clone());
                     }
 
-                    for i in start2..end2 {
-                        new_seq.push(two[i].clone());
+                    for tx in two.iter().take(end2).skip(start2) {
+                        new_seq.push(tx.clone());
                     }
+
                     if !new_seq.is_empty() {
                         return new_seq;
                     }
@@ -641,7 +642,7 @@ impl<'a> InvariantExecutor<'a> {
                 // Generates the next call from the run using the recently updated
                 // dictionary if initial seq isn't `depth` long.
                 if discarded || (current_run.depth as usize > initial_seq.len().saturating_sub(1)) {
-                    // TOOD rng.rand_ratio(X) to occassionally intermix new txs
+                    // TODO rng.rand_ratio(X) to occasionally intermix new txs
                     current_run.inputs.push(
                         generator
                             .new_tree(&mut invariant_test.execution_data.borrow_mut().branch_runner)

crates/forge/tests/cli/config.rs

@@ -84,12 +84,14 @@ forgetest!(can_extract_config_values, |prj, cmd| {
             seed: Some(U256::from(1000)),
             failure_persist_dir: Some("test-cache/fuzz".into()),
             failure_persist_file: Some("failures".to_string()),
+            corpus_dir: Some("cache/fuzz/corpus".into()),
             show_logs: false,
             ..Default::default()
         },
         invariant: InvariantConfig {
             runs: 256,
             failure_persist_dir: Some("test-cache/fuzz".into()),
+            corpus_dir: Some("cache/invariant/corpus".into()),
             ..Default::default()
         },
         ffi: true,
@@ -1080,6 +1082,7 @@ include_push_bytes = true
 max_fuzz_dictionary_addresses = 15728640
 max_fuzz_dictionary_values = 6553600
 gas_report_samples = 256
+corpus_dir = "cache/fuzz/corpus"
 failure_persist_dir = "cache/fuzz"
 failure_persist_file = "failures"
 show_logs = false
@@ -1097,6 +1100,7 @@ max_fuzz_dictionary_values = 6553600
 shrink_run_limit = 5000
 max_assume_rejects = 65536
 gas_report_samples = 256
+corpus_dir = "cache/invariant/corpus"
 failure_persist_dir = "cache/invariant"
 show_metrics = false
 show_solidity = false
@@ -1184,6 +1188,7 @@ exclude = []
     "max_fuzz_dictionary_addresses": 15728640,
     "max_fuzz_dictionary_values": 6553600,
     "gas_report_samples": 256,
+    "corpus_dir": "cache/fuzz/corpus",
     "failure_persist_dir": "cache/fuzz",
     "failure_persist_file": "failures",
     "show_logs": false,
@@ -1202,6 +1207,7 @@ exclude = []
     "shrink_run_limit": 5000,
     "max_assume_rejects": 65536,
     "gas_report_samples": 256,
+    "corpus_dir": "cache/invariant/corpus",
     "failure_persist_dir": "cache/invariant",
     "show_metrics": false,
     "timeout": null,

crates/forge/tests/it/invariant.rs

@@ -1113,10 +1113,10 @@ Failing tests:
 Encountered 1 failing test in test/InvariantSequenceLenTest.t.sol:InvariantSequenceLenTest
 [FAIL: revert: invariant increment failure]
 	[Sequence] (original: 4, shrunk: 4)
-		sender=0x0000000000000000000000000000000000000a85 addr=[src/Counter.sol:Counter]0x5615dEB798BB3E4dFa0139dFa1b3D433Cc23b72f calldata=increment() args=[]
-		sender=0x0000000000000000000000000000000000000a85 addr=[src/Counter.sol:Counter]0x5615dEB798BB3E4dFa0139dFa1b3D433Cc23b72f calldata=increment() args=[]
-		sender=0x0000000000000000000000000000000000000106 addr=[src/Counter.sol:Counter]0x5615dEB798BB3E4dFa0139dFa1b3D433Cc23b72f calldata=increment() args=[]
-		sender=0x00000000000000000000000000000000000009B1 addr=[src/Counter.sol:Counter]0x5615dEB798BB3E4dFa0139dFa1b3D433Cc23b72f calldata=setNumber(uint256) args=[996881781832960761274744263729582347 [9.968e35]]
+		sender=[..] addr=[src/Counter.sol:Counter]0x5615dEB798BB3E4dFa0139dFa1b3D433Cc23b72f calldata=increment() args=[]
+		sender=[..] addr=[src/Counter.sol:Counter]0x5615dEB798BB3E4dFa0139dFa1b3D433Cc23b72f calldata=increment() args=[]
+		sender=[..] addr=[src/Counter.sol:Counter]0x5615dEB798BB3E4dFa0139dFa1b3D433Cc23b72f calldata=increment() args=[]
+		sender=[..] addr=[src/Counter.sol:Counter]0x5615dEB798BB3E4dFa0139dFa1b3D433Cc23b72f calldata=setNumber(uint256) args=[996881781832960761274744263729582347 [9.968e35]]
  invariant_increment() (runs: 0, calls: 0, reverts: 0)
 
 Encountered a total of 1 failing tests, 0 tests succeeded
@@ -1136,13 +1136,13 @@ Failing tests:
 Encountered 1 failing test in test/InvariantSequenceLenTest.t.sol:InvariantSequenceLenTest
 [FAIL: revert: invariant increment failure]
 	[Sequence] (original: 4, shrunk: 4)
-		vm.prank(0x0000000000000000000000000000000000000a85);
+		vm.prank([..]);
 		Counter(0x5615dEB798BB3E4dFa0139dFa1b3D433Cc23b72f).increment();
-		vm.prank(0x0000000000000000000000000000000000000a85);
+		vm.prank([..]);
 		Counter(0x5615dEB798BB3E4dFa0139dFa1b3D433Cc23b72f).increment();
-		vm.prank(0x0000000000000000000000000000000000000106);
+		vm.prank([..]);
 		Counter(0x5615dEB798BB3E4dFa0139dFa1b3D433Cc23b72f).increment();
-		vm.prank(0x00000000000000000000000000000000000009B1);
+		vm.prank([..]);
 		Counter(0x5615dEB798BB3E4dFa0139dFa1b3D433Cc23b72f).setNumber(996881781832960761274744263729582347);
  invariant_increment() (runs: 0, calls: 0, reverts: 0)