chore: update to 2024 edition, take 2 (#1678)

* chore: update the rust edition in a few remaining test crates

I missed these in the initial pass as they didn't use the workspace
edition, fix that.

* chore: format for edition changes

Author: Stebalien

integration_tests/Cargo.toml

@@ -4,7 +4,7 @@ description = "Portable integration tests for FVM targets"
 version = "1.0.0"
 license = "MIT OR Apache-2.0"
 authors = ["Protocol Labs", "Filecoin Core Devs"]
-edition = "2021"
+edition.workspace = true
 keywords = ["filecoin", "web3", "wasm"]
 publish = false
 

integration_tests/macro/Cargo.toml

@@ -3,7 +3,7 @@ name = "export_macro"
 description = "Macro to decorate integration tests"
 version = "1.0.0"
 license = "MIT OR Apache-2.0"
-edition = "2021"
+edition.workspace = true
 publish = false
 
 [lib]

integration_tests/src/deals.rs

@@ -2,19 +2,19 @@ use fil_actor_market::{
     ClientDealProposal, DealProposal, Label, Method as MarketMethod, PublishStorageDealsParams,
     PublishStorageDealsReturn,
 };
+use fil_actors_runtime::STORAGE_MARKET_ACTOR_ADDR;
 use fil_actors_runtime::cbor::serialize;
 use fil_actors_runtime::runtime::Policy;
 use fil_actors_runtime::test_utils::make_piece_cid;
-use fil_actors_runtime::STORAGE_MARKET_ACTOR_ADDR;
 use fvm_shared::address::Address;
 use fvm_shared::clock::ChainEpoch;
 use fvm_shared::crypto::signature::{Signature, SignatureType};
 use fvm_shared::econ::TokenAmount;
 use fvm_shared::error::ExitCode;
 use fvm_shared::piece::PaddedPieceSize;
 use num_traits::Zero;
-use vm_api::util::{apply_ok, serialize_ok};
 use vm_api::VM;
+use vm_api::util::{apply_ok, serialize_ok};
 
 #[derive(Clone)]
 pub struct DealOptions {

integration_tests/src/expects.rs

@@ -1,10 +1,10 @@
 use cid::Cid;
-use frc46_token::receiver::{FRC46TokenReceived, FRC46_TOKEN_TYPE};
+use frc46_token::receiver::{FRC46_TOKEN_TYPE, FRC46TokenReceived};
 use frc46_token::token::types::BurnParams;
 use fvm_actor_utils::receiver::UniversalReceiverParams;
 use fvm_ipld_bitfield::BitField;
-use fvm_ipld_encoding::ipld_block::IpldBlock;
 use fvm_ipld_encoding::RawBytes;
+use fvm_ipld_encoding::ipld_block::IpldBlock;
 use fvm_shared::address::Address;
 use fvm_shared::clock::ChainEpoch;
 use fvm_shared::deal::DealID;
@@ -24,7 +24,7 @@ use fil_actor_miner::{IsControllingAddressParam, PowerPair};
 use fil_actor_power::{UpdateClaimedPowerParams, UpdatePledgeTotalParams};
 use fil_actor_verifreg::GetClaimsParams;
 use fil_actors_runtime::{
-    EventBuilder, BURNT_FUNDS_ACTOR_ADDR, DATACAP_TOKEN_ACTOR_ADDR, DATACAP_TOKEN_ACTOR_ID,
+    BURNT_FUNDS_ACTOR_ADDR, DATACAP_TOKEN_ACTOR_ADDR, DATACAP_TOKEN_ACTOR_ID, EventBuilder,
     REWARD_ACTOR_ADDR, STORAGE_MARKET_ACTOR_ADDR, STORAGE_MARKET_ACTOR_ID,
     STORAGE_POWER_ACTOR_ADDR, STORAGE_POWER_ACTOR_ID, VERIFIED_REGISTRY_ACTOR_ADDR,
     VERIFIED_REGISTRY_ACTOR_ID,

integration_tests/src/lib.rs

@@ -1,9 +1,9 @@
 use fil_actors_runtime::reward::FilterEstimate;
 use fvm_shared::{
+    ActorID,
     address::{Address, FIRST_NON_SINGLETON_ADDR},
     econ::TokenAmount,
     sector::StoragePower,
-    ActorID,
 };
 use lazy_static::lazy_static;
 use std::collections::BTreeMap;

integration_tests/src/tests/authenticate_message_test.rs

@@ -1,14 +1,14 @@
 use export_macro::vm_test;
-use fil_actor_account::types::AuthenticateMessageParams;
 use fil_actor_account::Method::AuthenticateMessageExported;
+use fil_actor_account::types::AuthenticateMessageParams;
 use fvm_ipld_encoding::RawBytes;
 use fvm_shared::bigint::Zero;
 use fvm_shared::econ::TokenAmount;
 use fvm_shared::error::ExitCode;
 
 use crate::util::{create_accounts, generate_deal_proposal};
-use vm_api::util::{apply_code, apply_ok};
 use vm_api::VM;
+use vm_api::util::{apply_code, apply_ok};
 
 /// Using a deal proposal as a serialized message, we confirm that:
 /// - calls to Account::authenticate_message with valid signatures succeed

integration_tests/src/tests/batch_onboarding.rs

@@ -1,14 +1,14 @@
 use export_macro::vm_test;
 use fil_actor_miner::SectorPreCommitOnChainInfo;
-use fil_actor_miner::{power_for_sector, State as MinerState};
+use fil_actor_miner::{State as MinerState, power_for_sector};
+use fil_actors_runtime::runtime::Policy;
 use fil_actors_runtime::runtime::policy::policy_constants::PRE_COMMIT_CHALLENGE_DELAY;
 use fil_actors_runtime::runtime::policy_constants::MAX_AGGREGATED_SECTORS;
-use fil_actors_runtime::runtime::Policy;
 use fvm_shared::bigint::BigInt;
 use fvm_shared::econ::TokenAmount;
 use fvm_shared::sector::{RegisteredSealProof, SectorNumber};
-use vm_api::util::{get_state, DynBlockstore};
 use vm_api::VM;
+use vm_api::util::{DynBlockstore, get_state};
 
 use crate::util::{
     advance_to_proving_deadline, create_accounts, create_miner, cron_tick, expect_invariants,

integration_tests/src/tests/batch_onboarding_deals_test.rs

@@ -1,11 +1,11 @@
 use fil_actor_market::DealProposal;
 use fil_actor_miner::{
-    max_prove_commit_duration, power_for_sector, CompactCommD, SectorPreCommitOnChainInfo,
-    State as MinerState,
+    CompactCommD, SectorPreCommitOnChainInfo, State as MinerState, max_prove_commit_duration,
+    power_for_sector,
 };
 use fil_actor_miner::{Method as MinerMethod, ProveCommitAggregateParams};
-use fil_actors_runtime::runtime::policy::policy_constants::PRE_COMMIT_CHALLENGE_DELAY;
 use fil_actors_runtime::runtime::Policy;
+use fil_actors_runtime::runtime::policy::policy_constants::PRE_COMMIT_CHALLENGE_DELAY;
 use fil_actors_runtime::test_utils::make_piece_cid;
 use fvm_shared::address::Address;
 use fvm_shared::bigint::BigInt;
@@ -18,15 +18,16 @@ use fvm_shared::sector::{RegisteredSealProof, StoragePower};
 use num_traits::Zero;
 
 use export_macro::vm_test;
-use vm_api::util::{apply_ok, get_state, DynBlockstore};
 use vm_api::VM;
+use vm_api::util::{DynBlockstore, apply_ok, get_state};
 
 use crate::deals::{DealBatcher, DealOptions};
 use crate::util::{
-    advance_to_proving_deadline, bf_all, create_accounts, create_miner, get_network_stats,
-    make_bitfield, market_add_balance, market_pending_deal_allocations, miner_balance,
-    precommit_meta_data_from_deals, precommit_sectors_v2, precommit_sectors_v2_expect_code,
-    submit_windowed_post, verifreg_add_client, verifreg_add_verifier, PrecommitMetadata,
+    PrecommitMetadata, advance_to_proving_deadline, bf_all, create_accounts, create_miner,
+    get_network_stats, make_bitfield, market_add_balance, market_pending_deal_allocations,
+    miner_balance, precommit_meta_data_from_deals, precommit_sectors_v2,
+    precommit_sectors_v2_expect_code, submit_windowed_post, verifreg_add_client,
+    verifreg_add_verifier,
 };
 
 const BATCH_SIZE: usize = 8;

integration_tests/src/tests/change_beneficiary_test.rs

@@ -6,8 +6,8 @@ use fil_actors_runtime::runtime::Policy;
 use fvm_shared::econ::TokenAmount;
 use fvm_shared::error::ExitCode;
 use fvm_shared::{bigint::Zero, sector::RegisteredSealProof};
-use vm_api::util::apply_code;
 use vm_api::VM;
+use vm_api::util::apply_code;
 
 use crate::util::{
     assert_invariants, change_beneficiary, create_accounts, create_miner, get_beneficiary,

integration_tests/src/tests/change_owner_test.rs

@@ -5,8 +5,8 @@ use fvm_shared::bigint::Zero;
 use fvm_shared::econ::TokenAmount;
 use fvm_shared::error::ExitCode;
 use fvm_shared::sector::RegisteredSealProof;
-use vm_api::util::apply_code;
 use vm_api::VM;
+use vm_api::util::apply_code;
 
 use crate::util::{
     assert_invariants, change_beneficiary, change_owner_address, create_accounts, create_miner,

integration_tests/src/tests/commit_post_test.rs

@@ -10,28 +10,28 @@ use fvm_shared::error::ExitCode;
 use fvm_shared::randomness::Randomness;
 use fvm_shared::sector::{PoStProof, RegisteredSealProof, SectorNumber};
 
+use crate::TEST_VM_RAND_ARRAY;
 use crate::expects::Expect;
 use crate::util::{
     advance_by_deadline_to_epoch, advance_to_proving_deadline, assert_invariants, create_accounts,
     create_miner, cron_tick, expect_invariants, get_network_stats, invariant_failure_patterns,
     miner_balance, miner_prove_sector, precommit_sectors_v2, submit_windowed_post,
 };
-use crate::TEST_VM_RAND_ARRAY;
 use fil_actor_cron::Method as CronMethod;
 use fil_actor_market::Method as MarketMethod;
 use fil_actor_miner::{
-    max_prove_commit_duration, power_for_sector, DeadlineInfo, Method as MinerMethod,
-    PoStPartition, ProveCommitAggregateParams, State as MinerState, SubmitWindowedPoStParams,
+    DeadlineInfo, Method as MinerMethod, PoStPartition, ProveCommitAggregateParams,
+    State as MinerState, SubmitWindowedPoStParams, max_prove_commit_duration, power_for_sector,
 };
 use fil_actor_power::{Method as PowerMethod, State as PowerState};
 use fil_actors_runtime::runtime::Policy;
 use fil_actors_runtime::{
     CRON_ACTOR_ADDR, CRON_ACTOR_ID, STORAGE_MARKET_ACTOR_ADDR, STORAGE_POWER_ACTOR_ADDR,
     STORAGE_POWER_ACTOR_ID,
 };
-use vm_api::trace::{EmittedEvent, ExpectInvocation};
-use vm_api::util::{apply_code, apply_ok, get_state, DynBlockstore};
 use vm_api::VM;
+use vm_api::trace::{EmittedEvent, ExpectInvocation};
+use vm_api::util::{DynBlockstore, apply_code, apply_ok, get_state};
 
 struct SectorInfo {
     number: SectorNumber,

integration_tests/src/tests/datacap_tests.rs

@@ -2,8 +2,8 @@ use export_macro::vm_test;
 use fil_actor_datacap::{Method as DataCapMethod, MintParams};
 use fil_actor_verifreg::{AllocationRequest, AllocationRequests};
 use fil_actors_runtime::cbor::serialize;
-use fil_actors_runtime::runtime::policy_constants::MINIMUM_VERIFIED_ALLOCATION_SIZE;
 use fil_actors_runtime::runtime::Policy;
+use fil_actors_runtime::runtime::policy_constants::MINIMUM_VERIFIED_ALLOCATION_SIZE;
 use fil_actors_runtime::test_utils::make_piece_cid;
 use fil_actors_runtime::{DATACAP_TOKEN_ACTOR_ADDR, VERIFIED_REGISTRY_ACTOR_ADDR};
 use frc46_token::token::types::{GetAllowanceParams, TransferFromParams};
@@ -13,8 +13,8 @@ use fvm_shared::econ::TokenAmount;
 use fvm_shared::error::ExitCode;
 use fvm_shared::piece::PaddedPieceSize;
 use fvm_shared::sector::RegisteredSealProof;
-use vm_api::util::{apply_code, apply_ok};
 use vm_api::VM;
+use vm_api::util::{apply_code, apply_ok};
 
 use crate::util::{create_accounts, create_miner};
 

integration_tests/src/tests/evm_test.rs

@@ -1,25 +1,25 @@
-use alloy_core::sol_types::{decode_revert_reason, SolCall, SolInterface};
+use alloy_core::sol_types::{SolCall, SolInterface, decode_revert_reason};
 use alloy_core::{primitives::Address as EthAddress, sol};
 
 use export_macro::vm_test;
 use fil_actors_evm_shared::uints::U256;
 use fil_actors_runtime::{
-    test_utils::ETHACCOUNT_ACTOR_CODE_ID, test_utils::EVM_ACTOR_CODE_ID, EAM_ACTOR_ADDR,
-    EAM_ACTOR_ID,
+    EAM_ACTOR_ADDR, EAM_ACTOR_ID, test_utils::ETHACCOUNT_ACTOR_CODE_ID,
+    test_utils::EVM_ACTOR_CODE_ID,
 };
-use fvm_ipld_encoding::ipld_block::IpldBlock;
 use fvm_ipld_encoding::RawBytes;
-use fvm_ipld_encoding::{strict_bytes, BytesDe};
+use fvm_ipld_encoding::ipld_block::IpldBlock;
+use fvm_ipld_encoding::{BytesDe, strict_bytes};
 use fvm_shared::ActorID;
 use fvm_shared::METHOD_SEND;
 use fvm_shared::{address::Address, econ::TokenAmount};
 use num_traits::Zero;
 use serde::{Deserialize, Serialize};
-use vm_api::util::{apply_ok, serialize_ok};
 use vm_api::VM;
+use vm_api::util::{apply_ok, serialize_ok};
 
-use crate::util::create_accounts;
 use crate::TEST_FAUCET_ADDR;
+use crate::util::create_accounts;
 
 // Generate a statically typed interface for the contracts.
 sol!("../actors/evm/tests/contracts/Recursive.sol");

integration_tests/src/tests/extend_sectors_test.rs

@@ -13,25 +13,25 @@ use fvm_shared::piece::{PaddedPieceSize, PieceInfo};
 use fvm_shared::sector::{RegisteredSealProof, SectorNumber, StoragePower};
 
 use fil_actor_miner::{
-    max_prove_commit_duration, power_for_sector, ExpirationExtension, ExpirationExtension2,
-    ExtendSectorExpiration2Params, ExtendSectorExpirationParams, Method as MinerMethod, PowerPair,
-    ProveReplicaUpdatesParams, ReplicaUpdate, SectorClaim, SectorOnChainInfoFlags, Sectors,
-    State as MinerState,
+    ExpirationExtension, ExpirationExtension2, ExtendSectorExpiration2Params,
+    ExtendSectorExpirationParams, Method as MinerMethod, PowerPair, ProveReplicaUpdatesParams,
+    ReplicaUpdate, SectorClaim, SectorOnChainInfoFlags, Sectors, State as MinerState,
+    max_prove_commit_duration, power_for_sector,
 };
 use fil_actors_runtime::runtime::policy_constants::MARKET_DEFAULT_ALLOCATION_TERM_BUFFER;
-use vm_api::trace::ExpectInvocation;
-use vm_api::util::{apply_ok, get_state, mutate_state, DynBlockstore};
 use vm_api::VM;
+use vm_api::trace::ExpectInvocation;
+use vm_api::util::{DynBlockstore, apply_ok, get_state, mutate_state};
 
 use crate::expects::Expect;
 use crate::util::{
-    advance_by_deadline_to_epoch, advance_by_deadline_to_epoch_while_proving,
+    PrecommitMetadata, advance_by_deadline_to_epoch, advance_by_deadline_to_epoch_while_proving,
     advance_by_deadline_to_index, advance_to_proving_deadline, bf_all, create_accounts,
     create_miner, cron_tick, expect_invariants, invariant_failure_patterns,
     make_piece_manifests_from_deal_ids, market_add_balance, market_pending_deal_allocations,
     market_publish_deal, miner_precommit_one_sector_v2, miner_prove_sector,
     override_compute_unsealed_sector_cid, precommit_meta_data_from_deals, sector_deadline,
-    submit_windowed_post, verifreg_add_client, verifreg_add_verifier, PrecommitMetadata,
+    submit_windowed_post, verifreg_add_client, verifreg_add_verifier,
 };
 
 #[allow(clippy::too_many_arguments)]

integration_tests/src/tests/init_test.rs

@@ -1,12 +1,12 @@
 use export_macro::vm_test;
 use fil_actor_init::Exec4Return;
 use fil_actors_runtime::{
-    cbor::serialize, runtime::EMPTY_ARR_CID, test_utils::MULTISIG_ACTOR_CODE_ID, EAM_ACTOR_ADDR,
-    EAM_ACTOR_ID, INIT_ACTOR_ADDR,
+    EAM_ACTOR_ADDR, EAM_ACTOR_ID, INIT_ACTOR_ADDR, cbor::serialize, runtime::EMPTY_ARR_CID,
+    test_utils::MULTISIG_ACTOR_CODE_ID,
 };
-use fvm_shared::{address::Address, econ::TokenAmount, error::ExitCode, METHOD_SEND};
+use fvm_shared::{METHOD_SEND, address::Address, econ::TokenAmount, error::ExitCode};
 use num_traits::Zero;
-use vm_api::{builtin::Type, util::serialize_ok, VM};
+use vm_api::{VM, builtin::Type, util::serialize_ok};
 
 use crate::{FIRST_TEST_USER_ADDR, TEST_FAUCET_ADDR};
 

integration_tests/src/tests/market_miner_withdrawal_test.rs

@@ -2,18 +2,18 @@ use fil_actor_market::Method as MarketMethod;
 use fil_actor_market::WithdrawBalanceParams as MarketWithdrawBalanceParams;
 use fil_actor_miner::Method as MinerMethod;
 use fil_actor_miner::WithdrawBalanceParams as MinerWithdrawBalanceParams;
-use fil_actors_runtime::test_utils::{MARKET_ACTOR_CODE_ID, MINER_ACTOR_CODE_ID};
 use fil_actors_runtime::STORAGE_MARKET_ACTOR_ADDR;
+use fil_actors_runtime::test_utils::{MARKET_ACTOR_CODE_ID, MINER_ACTOR_CODE_ID};
 use fvm_ipld_encoding::RawBytes;
+use fvm_shared::METHOD_SEND;
 use fvm_shared::address::Address;
 use fvm_shared::bigint::Zero;
 use fvm_shared::econ::TokenAmount;
 use fvm_shared::error::ExitCode;
 use fvm_shared::sector::RegisteredPoStProof;
-use fvm_shared::METHOD_SEND;
-use vm_api::util::apply_ok;
 use vm_api::ActorState;
 use vm_api::VM;
+use vm_api::util::apply_ok;
 
 use crate::util::{create_accounts, create_miner};
 use export_macro::vm_test;

integration_tests/src/tests/multisig_test.rs

@@ -1,24 +1,24 @@
 use export_macro::vm_test;
 use fil_actor_init::ExecReturn;
 use fil_actor_multisig::{
-    compute_proposal_hash, Method as MsigMethod, PendingTxnMap, ProposeParams, RemoveSignerParams,
-    State as MsigState, SwapSignerParams, Transaction, TxnID, TxnIDParams, PENDING_TXN_CONFIG,
+    Method as MsigMethod, PENDING_TXN_CONFIG, PendingTxnMap, ProposeParams, RemoveSignerParams,
+    State as MsigState, SwapSignerParams, Transaction, TxnID, TxnIDParams, compute_proposal_hash,
 };
 use fil_actors_runtime::cbor::serialize;
 use fil_actors_runtime::runtime::Policy;
 use fil_actors_runtime::test_utils::*;
 use fil_actors_runtime::{INIT_ACTOR_ADDR, SYSTEM_ACTOR_ADDR};
 use fvm_ipld_encoding::RawBytes;
+use fvm_shared::METHOD_SEND;
 use fvm_shared::address::Address;
 use fvm_shared::bigint::Zero;
 use fvm_shared::econ::TokenAmount;
 use fvm_shared::error::ExitCode;
-use fvm_shared::METHOD_SEND;
 use std::collections::HashSet;
 use std::iter::FromIterator;
-use vm_api::trace::ExpectInvocation;
-use vm_api::util::{apply_code, apply_ok, get_state, DynBlockstore};
 use vm_api::VM;
+use vm_api::trace::ExpectInvocation;
+use vm_api::util::{DynBlockstore, apply_code, apply_ok, get_state};
 
 use crate::expects::Expect;
 use crate::util::{assert_invariants, create_accounts};

integration_tests/src/tests/power_scenario_tests.rs

@@ -1,7 +1,7 @@
 use export_macro::vm_test;
 use fil_actor_init::Method as InitMethod;
 use fil_actor_miner::{
-    max_prove_commit_duration, Method as MinerMethod, MinerConstructorParams, MIN_SECTOR_EXPIRATION,
+    MIN_SECTOR_EXPIRATION, Method as MinerMethod, MinerConstructorParams, max_prove_commit_duration,
 };
 use fil_actor_power::{CreateMinerParams, Method as PowerMethod};
 use fil_actors_runtime::runtime::Policy;
@@ -10,22 +10,22 @@ use fil_actors_runtime::{
     CRON_ACTOR_ADDR, CRON_ACTOR_ID, INIT_ACTOR_ADDR, INIT_ACTOR_ID, STORAGE_POWER_ACTOR_ADDR,
     STORAGE_POWER_ACTOR_ID,
 };
-use fvm_ipld_encoding::ipld_block::IpldBlock;
 use fvm_ipld_encoding::BytesDe;
 use fvm_ipld_encoding::RawBytes;
+use fvm_ipld_encoding::ipld_block::IpldBlock;
+use fvm_shared::METHOD_SEND;
 use fvm_shared::address::Address;
 use fvm_shared::econ::TokenAmount;
 use fvm_shared::sector::{RegisteredPoStProof, RegisteredSealProof};
-use fvm_shared::METHOD_SEND;
 use num_traits::Zero;
+use vm_api::VM;
 use vm_api::trace::ExpectInvocation;
 use vm_api::util::{apply_ok, serialize_ok};
-use vm_api::VM;
 
 use crate::expects::Expect;
 use crate::util::{
-    assert_invariants, create_accounts, create_miner, expect_invariants,
-    invariant_failure_patterns, miner_dline_info, miner_precommit_one_sector_v2, PrecommitMetadata,
+    PrecommitMetadata, assert_invariants, create_accounts, create_miner, expect_invariants,
+    invariant_failure_patterns, miner_dline_info, miner_precommit_one_sector_v2,
 };
 use crate::{FIRST_TEST_USER_ADDR, TEST_FAUCET_ADDR};