pr comments

x/btcstaking/keeper/voting_power_table_test.go

@@ -209,7 +209,7 @@ func FuzzVotingPowerTable_ActiveFinalityProviders(f *testing.F) {
 
 		maxActiveFpsParam := h.BTCStakingKeeper.GetParams(h.Ctx).MaxActiveFinalityProviders
 		// get a map of expected active finality providers
-		types.SortFinalityProvidersWithTimestampingAndJailing(fpsWithMeta)
+		types.SortFinalityProvidersWithZeroedVotingPower(fpsWithMeta)
 		expectedActiveFps := fpsWithMeta[:min(uint32(len(fpsWithMeta)-len(noTimestampedFps)), maxActiveFpsParam)]
 		expectedActiveFpsMap := map[string]uint64{}
 		for _, fp := range expectedActiveFps {

x/btcstaking/types/btcstaking.go

@@ -42,24 +42,24 @@ func (fp *FinalityProvider) ValidateBasic() error {
 	return nil
 }
 
-// SortFinalityProvidersWithTimestampingAndJailing sorts the finality providers slice,
-// from higher to lower voting power
-// finality providers that are timestamped come higher than
-// those are not
-func SortFinalityProvidersWithTimestampingAndJailing(fps []*FinalityProviderDistInfo) {
+// SortFinalityProvidersWithZeroedVotingPower sorts the finality providers slice,
+// from higher to lower voting power. In the following cases, the voting power
+// is treated as zero:
+// 1. IsTimestamped is false
+// 2. IsJailed is true
+func SortFinalityProvidersWithZeroedVotingPower(fps []*FinalityProviderDistInfo) {
 	sort.SliceStable(fps, func(i, j int) bool {
-		if fps[i].IsTimestamped && !fps[j].IsTimestamped {
-			return true
-		}
-		if !fps[i].IsTimestamped && fps[j].IsTimestamped {
+		iShouldBeZeroed := fps[i].IsJailed || !fps[i].IsTimestamped
+		jShouldBeZeroed := fps[j].IsJailed || !fps[j].IsTimestamped
+
+		if iShouldBeZeroed && !jShouldBeZeroed {
 			return false
 		}
-		if !fps[i].IsJailed && fps[j].IsJailed {
+
+		if !iShouldBeZeroed && jShouldBeZeroed {
 			return true
 		}
-		if fps[i].IsJailed && !fps[j].IsJailed {
-			return false
-		}
+
 		return fps[i].TotalVotingPower > fps[j].TotalVotingPower
 	})
 }

x/btcstaking/types/incentive.go

@@ -40,7 +40,7 @@ func (dc *VotingPowerDistCache) FindNewActiveFinalityProviders(prevDc *VotingPow
 // and records them in cache
 func (dc *VotingPowerDistCache) ApplyActiveFinalityProviders(maxActiveFPs uint32) {
 	// sort finality providers with timestamping considered
-	SortFinalityProvidersWithTimestampingAndJailing(dc.FinalityProviders)
+	SortFinalityProvidersWithZeroedVotingPower(dc.FinalityProviders)
 
 	numActiveFPs := uint32(0)