chore: migrate v3 conformance tests to rust 2024 (#2171)

Author: Stebalien

testing/conformance/Cargo.toml

@@ -3,7 +3,7 @@ name = "fvm_conformance_tests"
 description = "Filecoin Virtual Machine conformance tests"
 version = "0.1.0"
 authors = ["ChainSafe Systems <[email protected]>", "Protocol Labs", "Filecoin Core Devs"]
-edition = "2021"
+edition.workspace = true
 exclude = ["/test-vectors"]
 publish = false
 repository = "https://github.com/filecoin-project/ref-fvm"

testing/conformance/benches/bench_conformance.rs

@@ -18,7 +18,7 @@ use walkdir::WalkDir;
 
 mod bench_drivers;
 
-use crate::bench_drivers::{bench_vector_file, CheckStrength};
+use crate::bench_drivers::{CheckStrength, bench_vector_file};
 
 /// Either grabs an environment variable called VECTOR and benches that test vector using criterion, or runs all of them in sequence. Displays output for results of benchmarking.
 fn bench_conformance(c: &mut Criterion) {

testing/conformance/benches/bench_conformance_overhead.rs

@@ -18,7 +18,7 @@ use num_traits::Zero;
 use walkdir::WalkDir;
 
 mod bench_drivers;
-use crate::bench_drivers::{bench_vector_file, CheckStrength};
+use crate::bench_drivers::{CheckStrength, bench_vector_file};
 
 /// benches only machine setup, no messages get sent. This is basically overhead of the benchmarks themselves.
 fn bench_init_only(

testing/conformance/benches/bench_drivers.rs

@@ -145,7 +145,11 @@ pub fn bench_vector_file(
                 engines,
             );
         } else {
-            return Err(anyhow::anyhow!("a test failed, get the tests passing/running before running benchmarks in {:?} mode: {}", check_strength, name));
+            return Err(anyhow::anyhow!(
+                "a test failed, get the tests passing/running before running benchmarks in {:?} mode: {}",
+                check_strength,
+                name
+            ));
         };
     }
     Ok(())

testing/conformance/src/cidjson.rs

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use cid::Cid;
-use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
+use serde::{Deserialize, Deserializer, Serialize, Serializer, de};
 
 /// Wrapper for serializing and deserializing a Cid from JSON.
 #[derive(Deserialize, Serialize, Clone, Debug)]

testing/conformance/src/driver.rs

@@ -3,7 +3,7 @@
 use std::fmt;
 use std::time::Instant;
 
-use anyhow::{anyhow, Result};
+use anyhow::{Result, anyhow};
 use cid::Cid;
 use fmt::Display;
 use fvm::engine::MultiEngine;
@@ -12,7 +12,7 @@ use fvm::kernel::Context;
 use fvm::machine::Machine;
 use fvm::state_tree::{ActorState, StateTree};
 use fvm_ipld_blockstore::MemoryBlockstore;
-use fvm_ipld_encoding::{from_slice, CborStore};
+use fvm_ipld_encoding::{CborStore, from_slice};
 use fvm_shared::address::Protocol;
 use fvm_shared::crypto::signature::SECP_SIG_LEN;
 use fvm_shared::message::Message;
@@ -286,7 +286,7 @@ pub fn run_variant(
             return Ok(VariantResult::Failed {
                 id,
                 reason: anyhow!("machine poisoned"),
-            })
+            });
         }
     };
     if check_correctness {

testing/conformance/src/tracing.rs

@@ -1,6 +1,6 @@
 // Copyright 2021-2023 Protocol Labs
 // SPDX-License-Identifier: Apache-2.0, MIT
-use std::fs::{create_dir_all, File};
+use std::fs::{File, create_dir_all};
 use std::io::{Result as IoResult, Write};
 use std::ops::DerefMut;
 use std::path::PathBuf;

testing/conformance/src/vector.rs

@@ -2,7 +2,7 @@
 // Copyright 2019-2022 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
-use anyhow::{anyhow, Context as _};
+use anyhow::{Context as _, anyhow};
 use cid::Cid;
 use flate2::bufread::GzDecoder;
 use fvm_ipld_blockstore::MemoryBlockstore;

testing/conformance/src/vm.rs

@@ -2,22 +2,22 @@
 // SPDX-License-Identifier: Apache-2.0, MIT
 use std::sync::{Arc, Mutex};
 
-use cid::multihash::Multihash;
 use cid::Cid;
+use cid::multihash::Multihash;
 
+use fvm::DefaultKernel;
 use fvm::call_manager::{CallManager, DefaultCallManager};
-use fvm::gas::{price_list_by_network_version, Gas, GasTimer, PriceList};
+use fvm::gas::{Gas, GasTimer, PriceList, price_list_by_network_version};
 use fvm::kernel::*;
 use fvm::machine::limiter::MemoryLimiter;
 use fvm::machine::{DefaultMachine, Machine, MachineContext, Manifest, NetworkConfig};
 use fvm::state_tree::StateTree;
-use fvm::DefaultKernel;
 use fvm_ipld_blockstore::MemoryBlockstore;
 use fvm_shared::address::Address;
 use fvm_shared::clock::ChainEpoch;
 use fvm_shared::consensus::ConsensusFault;
 use fvm_shared::crypto::signature::{
-    SignatureType, SECP_PUB_LEN, SECP_SIG_LEN, SECP_SIG_MESSAGE_HASH_SIZE,
+    SECP_PUB_LEN, SECP_SIG_LEN, SECP_SIG_MESSAGE_HASH_SIZE, SignatureType,
 };
 use fvm_shared::econ::TokenAmount;
 use fvm_shared::piece::PieceInfo;

testing/conformance/tests/runner.rs

@@ -9,7 +9,7 @@ use std::iter;
 use std::path::{Path, PathBuf};
 use std::str::FromStr;
 
-use anyhow::{anyhow, Context as _};
+use anyhow::{Context as _, anyhow};
 use async_std::{stream, sync, task};
 use colored::*;
 use futures::{Future, StreamExt, TryFutureExt, TryStreamExt};