Move prove_commit2 tests to separate file from pru tests

actors/miner/tests/prove_commit2_test.rs

@@ -0,0 +1,67 @@
+use fvm_shared::sector::{SectorNumber, StoragePower};
+use fvm_shared::{bigint::Zero, clock::ChainEpoch, econ::TokenAmount, ActorID};
+
+use fil_actor_miner::{ProveCommitSectors2Return, SectorPreCommitInfo};
+use fil_actors_runtime::{BatchReturn, DealWeight, EPOCHS_IN_DAY};
+use util::*;
+
+mod util;
+
+const CLIENT_ID: ActorID = 1000;
+const DEFAULT_SECTOR_EXPIRATION_DAYS: ChainEpoch = 220;
+const FIRST_SECTOR_NUMBER: SectorNumber = 100;
+
+#[test]
+fn prove_commit2_basic() {
+    let h = ActorHarness::new_with_options(HarnessOptions::default());
+    let rt = h.new_runtime();
+    rt.set_balance(BIG_BALANCE.clone());
+    h.construct_and_verify(&rt);
+
+    // Precommit sectors
+    let precommit_epoch = *rt.epoch.borrow();
+    let sector_count = 4;
+    let sector_expiry = *rt.epoch.borrow() + DEFAULT_SECTOR_EXPIRATION_DAYS * EPOCHS_IN_DAY;
+    let precommits = make_fake_commd_precommits(
+        &h,
+        FIRST_SECTOR_NUMBER,
+        precommit_epoch - 1,
+        sector_expiry,
+        sector_count,
+    );
+    h.pre_commit_sector_batch_v2(&rt, &precommits, true, &TokenAmount::zero()).unwrap();
+    let snos: Vec<SectorNumber> =
+        precommits.iter().map(|pci: &SectorPreCommitInfo| pci.sector_number).collect();
+
+    // Update them in batch, each with a single piece.
+    let piece_size = h.sector_size as u64;
+    let sector_activations = vec![
+        make_activation_manifest(snos[0], &[(piece_size, 0, 0, 0)]), // No alloc or deal
+        make_activation_manifest(snos[1], &[(piece_size, CLIENT_ID, 1000, 0)]), // Just an alloc
+        make_activation_manifest(snos[2], &[(piece_size, 0, 0, 2000)]), // Just a deal
+        make_activation_manifest(snos[3], &[(piece_size, CLIENT_ID, 1001, 2001)]), // Alloc and deal
+    ];
+
+    rt.set_epoch(precommit_epoch + rt.policy.pre_commit_challenge_delay + 1);
+    let result = h.prove_commit_sectors2(&rt, &sector_activations, true, true, false).unwrap();
+    assert_eq!(
+        ProveCommitSectors2Return { activation_results: BatchReturn::ok(precommits.len() as u32) },
+        result
+    );
+
+    let duration = sector_expiry - *rt.epoch.borrow();
+    let expected_weight = DealWeight::from(piece_size) * duration;
+    let raw_power = StoragePower::from(h.sector_size as u64);
+    let verified_power = &raw_power * 10;
+    let raw_pledge = h.initial_pledge_for_power(&rt, &raw_power);
+    let verified_pledge = h.initial_pledge_for_power(&rt, &verified_power);
+
+    // Sector 0: Even though there's no "deal", the data weight is set.
+    verify_weights(&rt, &h, snos[0], &expected_weight, &DealWeight::zero(), &raw_pledge);
+    // Sector 1: With an allocation, the verified weight is set instead.
+    verify_weights(&rt, &h, snos[1], &DealWeight::zero(), &expected_weight, &verified_pledge);
+    // Sector 2: Deal weight is set.
+    verify_weights(&rt, &h, snos[2], &expected_weight, &DealWeight::zero(), &raw_pledge);
+    // Sector 3: Deal doesn't make a difference to verified weight only set.
+    verify_weights(&rt, &h, snos[3], &DealWeight::zero(), &expected_weight, &verified_pledge);
+}

actors/miner/tests/prove_replica_test.rs

@@ -1,9 +1,8 @@
 use fvm_shared::sector::{SectorNumber, StoragePower};
-use fvm_shared::{bigint::Zero, clock::ChainEpoch, econ::TokenAmount, ActorID};
+use fvm_shared::{bigint::Zero, clock::ChainEpoch, ActorID};
 
 use fil_actor_miner::ProveReplicaUpdates2Return;
-use fil_actor_miner::{ProveCommitSectors2Return, SectorPreCommitInfo, State};
-use fil_actors_runtime::test_utils::MockRuntime;
+use fil_actor_miner::State;
 use fil_actors_runtime::{runtime::Runtime, BatchReturn, DealWeight, EPOCHS_IN_DAY};
 use util::*;
 
