refactor: tidy up

Signed-off-by: Stevan A <stevana@users.noreply.github.com>

Author: stevana

simulation/amaru-sim/src/simulator/simulate.rs

@@ -290,7 +290,8 @@ pub fn simulate<Msg, F>(
     for test_number in 1..=config.number_of_tests {
         let entries: Vec<Reverse<Entry<Msg>>> = generator(&mut rng);
 
-        match run_test(config.number_of_nodes, &spawn, &property)(&entries) {
+        let test = run_test(config.number_of_nodes, &spawn, &property);
+        match test(&entries) {
             (history, Err(reason)) => {
                 if config.disable_shrinking {
                     let number_of_shrinks = 0;
@@ -304,11 +305,8 @@ pub fn simulate<Msg, F>(
                         reason,
                     );
                 } else {
-                    let (shrunk_entries, (shrunk_history, result), number_of_shrinks) = shrink(
-                        run_test(config.number_of_nodes, &spawn, &property),
-                        entries,
-                        |result| result.1 == Err(reason.clone()),
-                    );
+                    let (shrunk_entries, (shrunk_history, result), number_of_shrinks) =
+                        shrink(test, entries, |result| result.1 == Err(reason.clone()));
                     assert_eq!(Err(reason.clone()), result);
                     display_failure(
                         test_number,

simulation/amaru-sim/tests/simulation.rs

@@ -24,11 +24,11 @@ fn run_simulator() {
             .ok()
             .and_then(|v| v.parse::<u8>().ok())
             .or(Some(2)),
-        disable_shrinking: std::env::var("AMARU_DISABLE_SHRINKING").map_or(false, |v| v == "1"),
+        disable_shrinking: std::env::var("AMARU_DISABLE_SHRINKING").is_ok_and(|v| v == "1"),
         seed: std::env::var("AMARU_TEST_SEED")
             .ok()
             .and_then(|s| s.parse().ok()),
-        persist_on_success: std::env::var("AMARU_PERSIST_ON_SUCCESS").map_or(false, |v| v == "1"),
+        persist_on_success: std::env::var("AMARU_PERSIST_ON_SUCCESS").is_ok_and(|v| v == "1"),
     };
 
     tracing_subscriber::fmt()