diff --git a/integration_tests/src/tests/commit_post_test.rs b/integration_tests/src/tests/commit_post_test.rs index d9555c98a..95f200f29 100644 --- a/integration_tests/src/tests/commit_post_test.rs +++ b/integration_tests/src/tests/commit_post_test.rs @@ -14,7 +14,7 @@ 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_cc_sector, precommit_sectors_v2, submit_windowed_post, + miner_balance, miner_prove_sector, precommit_sectors_v2, submit_windowed_post, }; use crate::TEST_VM_RAND_ARRAY; use fil_actor_cron::Method as CronMethod; @@ -82,7 +82,7 @@ fn setup(v: &dyn VM) -> (MinerInfo, SectorInfo) { advance_by_deadline_to_epoch(v, &id_addr, prove_time); // prove commit, cron, advance to post time - miner_prove_cc_sector(v, &worker, &id_addr, sector_number); + miner_prove_sector(v, &worker, &id_addr, sector_number, vec![]); cron_tick(v); ExpectInvocation { diff --git a/integration_tests/src/tests/extend_sectors_test.rs b/integration_tests/src/tests/extend_sectors_test.rs index 518ff9981..03d41bbac 100644 --- a/integration_tests/src/tests/extend_sectors_test.rs +++ b/integration_tests/src/tests/extend_sectors_test.rs @@ -28,7 +28,7 @@ use crate::util::{ 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_cc_sector, miner_prove_sector, + 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, }; @@ -477,7 +477,7 @@ pub fn extend_sector_up_to_max_relative_extension_test(v: &dyn VM) { // advance time to max seal duration and prove the sector advance_by_deadline_to_epoch(v, &miner_id, sector_start); - miner_prove_cc_sector(v, &worker, &miner_id, sector_number); + miner_prove_sector(v, &worker, &miner_id, sector_number, vec![]); // trigger cron to validate the prove commit cron_tick(v); @@ -578,7 +578,7 @@ pub fn extend_updated_sector_with_claims_test(v: &dyn VM) { // advance time by a day and prove the sector let prove_epoch = v.epoch() + EPOCHS_IN_DAY; advance_by_deadline_to_epoch(v, &miner_addr, prove_epoch); - miner_prove_cc_sector(v, &worker, &miner_addr, sector_number); + miner_prove_sector(v, &worker, &miner_addr, sector_number, vec![]); // trigger cron to validate the prove commit cron_tick(v); diff --git a/integration_tests/src/tests/replica_update_test.rs b/integration_tests/src/tests/replica_update_test.rs index 254920aff..ff09c98c6 100644 --- a/integration_tests/src/tests/replica_update_test.rs +++ b/integration_tests/src/tests/replica_update_test.rs @@ -36,7 +36,7 @@ use crate::util::{ assert_invariants, bf_all, check_sector_active, check_sector_faulty, create_accounts, create_miner, cron_tick, deadline_state, declare_recovery, expect_invariants, get_deal_weights, get_network_stats, invariant_failure_patterns, make_bitfield, market_publish_deal, - miner_balance, miner_power, miner_prove_cc_sector, override_compute_unsealed_sector_cid, + miner_balance, miner_power, miner_prove_sector, override_compute_unsealed_sector_cid, precommit_sectors_v2, prove_commit_sectors, sector_info, submit_invalid_post, submit_windowed_post, verifreg_add_client, verifreg_add_verifier, }; @@ -1187,7 +1187,7 @@ pub fn create_sector( // prove commit let prove_time = v.epoch() + Policy::default().pre_commit_challenge_delay + 1; advance_by_deadline_to_epoch(v, &maddr, prove_time); - miner_prove_cc_sector(v, &worker, &maddr, sector_number); + miner_prove_sector(v, &worker, &maddr, sector_number, vec![]); cron_tick(v); diff --git a/integration_tests/src/util/workflows.rs b/integration_tests/src/util/workflows.rs index 85bd153aa..5266efeb3 100644 --- a/integration_tests/src/util/workflows.rs +++ b/integration_tests/src/util/workflows.rs @@ -197,15 +197,6 @@ pub fn miner_prove_sector( .matches(v.take_invocations().last().unwrap()); } -pub fn miner_prove_cc_sector( - v: &dyn VM, - worker: &Address, - miner_id: &Address, - sector_number: SectorNumber, -) { - miner_prove_sector(v, worker, miner_id, sector_number, vec![]); -} - #[derive(Default, Clone)] pub struct PrecommitMetadata { pub deals: Vec,