Merge pull request #64 from filecoin-project/fix/challange-count

Fix challange counts

params_shared.go

@@ -9,10 +9,10 @@ const SectorChallengeRatioDiv = 25
 const MaxFallbackPostChallengeCount = 10
 
 // extracted from lotus/chain/types/blockheader
-func ElectionPostChallengeCount(sectors uint64, faults int) uint64 {
-	if sectors == 0 {
+func ElectionPostChallengeCount(sectors uint64, faults uint64) uint64 {
+	if sectors-faults == 0 {
 		return 0
 	}
 	// ceil(sectors / SectorChallengeRatioDiv)
-	return (sectors-uint64(faults)-1)/SectorChallengeRatioDiv + 1
+	return (sectors-faults-1)/SectorChallengeRatioDiv + 1
 }

sectorbuilder.go

@@ -636,7 +636,7 @@ func (sb *SectorBuilder) GenerateEPostCandidates(sectorInfo SortedPublicSectorIn
 		return nil, err
 	}
 
-	challengeCount := ElectionPostChallengeCount(uint64(len(sectorInfo.Values())), len(faults))
+	challengeCount := ElectionPostChallengeCount(uint64(len(sectorInfo.Values())), uint64(len(faults)))
 
 	proverID := addressToProverID(sb.Miner)
 	return sectorbuilder.GenerateCandidates(sb.ssize, proverID, challengeSeed, challengeCount, privsectors)
@@ -680,7 +680,7 @@ func (sb *SectorBuilder) GenerateFallbackPoSt(sectorInfo SortedPublicSectorInfo,
 		return nil, nil, err
 	}
 
-	challengeCount := fallbackPostChallengeCount(uint64(len(sectorInfo.Values())), len(faults))
+	challengeCount := fallbackPostChallengeCount(uint64(len(sectorInfo.Values())), uint64(len(faults)))
 
 	proverID := addressToProverID(sb.Miner)
 	candidates, err := sectorbuilder.GenerateCandidates(sb.ssize, proverID, challengeSeed, challengeCount, privsectors)
@@ -696,7 +696,7 @@ func (sb *SectorBuilder) Stop() {
 	close(sb.stopping)
 }
 
-func fallbackPostChallengeCount(sectors uint64, faults int) uint64 {
+func fallbackPostChallengeCount(sectors uint64, faults uint64) uint64 {
 	challengeCount := ElectionPostChallengeCount(sectors, faults)
 	if challengeCount > MaxFallbackPostChallengeCount {
 		return MaxFallbackPostChallengeCount

simple.go

@@ -40,7 +40,7 @@ func VerifyElectionPost(ctx context.Context, sectorSize uint64, sectorInfo Sorte
 	return verifyPost(ctx, sectorSize, sectorInfo, challengeCount, challengeSeed, proof, candidates, proverID)
 }
 
-func VerifyFallbackPost(ctx context.Context, sectorSize uint64, sectorInfo SortedPublicSectorInfo, challengeSeed []byte, proof []byte, candidates []EPostCandidate, proverID address.Address, faults int) (bool, error) {
+func VerifyFallbackPost(ctx context.Context, sectorSize uint64, sectorInfo SortedPublicSectorInfo, challengeSeed []byte, proof []byte, candidates []EPostCandidate, proverID address.Address, faults uint64) (bool, error) {
 	challengeCount := fallbackPostChallengeCount(uint64(len(sectorInfo.Values())), faults)
 	return verifyPost(ctx, sectorSize, sectorInfo, challengeCount, challengeSeed, proof, candidates, proverID)
 }