Skip to content

Commit cdc5cc9

Browse files
ZenGround0ZenGround0
committed
fmt
1 parent 7964e4b commit cdc5cc9

File tree

3 files changed

+37
-51
lines changed

3 files changed

+37
-51
lines changed

‎actors/miner/src/lib.rs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,7 @@ pub enum Method {
164164
InitialPledgeExported = frc42_dispatch::method_hash!("InitialPledge"),
165165
GenerateSectorLocationExported = frc42_dispatch::method_hash!("GenerateSectorLocation"),
166166
ValidateSectorStatusExported = frc42_dispatch::method_hash!("ValidateSectorStatus"),
167-
GetNominalSectorExpirationExported =
168-
frc42_dispatch::method_hash!("GetNominalSectorExpiration"),
167+
GetNominalSectorExpirationExported = frc42_dispatch::method_hash!("GetNominalSectorExpiration"),
169168
}
170169

171170
pub const SECTOR_CONTENT_CHANGED: MethodNum = frc42_dispatch::method_hash!("SectorContentChanged");
@@ -1993,8 +1992,7 @@ impl Actor {
19931992
// completely removed from state or does not exist.
19941993
let sector_info = state.get_sector(rt.store(), params.sector_number)?;
19951994
if sector_info.is_none() {
1996-
let sector_location =
1997-
SectorLocation { deadline: NO_DEADLINE, partition: NO_PARTITION };
1995+
let sector_location = SectorLocation { deadline: NO_DEADLINE, partition: NO_PARTITION };
19981996
let aux_data = fvm_ipld_encoding::to_vec(&sector_location)
19991997
.map_err(|e| actor_error!(illegal_state, e.description))?;
20001998
return Ok(GenerateSectorLocationReturn { status: SectorStatusCode::Dead, aux_data });

‎actors/miner/tests/sector_status_test.rs‎

Lines changed: 21 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ fn generate_sector_location_live_sector() {
3434
let (status, aux_data) = h.generate_sector_location(&rt, sector_number).unwrap();
3535
assert_eq!(status, SectorStatusCode::Active);
3636

37-
let is_valid =
38-
h.validate_sector_status(&rt, sector_number, status, aux_data).unwrap();
37+
let is_valid = h.validate_sector_status(&rt, sector_number, status, aux_data).unwrap();
3938
assert!(is_valid);
4039

4140
h.check_state(&rt);
@@ -59,8 +58,7 @@ fn generate_sector_location_terminated_not_compacted() {
5958
let (status, aux_data) = h.generate_sector_location(&rt, sector_number).unwrap();
6059
assert_eq!(status, SectorStatusCode::Dead);
6160

62-
let is_valid =
63-
h.validate_sector_status(&rt, sector_number, status, aux_data).unwrap();
61+
let is_valid = h.validate_sector_status(&rt, sector_number, status, aux_data).unwrap();
6462
assert!(is_valid);
6563

6664
h.check_state(&rt);
@@ -81,9 +79,8 @@ fn validate_live_sector_as_dead_or_faulty_returns_false() {
8179
.unwrap();
8280
assert!(!is_valid);
8381

84-
let is_valid = h
85-
.validate_sector_status(&rt, sector_number, SectorStatusCode::Faulty, aux_data)
86-
.unwrap();
82+
let is_valid =
83+
h.validate_sector_status(&rt, sector_number, SectorStatusCode::Faulty, aux_data).unwrap();
8784
assert!(!is_valid);
8885

8986
h.check_state(&rt);
@@ -99,12 +96,8 @@ fn validate_fails_with_invalid_aux_data() {
9996

10097
// try to validate with invalid aux_data
10198
let invalid_aux_data = vec![1, 2, 3, 4]; // Invalid CBOR
102-
let result = h.validate_sector_status(
103-
&rt,
104-
sector_number,
105-
SectorStatusCode::Active,
106-
invalid_aux_data,
107-
);
99+
let result =
100+
h.validate_sector_status(&rt, sector_number, SectorStatusCode::Active, invalid_aux_data);
108101
expect_abort(ExitCode::USR_ILLEGAL_ARGUMENT, result);
109102

110103
h.check_state(&rt);
@@ -170,14 +163,12 @@ fn validate_detects_swapped_sector_number() {
170163
let (_, _) = h.terminate_sectors(&rt, &terminate_bf, expected_fee);
171164

172165
// Test 9a: Try to validate sector 2 with sector 1's status
173-
let is_valid_9a =
174-
h.validate_sector_status(&rt, sector2, status1, aux_data1.clone()).unwrap();
166+
let is_valid_9a = h.validate_sector_status(&rt, sector2, status1, aux_data1.clone()).unwrap();
175167
assert!(!is_valid_9a);
176168

177169
// Test 9b: Try to validate sector 1 with sector 2's status
178170
let (status2, _aux_data2) = h.generate_sector_location(&rt, sector2).unwrap();
179-
let is_valid_9b =
180-
h.validate_sector_status(&rt, sector1, status2, aux_data1.clone()).unwrap();
171+
let is_valid_9b = h.validate_sector_status(&rt, sector1, status2, aux_data1.clone()).unwrap();
181172
assert!(!is_valid_9b);
182173

183174
h.check_state(&rt);
@@ -245,8 +236,7 @@ fn validate_dead_sector_no_location() {
245236
let (status, aux_data) = h.generate_sector_location(&rt, 999).unwrap();
246237
assert_eq!(status, SectorStatusCode::Dead);
247238

248-
let is_valid =
249-
h.validate_sector_status(&rt, 999, SectorStatusCode::Dead, aux_data).unwrap();
239+
let is_valid = h.validate_sector_status(&rt, 999, SectorStatusCode::Dead, aux_data).unwrap();
250240
assert!(is_valid);
251241

252242
h.check_state(&rt);
@@ -268,9 +258,8 @@ fn validate_faulty_sector() {
268258
let (status, aux_data) = h.generate_sector_location(&rt, sector_number).unwrap();
269259
assert_eq!(status, SectorStatusCode::Faulty);
270260

271-
let is_valid = h
272-
.validate_sector_status(&rt, sector_number, SectorStatusCode::Faulty, aux_data)
273-
.unwrap();
261+
let is_valid =
262+
h.validate_sector_status(&rt, sector_number, SectorStatusCode::Faulty, aux_data).unwrap();
274263
assert!(is_valid);
275264

276265
h.check_state(&rt);
@@ -290,8 +279,9 @@ fn validate_faulty_sector_as_live_or_dead_returns_false() {
290279

291280
let (_status, aux_data) = h.generate_sector_location(&rt, sector_number).unwrap();
292281

293-
let is_valid =
294-
h.validate_sector_status(&rt, sector_number, SectorStatusCode::Active, aux_data.clone()).unwrap();
282+
let is_valid = h
283+
.validate_sector_status(&rt, sector_number, SectorStatusCode::Active, aux_data.clone())
284+
.unwrap();
295285
assert!(!is_valid);
296286

297287
let is_valid =
@@ -318,15 +308,15 @@ fn validate_dead_sector_as_live_or_faulty_returns_false() {
318308

319309
let (_status, aux_data) = h.generate_sector_location(&rt, sector_number).unwrap();
320310

321-
let is_valid =
322-
h.validate_sector_status(&rt, sector_number, SectorStatusCode::Active, aux_data.clone()).unwrap();
323-
assert!(!is_valid);
324-
325311
let is_valid = h
326-
.validate_sector_status(&rt, sector_number, SectorStatusCode::Faulty, aux_data)
312+
.validate_sector_status(&rt, sector_number, SectorStatusCode::Active, aux_data.clone())
327313
.unwrap();
328314
assert!(!is_valid);
329315

316+
let is_valid =
317+
h.validate_sector_status(&rt, sector_number, SectorStatusCode::Faulty, aux_data).unwrap();
318+
assert!(!is_valid);
319+
330320
h.check_state(&rt);
331321
}
332322

@@ -366,9 +356,8 @@ fn validate_live_or_faulty_at_no_location_returns_false() {
366356
.unwrap();
367357
assert!(!is_valid);
368358

369-
let is_valid = h
370-
.validate_sector_status(&rt, sector_number, SectorStatusCode::Faulty, aux_data)
371-
.unwrap();
359+
let is_valid =
360+
h.validate_sector_status(&rt, sector_number, SectorStatusCode::Faulty, aux_data).unwrap();
372361
assert!(!is_valid);
373362

374363
h.check_state(&rt);

‎actors/miner/tests/util.rs‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -56,19 +56,19 @@ use fil_actor_miner::{
5656
DeclareFaultsRecoveredParams, DeferredCronEventParams, DisputeWindowedPoStParams,
5757
ExpirationQueue, ExpirationSet, ExtendSectorExpiration2Params, FaultDeclaration,
5858
GenerateSectorLocationParams, GenerateSectorLocationReturn, GetAvailableBalanceReturn,
59-
GetBeneficiaryReturn, GetControlAddressesReturn, GetMultiaddrsReturn, GetPeerIDReturn, Method,
60-
Method as MinerMethod, MinerConstructorParams as ConstructorParams, MinerInfo, NO_QUANTIZATION,
61-
Partition, PendingBeneficiaryChange, PieceActivationManifest, PieceChange, PieceReturn,
62-
PoStPartition, PowerPair, PreCommitSectorBatchParams, PreCommitSectorBatchParams2,
63-
PreCommitSectorParams, ProveCommitSectorParams, ProveCommitSectors3Params,
64-
ProveCommitSectors3Return, QuantSpec, RecoveryDeclaration, ReportConsensusFaultParams,
65-
SECTOR_CONTENT_CHANGED, SECTORS_AMT_BITWIDTH, SectorActivationManifest, SectorChanges,
66-
SectorContentChangedParams, SectorContentChangedReturn, SectorOnChainInfo, SectorPreCommitInfo,
67-
SectorPreCommitOnChainInfo, SectorReturn, SectorStatusCode, SectorUpdateManifest, Sectors,
68-
State, SubmitWindowedPoStParams, TerminateSectorsParams, TerminationDeclaration,
69-
GetNominalSectorExpirationReturn, ValidateSectorStatusParams, ValidateSectorStatusReturn,
70-
VerifiedAllocationKey,
71-
WindowedPoSt, WithdrawBalanceParams, WithdrawBalanceReturn, consensus_fault_penalty, ext,
59+
GetBeneficiaryReturn, GetControlAddressesReturn, GetMultiaddrsReturn,
60+
GetNominalSectorExpirationReturn, GetPeerIDReturn, Method, Method as MinerMethod,
61+
MinerConstructorParams as ConstructorParams, MinerInfo, NO_QUANTIZATION, Partition,
62+
PendingBeneficiaryChange, PieceActivationManifest, PieceChange, PieceReturn, PoStPartition,
63+
PowerPair, PreCommitSectorBatchParams, PreCommitSectorBatchParams2, PreCommitSectorParams,
64+
ProveCommitSectorParams, ProveCommitSectors3Params, ProveCommitSectors3Return, QuantSpec,
65+
RecoveryDeclaration, ReportConsensusFaultParams, SECTOR_CONTENT_CHANGED, SECTORS_AMT_BITWIDTH,
66+
SectorActivationManifest, SectorChanges, SectorContentChangedParams,
67+
SectorContentChangedReturn, SectorOnChainInfo, SectorPreCommitInfo, SectorPreCommitOnChainInfo,
68+
SectorReturn, SectorStatusCode, SectorUpdateManifest, Sectors, State, SubmitWindowedPoStParams,
69+
TerminateSectorsParams, TerminationDeclaration, ValidateSectorStatusParams,
70+
ValidateSectorStatusReturn, VerifiedAllocationKey, WindowedPoSt, WithdrawBalanceParams,
71+
WithdrawBalanceReturn, consensus_fault_penalty, ext,
7272
ext::market::ON_MINER_SECTORS_TERMINATE_METHOD,
7373
ext::power::UPDATE_CLAIMED_POWER_METHOD,
7474
ext::verifreg::{
@@ -2886,8 +2886,7 @@ impl ActorHarness {
28862886
)?;
28872887
rt.verify();
28882888

2889-
let return_value: GetNominalSectorExpirationReturn =
2890-
result.unwrap().deserialize().unwrap();
2889+
let return_value: GetNominalSectorExpirationReturn = result.unwrap().deserialize().unwrap();
28912890
Ok(return_value.expiration)
28922891
}
28932892
}

0 commit comments

Comments
 (0)