@@ -61,74 +60,3 @@ fn prove_basic_updates() {
     // Sector 3: Deal doesn't make a difference to verified weight only set.
     verify_weights(&rt, &h, snos[3], &DealWeight::zero(), &expected_weight, &verified_pledge);
 }
-
-#[test]
-fn prove_commit2_basic() {
-    let h = ActorHarness::new_with_options(HarnessOptions::default());
-    let rt = h.new_runtime();
-    rt.set_balance(BIG_BALANCE.clone());
-    h.construct_and_verify(&rt);
-
-    // Precommit sectors
-    let precommit_epoch = *rt.epoch.borrow();
-    let sector_count = 4;
-    let sector_expiry = *rt.epoch.borrow() + DEFAULT_SECTOR_EXPIRATION_DAYS * EPOCHS_IN_DAY;
-    let precommits = make_fake_commd_precommits(
-        &h,
-        FIRST_SECTOR_NUMBER,
-        precommit_epoch - 1,
-        sector_expiry,
-        sector_count,
-    );
-    h.pre_commit_sector_batch_v2(&rt, &precommits, true, &TokenAmount::zero()).unwrap();
-    let snos: Vec<SectorNumber> =
-        precommits.iter().map(|pci: &SectorPreCommitInfo| pci.sector_number).collect();
-
-    // Update them in batch, each with a single piece.
-    let piece_size = h.sector_size as u64;
-    let sector_activations = vec![
-        make_activation_manifest(snos[0], &[(piece_size, 0, 0, 0)]), // No alloc or deal
-        make_activation_manifest(snos[1], &[(piece_size, CLIENT_ID, 1000, 0)]), // Just an alloc
-        make_activation_manifest(snos[2], &[(piece_size, 0, 0, 2000)]), // Just a deal
-        make_activation_manifest(snos[3], &[(piece_size, CLIENT_ID, 1001, 2001)]), // Alloc and deal
-    ];
-
-    rt.set_epoch(precommit_epoch + rt.policy.pre_commit_challenge_delay + 1);
-    let result = h.prove_commit_sectors2(&rt, &sector_activations, true, true, false).unwrap();
-    assert_eq!(
-        ProveCommitSectors2Return { activation_results: BatchReturn::ok(precommits.len() as u32) },
-        result
-    );
-
-    let duration = sector_expiry - *rt.epoch.borrow();
-    let expected_weight = DealWeight::from(piece_size) * duration;
-    let raw_power = StoragePower::from(h.sector_size as u64);
-    let verified_power = &raw_power * 10;
-    let raw_pledge = h.initial_pledge_for_power(&rt, &raw_power);
-    let verified_pledge = h.initial_pledge_for_power(&rt, &verified_power);
-
-    // Sector 0: Even though there's no "deal", the data weight is set.
-    verify_weights(&rt, &h, snos[0], &expected_weight, &DealWeight::zero(), &raw_pledge);
-    // Sector 1: With an allocation, the verified weight is set instead.
-    verify_weights(&rt, &h, snos[1], &DealWeight::zero(), &expected_weight, &verified_pledge);
-    // Sector 2: Deal weight is set.
-    verify_weights(&rt, &h, snos[2], &expected_weight, &DealWeight::zero(), &raw_pledge);
-    // Sector 3: Deal doesn't make a difference to verified weight only set.
-    verify_weights(&rt, &h, snos[3], &DealWeight::zero(), &expected_weight, &verified_pledge);
-}
-
-fn verify_weights(
-    rt: &MockRuntime,
-    h: &ActorHarness,
-    sno: SectorNumber,
-    data_weight: &DealWeight,
-    verified_weight: &DealWeight,
-    pledge: &TokenAmount,
-) {
-    let s = h.get_sector(rt, sno);
-    // Deal IDs are deprecated and never set.
-    assert!(s.deprecated_deal_ids.is_empty());
-    assert_eq!(data_weight, &s.deal_weight);
-    assert_eq!(verified_weight, &s.verified_deal_weight);
-    assert_eq!(pledge, &s.initial_pledge);
-}

actors/miner/tests/util.rs

@@ -3391,6 +3391,23 @@ fn expect_update_power(rt: &MockRuntime, delta: PowerPair) {
     }
 }
 
+#[allow(dead_code)]
+pub fn verify_weights(
+    rt: &MockRuntime,
+    h: &ActorHarness,
+    sno: SectorNumber,
+    data_weight: &DealWeight,
+    verified_weight: &DealWeight,
+    pledge: &TokenAmount,
+) {
+    let s = h.get_sector(rt, sno);
+    // Deal IDs are deprecated and never set.
+    assert!(s.deprecated_deal_ids.is_empty());
+    assert_eq!(data_weight, &s.deal_weight);
+    assert_eq!(verified_weight, &s.verified_deal_weight);
+    assert_eq!(pledge, &s.initial_pledge);
+}
+
 // Helper type for validating deadline state.
 //
 // All methods take the state by value so one can (and should) construct a