Merge pull request #409 from pegnet/develop

Version 2.0.3

modules/graderStake/baseGradedBlock.go

@@ -1,10 +1,5 @@
 package graderStake
 
-import (
-	"math/rand"
-	"time"
-)
-
 // baseGradedBlock is an spr set that has been graded
 type baseGradedBlock struct {
 	sprs   []*GradingSPR
@@ -64,17 +59,4 @@ func (b *baseGradedBlock) filterDuplicates() {
 	b.sprs = filtered
 }
 
-// randomize the SPRs order.
-func (b *baseGradedBlock) shuffleSPRs() {
-	r := rand.New(rand.NewSource(time.Now().Unix()))
-	ret := make([]*GradingSPR, len(b.sprs))
-	n := len(b.sprs)
-	for i := 0; i < n; i++ {
-		randIndex := r.Intn(len(b.sprs))
-		ret[i] = b.sprs[randIndex]
-		b.sprs = append(b.sprs[:randIndex], b.sprs[randIndex+1:]...)
-	}
-	b.sprs = ret
-}
-
 func (b *baseGradedBlock) Cutoff() int { return b.cutoff }

modules/graderStake/s2grader.go

@@ -11,7 +11,7 @@ type S2BlockGrader struct {
 
 // Version 6
 func (s2 *S2BlockGrader) Version() uint8 {
-	return 6
+	return 5
 }
 
 // WinnerAmount is the number of SPRs that receive a payout

modules/graderStake/s3grader.go

@@ -51,7 +51,6 @@ func (s3 *S3BlockGrader) GradeCustom(cutoff int) GradedBlock {
 	block.height = s3.height
 	block.cloneSPRS(s3.sprs)
 	block.filterDuplicates()
-	block.shuffleSPRs()
 	block.grade()
 	return block
 }