Skip to content

Commit cd43784

Browse files
authored
chore: update ref-fvm to v4.6.0 (and update the actors utils to match) (#1653)
chore: update ref-fvm And handle the `window_post_partitions_sector` to `window_post_partition_sectors` rename.
1 parent 1cc9c2b commit cd43784

File tree

8 files changed

+29
-29
lines changed

8 files changed

+29
-29
lines changed

Cargo.lock

Lines changed: 16 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,14 +125,14 @@ ipld-core = { version = "0.4.1", features = ["serde"] }
125125
integer-encoding = { version = "4.0.2", default-features = false }
126126

127127
# actor-utils
128-
fvm_actor_utils = "12.0.0"
129-
frc42_dispatch = "8.0.0"
130-
frc46_token = "12.0.0"
128+
fvm_actor_utils = "13.0.0"
129+
frc42_dispatch = "9.0.0"
130+
frc46_token = "13.0.0"
131131

132132
# FVM
133-
fvm_sdk = "4.5.1"
134-
fvm_shared = "4.5.1"
135-
fvm_ipld_encoding = "0.5.0"
133+
fvm_sdk = "4.6.0"
134+
fvm_shared = "4.6.0"
135+
fvm_ipld_encoding = "0.5.2"
136136
fvm_ipld_blockstore = "0.3.0"
137137
fvm_ipld_hamt = "0.10.2"
138138
fvm_ipld_kamt = "0.4.3"

actors/miner/src/state.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1272,7 +1272,7 @@ impl MinerInfo {
12721272
.map_err(|e| actor_error!(illegal_argument, "invalid sector size: {}", e))?;
12731273

12741274
let window_post_partition_sectors = window_post_proof_type
1275-
.window_post_partitions_sector()
1275+
.window_post_partition_sectors()
12761276
.map_err(|e| actor_error!(illegal_argument, "invalid partition sectors: {}", e))?;
12771277

12781278
Ok(Self {

actors/miner/src/testing.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ fn check_miner_info(info: MinerInfo, acc: &MessageAccumulator) {
239239
);
240240

241241
let partition_sectors =
242-
info.window_post_proof_type.window_post_partitions_sector().unwrap();
242+
info.window_post_proof_type.window_post_partition_sectors().unwrap();
243243
acc.require(info.window_post_partition_sectors == partition_sectors, format!("miner partition sectors {} does not match partition sectors {} for PoSt proof type {:?}", info.window_post_partition_sectors, partition_sectors, info.window_post_proof_type));
244244
}
245245
}

actors/miner/tests/miner_actor_test_partitions.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -980,7 +980,7 @@ mod miner_actor_test_partitions {
980980

981981
let proof_type = RegisteredSealProof::StackedDRG32GiBV1P1;
982982
let _sector_size = proof_type.sector_size().unwrap();
983-
let partition_sectors = proof_type.window_post_partitions_sector().unwrap();
983+
let partition_sectors = proof_type.window_post_partition_sectors().unwrap();
984984

985985
let mut many_sectors = vec![SectorOnChainInfo::default(); partition_sectors as usize];
986986
let mut ids = vec![0u64; partition_sectors as usize];

actors/miner/tests/sector_assignment.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ mod sector_assignment {
4444
#[test]
4545
fn assign_sectors_to_deadlines() {
4646
let proof_type = RegisteredSealProof::StackedDRG32GiBV1P1;
47-
let partition_sectors = proof_type.window_post_partitions_sector().unwrap();
47+
let partition_sectors = proof_type.window_post_partition_sectors().unwrap();
4848
let sector_size = proof_type.sector_size().unwrap();
4949

5050
let open_deadlines = Policy::default().wpost_period_deadlines - 2;

actors/miner/tests/util.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ impl ActorHarness {
193193
seal_proof_type: proof_type,
194194
window_post_proof_type: proof_type.registered_window_post_proof().unwrap(),
195195
sector_size: proof_type.sector_size().unwrap(),
196-
partition_size: proof_type.window_post_partitions_sector().unwrap(),
196+
partition_size: proof_type.window_post_partition_sectors().unwrap(),
197197

198198
next_sector_no: 0,
199199

@@ -243,7 +243,7 @@ impl ActorHarness {
243243
self.seal_proof_type = proof_type;
244244
self.window_post_proof_type = proof_type.registered_window_post_proof().unwrap();
245245
self.sector_size = proof_type.sector_size().unwrap();
246-
self.partition_size = proof_type.window_post_partitions_sector().unwrap();
246+
self.partition_size = proof_type.window_post_partition_sectors().unwrap();
247247
}
248248

249249
pub fn construct_and_verify(&self, rt: &MockRuntime) {

integration_tests/src/tests/replica_update_test.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ pub fn prove_replica_update_multi_dline_test(v: &dyn VM) {
172172
let more_than_one_partition = 2440;
173173
let batch_size = 100;
174174
let first_sector_number_p1 = 0;
175-
let first_sector_number_p2 = seal_proof.window_post_partitions_sector().unwrap();
175+
let first_sector_number_p2 = seal_proof.window_post_partition_sectors().unwrap();
176176
let expiration = v.epoch() + policy.max_sector_expiration_extension;
177177

178178
let new_precommits = precommit_sectors_v2(

0 commit comments

Comments
 (0)