Bladeren bron

use more aggressive write cache policy

fudongbai 4 jaren geleden
bovenliggende
commit
1f3e0606ee
2 gewijzigde bestanden met toevoegingen van 10 en 4 verwijderingen
  1. 1 1
      consensus/parlia/parlia.go
  2. 9 3
      consensus/parlia/snapshot.go

+ 1 - 1
consensus/parlia/parlia.go

@@ -868,7 +868,7 @@ func (p *Parlia) EnoughDistance(chain consensus.ChainReader, header *types.Heade
 	if err != nil {
 		return true
 	}
-	return snap.enoughDistance(p.val)
+	return snap.enoughDistance(p.val, header)
 }
 
 // CalcDifficulty is the difficulty adjustment algorithm. It returns the difficulty

+ 9 - 3
consensus/parlia/snapshot.go

@@ -244,17 +244,23 @@ func (s *Snapshot) inturn(validator common.Address) bool {
 	return validators[offset] == validator
 }
 
-func (s *Snapshot) enoughDistance(validator common.Address) bool {
+func (s *Snapshot) enoughDistance(validator common.Address, header *types.Header) bool {
 	idx := s.indexOfVal(validator)
 	if idx < 0 {
 		return true
 	}
 	validatorNum := int64(len(s.validators()))
+	if validatorNum == 1 {
+		return true
+	}
+	if validator == header.Coinbase {
+		return false
+	}
 	offset := (int64(s.Number) + 1) % int64(validatorNum)
 	if int64(idx) >= offset {
-		return int64(idx)-offset >= validatorNum/2
+		return int64(idx)-offset >= validatorNum-2
 	} else {
-		return validatorNum+int64(idx)-offset >= validatorNum/2
+		return validatorNum+int64(idx)-offset >= validatorNum-2
 	}
 }