From 7921421b7016a90ffc126094d1f9fdae135653ea Mon Sep 17 00:00:00 2001 From: kamuik16 Date: Tue, 22 Oct 2024 11:36:50 +0530 Subject: [PATCH 1/4] remove PRE_COMMIT_SECTOR_BATCH_MAX_SIZE --- actors/miner/src/lib.rs | 16 ---------------- .../tests/miner_actor_test_precommit_batch.rs | 11 ----------- .../src/tests/batch_onboarding.rs | 18 +++++++----------- .../src/tests/commit_post_test.rs | 5 ----- .../src/tests/replica_update_test.rs | 1 - runtime/src/runtime/policy.rs | 13 ------------- 6 files changed, 7 insertions(+), 57 deletions(-) diff --git a/actors/miner/src/lib.rs b/actors/miner/src/lib.rs index 01b9b5f85..ecc2bfdd7 100644 --- a/actors/miner/src/lib.rs +++ b/actors/miner/src/lib.rs @@ -1486,13 +1486,6 @@ impl Actor { let policy = rt.policy(); if sectors.is_empty() { return Err(actor_error!(illegal_argument, "batch empty")); - } else if sectors.len() > policy.pre_commit_sector_batch_max_size { - return Err(actor_error!( - illegal_argument, - "batch of {} too large, max {}", - sectors.len(), - policy.pre_commit_sector_batch_max_size - )); } } // Check per-sector preconditions before opening state transaction or sending other messages. @@ -3967,15 +3960,6 @@ fn validate_replica_updates<'a, BS>( where BS: Blockstore, { - if updates.len() > policy.prove_replica_updates_max_size { - return Err(actor_error!( - illegal_argument, - "too many updates ({} > {})", - updates.len(), - policy.prove_replica_updates_max_size - )); - } - let mut sector_numbers = BTreeSet::::new(); let mut validate_one = |update: &ReplicaUpdateInner, sector_info: &SectorOnChainInfo| diff --git a/actors/miner/tests/miner_actor_test_precommit_batch.rs b/actors/miner/tests/miner_actor_test_precommit_batch.rs index 0413fb60c..d8d227a75 100644 --- a/actors/miner/tests/miner_actor_test_precommit_batch.rs +++ b/actors/miner/tests/miner_actor_test_precommit_batch.rs @@ -208,17 +208,6 @@ mod miner_actor_precommit_batch { ); } - #[test] - fn too_many_sectors() { - assert_simple_batch( - Policy::default().pre_commit_sector_batch_max_size + 1, - TokenAmount::zero(), - TokenAmount::zero(), - &[], - ExitCode::USR_ILLEGAL_ARGUMENT, - "batch of 257 too large", - ); - } #[test] fn insufficient_balance() { assert_simple_batch( diff --git a/integration_tests/src/tests/batch_onboarding.rs b/integration_tests/src/tests/batch_onboarding.rs index 1405a0a4b..359f6d4e1 100644 --- a/integration_tests/src/tests/batch_onboarding.rs +++ b/integration_tests/src/tests/batch_onboarding.rs @@ -2,9 +2,7 @@ use export_macro::vm_test; use fil_actor_miner::SectorPreCommitOnChainInfo; use fil_actor_miner::{power_for_sector, State as MinerState}; use fil_actors_runtime::runtime::policy::policy_constants::PRE_COMMIT_CHALLENGE_DELAY; -use fil_actors_runtime::runtime::policy_constants::{ - MAX_AGGREGATED_SECTORS, PRE_COMMIT_SECTOR_BATCH_MAX_SIZE, -}; +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; @@ -21,7 +19,6 @@ use crate::util::{ struct Onboarding { epoch_delay: i64, // epochs to advance since the prior action pre_commit_sector_count: usize, // sectors to batch pre-commit - pre_commit_batch_size: usize, // batch size (multiple batches if committing more) prove_commit_sector_count: usize, // sectors to aggregate prove-commit prove_commit_aggregate_size: usize, // aggregate size (multiple aggregates if proving more) } @@ -30,7 +27,6 @@ impl Onboarding { fn new( epoch_delay: i64, pre_commit_sector_count: usize, - pre_commit_batch_size: usize, prove_commit_sector_count: usize, prove_commit_aggregate_size: usize, ) -> Self { @@ -76,12 +72,12 @@ pub fn batch_onboarding_test(v: &dyn VM) { let mut pre_committed_count = 0; let vec_onboarding = vec![ - Onboarding::new(0, 10, PRE_COMMIT_SECTOR_BATCH_MAX_SIZE, 0, 0), - Onboarding::new(1, 20, 12, 0, 0), - Onboarding::new(PRE_COMMIT_CHALLENGE_DELAY + 1, 0, 0, 8, MAX_AGGREGATED_SECTORS as usize), - Onboarding::new(1, 0, 0, 8, 4), - Onboarding::new(1, 10, 4, 0, 0), - Onboarding::new(PRE_COMMIT_CHALLENGE_DELAY + 1, 0, 0, 24, 10), + Onboarding::new(0, 10, 0, 0), + Onboarding::new(1, 20, 0, 0), + Onboarding::new(PRE_COMMIT_CHALLENGE_DELAY + 1, 0, 8, MAX_AGGREGATED_SECTORS as usize), + Onboarding::new(1, 0, 8, 4), + Onboarding::new(1, 10, 0, 0), + Onboarding::new(PRE_COMMIT_CHALLENGE_DELAY + 1, 0, 24, 10), ]; let mut precommmits: Vec = vec![]; diff --git a/integration_tests/src/tests/commit_post_test.rs b/integration_tests/src/tests/commit_post_test.rs index 95f200f29..c8e27ef2f 100644 --- a/integration_tests/src/tests/commit_post_test.rs +++ b/integration_tests/src/tests/commit_post_test.rs @@ -390,7 +390,6 @@ pub fn aggregate_bad_sector_number_test(v: &dyn VM) { precommit_sectors_v2( v, 4, - policy.pre_commit_sector_batch_max_size, vec![], &worker, &id_addr, @@ -464,7 +463,6 @@ pub fn aggregate_size_limits_test(v: &dyn VM) { precommit_sectors_v2( v, oversized_batch, - policy.pre_commit_sector_batch_max_size, vec![], &worker, &id_addr, @@ -568,7 +566,6 @@ pub fn aggregate_bad_sender_test(v: &dyn VM) { precommit_sectors_v2( v, 4, - policy.pre_commit_sector_batch_max_size, vec![], &worker, &id_addr, @@ -640,7 +637,6 @@ pub fn aggregate_one_precommit_expires_test(v: &dyn VM) { let early_precommits = precommit_sectors_v2( v, 1, - policy.pre_commit_sector_batch_max_size, vec![], &worker, &miner_addr, @@ -660,7 +656,6 @@ pub fn aggregate_one_precommit_expires_test(v: &dyn VM) { let later_precommits = precommit_sectors_v2( v, 3, - policy.pre_commit_sector_batch_max_size, vec![], &worker, &miner_addr, diff --git a/integration_tests/src/tests/replica_update_test.rs b/integration_tests/src/tests/replica_update_test.rs index 09ed7afdb..6b1f5f8ca 100644 --- a/integration_tests/src/tests/replica_update_test.rs +++ b/integration_tests/src/tests/replica_update_test.rs @@ -863,7 +863,6 @@ pub fn deal_included_in_multiple_sectors_failure_test(v: &dyn VM) { let precommits = precommit_sectors_v2( v, policy.min_aggregated_sectors as usize, - policy.pre_commit_sector_batch_max_size, vec![], &worker, &maddr, diff --git a/runtime/src/runtime/policy.rs b/runtime/src/runtime/policy.rs index 333f30075..a579a131e 100644 --- a/runtime/src/runtime/policy.rs +++ b/runtime/src/runtime/policy.rs @@ -20,11 +20,6 @@ pub struct Policy { /// Maximum total replica update proof size. pub max_replica_update_proof_size: usize, - /// The maximum number of sector pre-commitments in a single batch. - pub pre_commit_sector_batch_max_size: usize, - /// The maximum number of sector replica updates in a single batch. - pub prove_replica_updates_max_size: usize, - /// The delay between pre commit expiration and clean up from state. This enforces that expired pre-commits /// stay in state for a period of time creating a grace period during which a late-running aggregated prove-commit /// can still prove its non-expired precommits without resubmitting a message @@ -175,8 +170,6 @@ impl Default for Policy { min_aggregated_sectors: policy_constants::MIN_AGGREGATED_SECTORS, max_aggregated_proof_size: policy_constants::MAX_AGGREGATED_PROOF_SIZE, max_replica_update_proof_size: policy_constants::MAX_REPLICA_UPDATE_PROOF_SIZE, - pre_commit_sector_batch_max_size: policy_constants::PRE_COMMIT_SECTOR_BATCH_MAX_SIZE, - prove_replica_updates_max_size: policy_constants::PROVE_REPLICA_UPDATES_MAX_SIZE, expired_pre_commit_clean_up_delay: policy_constants::EXPIRED_PRE_COMMIT_CLEAN_UP_DELAY, wpost_proving_period: policy_constants::WPOST_PROVING_PERIOD, wpost_challenge_window: policy_constants::WPOST_CHALLENGE_WINDOW, @@ -254,12 +247,6 @@ pub mod policy_constants { pub const MAX_REPLICA_UPDATE_PROOF_SIZE: usize = 4096; - // 32 sectors per epoch would support a single miner onboarding 1EiB of 32GiB sectors in 1 year. - pub const PRE_COMMIT_SECTOR_BATCH_MAX_SIZE: usize = 256; - - // Same as PRE_COMMIT_SECTOR_BATCH_MAX_SIZE for consistency. - pub const PROVE_REPLICA_UPDATES_MAX_SIZE: usize = PRE_COMMIT_SECTOR_BATCH_MAX_SIZE; - pub const EXPIRED_PRE_COMMIT_CLEAN_UP_DELAY: i64 = 8 * EPOCHS_IN_HOUR; pub const WPOST_PROVING_PERIOD: ChainEpoch = EPOCHS_IN_DAY; From 7dbccc802fbc4ae70ccb117c373a4cf5f443f2b0 Mon Sep 17 00:00:00 2001 From: kamuik16 Date: Tue, 22 Oct 2024 11:39:49 +0530 Subject: [PATCH 2/4] remove DECLARATIONS_MAX --- actors/miner/src/lib.rs | 36 ----------------------------------- runtime/src/runtime/policy.rs | 6 ------ 2 files changed, 42 deletions(-) diff --git a/actors/miner/src/lib.rs b/actors/miner/src/lib.rs index ecc2bfdd7..d5b9890f5 100644 --- a/actors/miner/src/lib.rs +++ b/actors/miner/src/lib.rs @@ -2508,18 +2508,6 @@ impl Actor { // Note: this cannot terminate pre-committed but un-proven sectors. // They must be allowed to expire (and deposit burnt). - { - let policy = rt.policy(); - if params.terminations.len() as u64 > policy.declarations_max { - return Err(actor_error!( - illegal_argument, - "too many declarations when terminating sectors: {} > {}", - params.terminations.len(), - policy.declarations_max - )); - } - } - let mut to_process = DeadlineSectorMap::new(); for term in params.terminations { @@ -2649,18 +2637,6 @@ impl Actor { } fn declare_faults(rt: &impl Runtime, params: DeclareFaultsParams) -> Result<(), ActorError> { - { - let policy = rt.policy(); - if params.faults.len() as u64 > policy.declarations_max { - return Err(actor_error!( - illegal_argument, - "too many fault declarations for a single message: {} > {}", - params.faults.len(), - policy.declarations_max - )); - } - } - let mut to_process = DeadlineSectorMap::new(); for term in params.faults { @@ -2782,18 +2758,6 @@ impl Actor { rt: &impl Runtime, params: DeclareFaultsRecoveredParams, ) -> Result<(), ActorError> { - { - let policy = rt.policy(); - if params.recoveries.len() as u64 > policy.declarations_max { - return Err(actor_error!( - illegal_argument, - "too many recovery declarations for a single message: {} > {}", - params.recoveries.len(), - policy.declarations_max - )); - } - } - let mut to_process = DeadlineSectorMap::new(); for term in params.recoveries { diff --git a/runtime/src/runtime/policy.rs b/runtime/src/runtime/policy.rs index a579a131e..3708a64f3 100644 --- a/runtime/src/runtime/policy.rs +++ b/runtime/src/runtime/policy.rs @@ -58,9 +58,6 @@ pub struct Policy { /// This limits the number of simultaneous fault, recovery, or sector-extension declarations. pub addressed_partitions_max: u64, - /// Maximum number of unique "declarations" in batch operations. - pub declarations_max: u64, - /// The maximum number of sector numbers addressable in a single invocation /// (which implies also the max infos that may be loaded at once). /// One upper bound on this is the max size of a storage block: 1MiB supports 130k at 8 bytes each, @@ -182,7 +179,6 @@ impl Default for Policy { max_peer_id_length: policy_constants::MAX_PEER_ID_LENGTH, max_multiaddr_data: policy_constants::MAX_MULTIADDR_DATA, addressed_partitions_max: policy_constants::ADDRESSED_PARTITIONS_MAX, - declarations_max: policy_constants::DECLARATIONS_MAX, addressed_sectors_max: policy_constants::ADDRESSED_SECTORS_MAX, posted_partitions_max: policy_constants::POSTED_PARTITIONS_MAX, max_pre_commit_randomness_lookback: @@ -281,8 +277,6 @@ pub mod policy_constants { // A miner can of course submit more messages. pub const ADDRESSED_PARTITIONS_MAX: u64 = MAX_PARTITIONS_PER_DEADLINE; - pub const DECLARATIONS_MAX: u64 = ADDRESSED_PARTITIONS_MAX; - pub const ADDRESSED_SECTORS_MAX: u64 = 25_000; pub const POSTED_PARTITIONS_MAX: u64 = 3; From 2aa3dc18bdfa4ac9bce2c293411bd5ddef484390 Mon Sep 17 00:00:00 2001 From: kamuik16 Date: Tue, 22 Oct 2024 11:43:55 +0530 Subject: [PATCH 3/4] clippy --- actors/miner/src/lib.rs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/actors/miner/src/lib.rs b/actors/miner/src/lib.rs index d5b9890f5..d41b794e3 100644 --- a/actors/miner/src/lib.rs +++ b/actors/miner/src/lib.rs @@ -1482,11 +1482,8 @@ impl Actor { sectors: Vec, ) -> Result<(), ActorError> { let curr_epoch = rt.curr_epoch(); - { - let policy = rt.policy(); - if sectors.is_empty() { - return Err(actor_error!(illegal_argument, "batch empty")); - } + if sectors.is_empty() { + return Err(actor_error!(illegal_argument, "batch empty")); } // Check per-sector preconditions before opening state transaction or sending other messages. let challenge_earliest = curr_epoch - rt.policy().max_pre_commit_randomness_lookback; From 35a802ee3db3b1c7feba83def63aaa3227da2813 Mon Sep 17 00:00:00 2001 From: kamuik16 Date: Tue, 22 Oct 2024 12:21:12 +0530 Subject: [PATCH 4/4] clippy --- .../tests/miner_actor_test_precommit_batch.rs | 1 - .../src/tests/batch_onboarding.rs | 2 - .../src/tests/batch_onboarding_deals_test.rs | 3 - .../src/tests/commit_post_test.rs | 2 - .../src/tests/prove_commit3_test.rs | 1 - .../src/tests/replica_update3_test.rs | 1 - .../src/tests/replica_update_test.rs | 60 +------------------ integration_tests/src/util/workflows.rs | 8 +-- test_vm/tests/suite/replica_update_test.rs | 12 +--- 9 files changed, 5 insertions(+), 85 deletions(-) diff --git a/actors/miner/tests/miner_actor_test_precommit_batch.rs b/actors/miner/tests/miner_actor_test_precommit_batch.rs index d8d227a75..507e663a6 100644 --- a/actors/miner/tests/miner_actor_test_precommit_batch.rs +++ b/actors/miner/tests/miner_actor_test_precommit_batch.rs @@ -4,7 +4,6 @@ use fil_actor_miner::{ qa_power_max, PreCommitSectorBatchParams, PreCommitSectorParams, State, }; use fil_actor_power::Method as PowerMethod; -use fil_actors_runtime::runtime::Policy; use fil_actors_runtime::test_utils::*; use fvm_shared::clock::ChainEpoch; use fvm_shared::deal::DealID; diff --git a/integration_tests/src/tests/batch_onboarding.rs b/integration_tests/src/tests/batch_onboarding.rs index 359f6d4e1..b03fddcb7 100644 --- a/integration_tests/src/tests/batch_onboarding.rs +++ b/integration_tests/src/tests/batch_onboarding.rs @@ -33,7 +33,6 @@ impl Onboarding { Self { epoch_delay, pre_commit_sector_count, - pre_commit_batch_size, prove_commit_sector_count, prove_commit_aggregate_size, } @@ -90,7 +89,6 @@ pub fn batch_onboarding_test(v: &dyn VM) { let mut new_precommits = precommit_sectors_v2( v, item.pre_commit_sector_count, - item.pre_commit_batch_size, vec![], &worker, &id_addr, diff --git a/integration_tests/src/tests/batch_onboarding_deals_test.rs b/integration_tests/src/tests/batch_onboarding_deals_test.rs index 6aa256e7e..e2920fa82 100644 --- a/integration_tests/src/tests/batch_onboarding_deals_test.rs +++ b/integration_tests/src/tests/batch_onboarding_deals_test.rs @@ -74,7 +74,6 @@ pub fn pre_commit_requires_commd_test(v: &dyn VM) { precommit_sectors_v2_expect_code( v, 1, - 1, vec![PrecommitMetadata { deals: vec![0], commd: CompactCommD(None) }], &worker, &miner, @@ -89,7 +88,6 @@ pub fn pre_commit_requires_commd_test(v: &dyn VM) { precommit_sectors_v2_expect_code( v, 1, - 1, vec![PrecommitMetadata { deals: vec![0], commd: CompactCommD(Some(make_piece_cid("This is not commP".as_bytes()))), @@ -151,7 +149,6 @@ pub fn batch_onboarding_deals_test(v: &dyn VM) { let precommits = precommit_sectors_v2( v, BATCH_SIZE, - BATCH_SIZE, sector_precommit_data, &worker, &miner, diff --git a/integration_tests/src/tests/commit_post_test.rs b/integration_tests/src/tests/commit_post_test.rs index c8e27ef2f..142a68cf2 100644 --- a/integration_tests/src/tests/commit_post_test.rs +++ b/integration_tests/src/tests/commit_post_test.rs @@ -65,7 +65,6 @@ fn setup(v: &dyn VM) -> (MinerInfo, SectorInfo) { let _ = precommit_sectors_v2( v, 1, - 1, vec![], &worker, &id_addr, @@ -277,7 +276,6 @@ pub fn overdue_precommit_test(v: &dyn VM) { let precommit = precommit_sectors_v2( v, 1, - 1, vec![], &worker, &id_addr, diff --git a/integration_tests/src/tests/prove_commit3_test.rs b/integration_tests/src/tests/prove_commit3_test.rs index 94746eed9..540096242 100644 --- a/integration_tests/src/tests/prove_commit3_test.rs +++ b/integration_tests/src/tests/prove_commit3_test.rs @@ -190,7 +190,6 @@ pub fn prove_commit_sectors2_test(v: &dyn VM) { precommit_sectors_v2( v, meta.len(), - meta.len(), meta.clone(), &worker, &maddr, diff --git a/integration_tests/src/tests/replica_update3_test.rs b/integration_tests/src/tests/replica_update3_test.rs index fe7936dec..4989b4ca2 100644 --- a/integration_tests/src/tests/replica_update3_test.rs +++ b/integration_tests/src/tests/replica_update3_test.rs @@ -80,7 +80,6 @@ pub fn prove_replica_update2_test(v: &dyn VM) { precommit_sectors_v2( v, meta.len(), - meta.len(), meta, &worker, &maddr, diff --git a/integration_tests/src/tests/replica_update_test.rs b/integration_tests/src/tests/replica_update_test.rs index 6b1f5f8ca..dfc62b0c1 100644 --- a/integration_tests/src/tests/replica_update_test.rs +++ b/integration_tests/src/tests/replica_update_test.rs @@ -178,7 +178,6 @@ pub fn prove_replica_update_multi_dline_test(v: &dyn VM) { let new_precommits = precommit_sectors_v2( v, more_than_one_partition, - batch_size, vec![], &worker, &maddr, @@ -466,58 +465,6 @@ pub fn terminated_sector_failure_test(v: &dyn VM) { assert_invariants(v, &Policy::default(), None) } -#[vm_test] -pub fn bad_batch_size_failure_test(v: &dyn VM) { - let policy = Policy::default(); - let addrs = create_accounts(v, 1, &TokenAmount::from_whole(100_000)); - let (worker, owner) = (addrs[0], addrs[0]); - let seal_proof = RegisteredSealProof::StackedDRG32GiBV1P1; - let (maddr, robust) = create_miner( - v, - &owner, - &worker, - seal_proof.registered_window_post_proof().unwrap(), - &TokenAmount::from_whole(10_000), - ); - - // advance to have seal randomness epoch in the past - v.set_epoch(200); - - let sector_number = 100; - let (d_idx, p_idx) = create_sector(v, worker, maddr, sector_number, seal_proof); - - // make some deals - let deal_ids = create_deals(1, v, worker, worker, maddr); - - // fail to replicaUpdate more sectors than batch size - let new_cid = make_sealed_cid(b"replica1"); - let mut updates = vec![]; - - for _ in 0..policy.prove_replica_updates_max_size + 1 { - updates.push(ReplicaUpdate { - sector_number, - deadline: d_idx, - partition: p_idx, - new_sealed_cid: new_cid, - deals: deal_ids.clone(), - update_proof_type: fvm_shared::sector::RegisteredUpdateProof::StackedDRG32GiBV1, - replica_proof: vec![].into(), - }); - } - - apply_code( - v, - &worker, - &robust, - &TokenAmount::zero(), - MinerMethod::ProveReplicaUpdates as u64, - Some(ProveReplicaUpdatesParams { updates }), - ExitCode::USR_ILLEGAL_ARGUMENT, - ); - - assert_invariants(v, &Policy::default(), None) -} - #[vm_test] pub fn nodispute_after_upgrade_test(v: &dyn VM) { let (_, worker, miner_id, deadline_index, _, _) = create_miner_and_upgrade_sector(v); @@ -731,7 +678,6 @@ pub fn extend_after_upgrade_test(v: &dyn VM) { #[vm_test] pub fn wrong_deadline_index_failure_test(v: &dyn VM) { - let policy = Policy::default(); let addrs = create_accounts(v, 1, &TokenAmount::from_whole(100_000)); let (worker, owner) = (addrs[0], addrs[0]); let seal_proof = RegisteredSealProof::StackedDRG32GiBV1P1; @@ -757,7 +703,7 @@ pub fn wrong_deadline_index_failure_test(v: &dyn VM) { let new_cid = make_sealed_cid(b"replica1"); let mut updates = vec![]; - for _ in 0..policy.prove_replica_updates_max_size + 1 { + for _ in 0..256 + 1 { updates.push(ReplicaUpdate { sector_number, deadline: d_idx + 1, @@ -787,7 +733,6 @@ pub fn wrong_deadline_index_failure_test(v: &dyn VM) { #[vm_test] pub fn wrong_partition_index_failure_test(v: &dyn VM) { - let policy = Policy::default(); let addrs = create_accounts(v, 1, &TokenAmount::from_whole(100_000)); let (worker, owner) = (addrs[0], addrs[0]); let seal_proof = RegisteredSealProof::StackedDRG32GiBV1P1; @@ -813,7 +758,7 @@ pub fn wrong_partition_index_failure_test(v: &dyn VM) { let new_cid = make_sealed_cid(b"replica1"); let mut updates = vec![]; - for _ in 0..policy.prove_replica_updates_max_size + 1 { + for _ in 0..256 + 1 { updates.push(ReplicaUpdate { sector_number, deadline: d_idx, @@ -1182,7 +1127,6 @@ pub fn create_sector( let precommits = precommit_sectors_v2( v, 1, - 1, vec![], &worker, &maddr, diff --git a/integration_tests/src/util/workflows.rs b/integration_tests/src/util/workflows.rs index 2ff417c3c..d80671483 100644 --- a/integration_tests/src/util/workflows.rs +++ b/integration_tests/src/util/workflows.rs @@ -150,7 +150,6 @@ pub fn miner_precommit_one_sector_v2( precommit_sectors_v2( v, 1, - 1, vec![meta_data], worker, maddr, @@ -207,7 +206,6 @@ pub struct PrecommitMetadata { pub fn precommit_sectors_v2_expect_code( v: &dyn VM, count: usize, - batch_size: usize, metadata: Vec, // Per-sector deal metadata, or empty vector for no deals. worker: &Address, maddr: &Address, @@ -237,8 +235,7 @@ pub fn precommit_sectors_v2_expect_code( let mut invocs = vec![Expect::reward_this_epoch(miner_id), Expect::power_current_total(miner_id)]; let mut param_sectors = Vec::::new(); - let mut j = 0; - while j < batch_size && sector_idx < count { + while sector_idx < count { let sector_number = sector_number_base + sector_idx as u64; let sector_meta = metadata.get(sector_idx).unwrap_or(&no_deals); param_sectors.push(SectorPreCommitInfo { @@ -259,7 +256,6 @@ pub fn precommit_sectors_v2_expect_code( }); } sector_idx += 1; - j += 1; } let events: Vec = param_sectors @@ -313,7 +309,6 @@ pub fn precommit_sectors_v2_expect_code( pub fn precommit_sectors_v2( v: &dyn VM, count: usize, - batch_size: usize, metadata: Vec, // Per-sector deal metadata, or empty vector for no deals. worker: &Address, maddr: &Address, @@ -326,7 +321,6 @@ pub fn precommit_sectors_v2( precommit_sectors_v2_expect_code( v, count, - batch_size, metadata, worker, maddr, diff --git a/test_vm/tests/suite/replica_update_test.rs b/test_vm/tests/suite/replica_update_test.rs index e2ef8bf08..1865e5c7d 100644 --- a/test_vm/tests/suite/replica_update_test.rs +++ b/test_vm/tests/suite/replica_update_test.rs @@ -5,9 +5,8 @@ use std::rc::Rc; use test_vm::TestVM; use fil_actors_integration_tests::tests::{ - bad_batch_size_failure_test, bad_post_upgrade_dispute_test, - deal_included_in_multiple_sectors_failure_test, extend_after_upgrade_test, - immutable_deadline_failure_test, nodispute_after_upgrade_test, + bad_post_upgrade_dispute_test, deal_included_in_multiple_sectors_failure_test, + extend_after_upgrade_test, immutable_deadline_failure_test, nodispute_after_upgrade_test, prove_replica_update_multi_dline_test, replica_update_full_path_success_test, replica_update_verified_deal_max_term_violated_test, replica_update_verified_deal_test, terminate_after_upgrade_test, terminated_sector_failure_test, unhealthy_sector_failure_test, @@ -71,13 +70,6 @@ fn terminated_sector_failure() { terminated_sector_failure_test(&v); } -#[test] -fn bad_batch_size_failure() { - let store = MemoryBlockstore::new(); - let v = TestVM::new_with_singletons(store); - bad_batch_size_failure_test(&v); -} - #[test] fn no_dispute_after_upgrade() { let store = MemoryBlockstore::new();