cerc-io/lotus
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Address review

Browse Source
This commit is contained in:
Aayush 2023-04-06 14:39:57 -04:00
parent 6d45c37dc5
commit 0356163a2e
3 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
chain/actors/builtin/miner/utils.go
View File

@ -33,18 +33,18 @@ func AllPartSectors(mas State, sget func(Partition) (bitfield.BitField, error))
// new miner actors and new sectors // new miner actors and new sectors
func SealProofTypeFromSectorSize(ssize abi.SectorSize, nv network.Version) (abi.RegisteredSealProof, error) { func SealProofTypeFromSectorSize(ssize abi.SectorSize, nv network.Version) (abi.RegisteredSealProof, error) {
switch { switch {
case nv >= network.Version19: case nv < network.Version7:
switch ssize { switch ssize {
case 2 << 10: case 2 << 10:
return abi.RegisteredSealProof_StackedDrg2KiBV1_1, nil return abi.RegisteredSealProof_StackedDrg2KiBV1, nil
case 8 << 20: case 8 << 20:
return abi.RegisteredSealProof_StackedDrg8MiBV1_1, nil return abi.RegisteredSealProof_StackedDrg8MiBV1, nil
case 512 << 20: case 512 << 20:
return abi.RegisteredSealProof_StackedDrg512MiBV1_1, nil return abi.RegisteredSealProof_StackedDrg512MiBV1, nil
case 32 << 30: case 32 << 30:
return abi.RegisteredSealProof_StackedDrg32GiBV1_1, nil return abi.RegisteredSealProof_StackedDrg32GiBV1, nil
case 64 << 30: case 64 << 30:
return abi.RegisteredSealProof_StackedDrg64GiBV1_1, nil return abi.RegisteredSealProof_StackedDrg64GiBV1, nil
default: default:
return 0, xerrors.Errorf("unsupported sector size for miner: %v", ssize) return 0, xerrors.Errorf("unsupported sector size for miner: %v", ssize)
} }
@ -63,21 +63,6 @@ func SealProofTypeFromSectorSize(ssize abi.SectorSize, nv network.Version) (abi.
default: default:
return 0, xerrors.Errorf("unsupported sector size for miner: %v", ssize) return 0, xerrors.Errorf("unsupported sector size for miner: %v", ssize)
} }
case nv < network.Version7:
switch ssize {
case 2 << 10:
return abi.RegisteredSealProof_StackedDrg2KiBV1, nil
case 8 << 20:
return abi.RegisteredSealProof_StackedDrg8MiBV1, nil
case 512 << 20:
return abi.RegisteredSealProof_StackedDrg512MiBV1, nil
case 32 << 30:
return abi.RegisteredSealProof_StackedDrg32GiBV1, nil
case 64 << 30:
return abi.RegisteredSealProof_StackedDrg64GiBV1, nil
default:
return 0, xerrors.Errorf("unsupported sector size for miner: %v", ssize)
}
} }
return 0, xerrors.Errorf("unsupported network version") return 0, xerrors.Errorf("unsupported network version")

0
itests/migration_tests.go → itests/migration_test.go
View File

1
storage/wdpost/wdpost_run.go
View File

@ -224,6 +224,7 @@ func (s *WindowPoStScheduler) checkSectors(ctx context.Context, check bitfield.B
} }
pp := s.proofType pp := s.proofType
// TODO: Drop after nv19 comes and goes
if nv >= network.Version19 { if nv >= network.Version19 {
pp, err = pp.ToV1_1PostProof() pp, err = pp.ToV1_1PostProof()
if err != nil { if err != nil {