get rid of the Wrapping wrapper.

Author: raulk

testing/calibration/contract/fil-gas-calibration-actor/src/lib.rs

@@ -1,5 +1,3 @@
-use std::num::Wrapping;
-
 // Copyright 2021-2023 Protocol Labs
 // SPDX-License-Identifier: Apache-2.0, MIT
 use anyhow::{anyhow, Result};
@@ -348,12 +346,12 @@ fn random_ascii_string(n: usize, seed: u64) -> String {
 /// Knuth's quick and dirty random number generator.
 /// https://en.wikipedia.org/wiki/Linear_congruential_generator
 fn lcg64(initial_seed: u64) -> impl Iterator<Item = u64> {
-    let a = 6364136223846793005;
-    let c = 1442695040888963407;
-    let mut seed = Wrapping(initial_seed);
+    let a = 6364136223846793005 as u64;
+    let c = 1442695040888963407 as u64;
+    let mut seed = initial_seed;
     std::iter::repeat_with(move || {
-        seed = Wrapping(a) * seed + Wrapping(c);
-        seed.0
+        seed = a.wrapping_mul(seed).wrapping_add(c);
+        seed
     })
 }
 

testing/calibration/src/bin/on_event_evm_shapes.rs

@@ -43,7 +43,7 @@ fn main() {
             // Estimated length of the CBOR payload (confirmed with observations)
             // 1 is the list header; 5 per entry CBOR overhead + flags.
             let len = 1
-                + (entry_count - 1 * value_size)
+                + ((entry_count - 1) * value_size)
                 + last_entry_value_size
                 + entry_count * key_size
                 + entry_count * 5;
@@ -61,13 +61,4 @@ fn main() {
             };
         }
     }
-
-    for (obs, name) in vec![(validate_obs, CHARGE_VALIDATE), (accept_obs, CHARGE_ACCEPT)].iter() {
-        let regression = obs
-            .group_by(|a, b| a.label == b.label)
-            .map(|g| least_squares(g[0].label.to_owned(), g, 0))
-            .collect::<Vec<_>>();
-
-        export(name, obs, &regression).unwrap();
-    }
 }