Consolidate beta

config/config.go

@@ -59,12 +59,8 @@ const (
 var (
 	// Deprecated key --> deprecation message (i.e. which key replaces it)
 	// TODO: deprecate "BootstrapIDsKey" and "BootstrapIPsKey"
-	commitThresholdDeprecationMsg = fmt.Sprintf("use --%s instead", SnowCommitThresholdKey)
-	deprecatedKeys                = map[string]string{
+	deprecatedKeys = map[string]string{
 		KeystoreAPIEnabledKey: keystoreDeprecationMsg,
-
-		SnowRogueCommitThresholdKey:    commitThresholdDeprecationMsg,
-		SnowVirtuousCommitThresholdKey: commitThresholdDeprecationMsg,
 	}
 
 	errConflictingACPOpinion                  = errors.New("supporting and objecting to the same ACP")
@@ -95,8 +91,7 @@ func getConsensusConfig(v *viper.Viper) snowball.Parameters {
 		K:                     v.GetInt(SnowSampleSizeKey),
 		AlphaPreference:       v.GetInt(SnowPreferenceQuorumSizeKey),
 		AlphaConfidence:       v.GetInt(SnowConfidenceQuorumSizeKey),
-		BetaVirtuous:          v.GetInt(SnowCommitThresholdKey),
-		BetaRogue:             v.GetInt(SnowCommitThresholdKey),
+		Beta:                  v.GetInt(SnowCommitThresholdKey),
 		ConcurrentRepolls:     v.GetInt(SnowConcurrentRepollsKey),
 		OptimalProcessing:     v.GetInt(SnowOptimalProcessingKey),
 		MaxOutstandingItems:   v.GetInt(SnowMaxProcessingKey),
@@ -106,10 +101,6 @@ func getConsensusConfig(v *viper.Viper) snowball.Parameters {
 		p.AlphaPreference = v.GetInt(SnowQuorumSizeKey)
 		p.AlphaConfidence = p.AlphaPreference
 	}
-	if v.IsSet(SnowRogueCommitThresholdKey) {
-		p.BetaVirtuous = v.GetInt(SnowRogueCommitThresholdKey)
-		p.BetaRogue = v.GetInt(SnowRogueCommitThresholdKey)
-	}
 	return p
 }
 

config/config.md

@@ -960,7 +960,7 @@ Snow consensus requires repolling transactions that are issued during low time
 of network usage. This parameter lets one define how aggressive the client will
 be in finalizing these pending transactions. This should only be changed after
 careful consideration of the tradeoffs of Snow consensus. The value must be at
-least `1` and at most `--snow-rogue-commit-threshold`. Defaults to `4`.
+least `1` and at most `--snow-commit-threshold`. Defaults to `4`.
 
 ##### `--snow-sample-size` (int)
 
@@ -977,21 +977,13 @@ transaction. This parameter lets us define the `alpha` value used for consensus.
 This should only be changed after careful consideration of the tradeoffs of Snow
 consensus. The value must be at greater than `k/2`. Defaults to `15`.
 
-##### `--snow-virtuous-commit-threshold` (int)
+##### `--snow-commit-threshold` (int)
 
-Snow consensus defines `beta1` as the number of consecutive polls that a
-virtuous transaction must increase its confidence for it to be accepted. This
-parameter lets us define the `beta1` value used for consensus. This should only
+Snow consensus defines `beta` as the number of consecutive polls that a
+container must increase its confidence for it to be accepted. This
+parameter lets us define the `beta` value used for consensus. This should only
 be changed after careful consideration of the tradeoffs of Snow consensus. The
-value must be at least `1`. Defaults to `15`.
-
-##### `--snow-rogue-commit-threshold` (int)
-
-Snow consensus defines `beta2` as the number of consecutive polls that a rogue
-transaction must increase its confidence for it to be accepted. This parameter
-lets us define the `beta2` value used for consensus. This should only be changed
-after careful consideration of the tradeoffs of Snow consensus. The value must
-be at least `beta1`. Defaults to `20`.
+value must be at least `1`. Defaults to `20`.
 
 ##### `--snow-optimal-processing` (int)
 

config/flags.go

@@ -291,10 +291,7 @@ func addNodeFlags(fs *pflag.FlagSet) {
 	fs.Int(SnowPreferenceQuorumSizeKey, snowball.DefaultParameters.AlphaPreference, fmt.Sprintf("Threshold of nodes required to update this node's preference in a network poll. Ignored if %s is provided", SnowQuorumSizeKey))
 	fs.Int(SnowConfidenceQuorumSizeKey, snowball.DefaultParameters.AlphaConfidence, fmt.Sprintf("Threshold of nodes required to increase this node's confidence in a network poll. Ignored if %s is provided", SnowQuorumSizeKey))
 
-	fs.Int(SnowCommitThresholdKey, snowball.DefaultParameters.BetaRogue, "Beta value to use for transactions")
-	// TODO: Remove these once enough time has passed with SnowCommitThresholdKey
-	fs.Int(SnowVirtuousCommitThresholdKey, snowball.DefaultParameters.BetaVirtuous, "This flag is temporarily ignored due to the X-chain linearization")
-	fs.Int(SnowRogueCommitThresholdKey, snowball.DefaultParameters.BetaRogue, "Beta value to use for rogue transactions")
+	fs.Int(SnowCommitThresholdKey, snowball.DefaultParameters.Beta, "Beta value to use for consensus")
 
 	fs.Int(SnowConcurrentRepollsKey, snowball.DefaultParameters.ConcurrentRepolls, "Minimum number of concurrent polls for finalizing consensus")
 	fs.Int(SnowOptimalProcessingKey, snowball.DefaultParameters.OptimalProcessing, "Optimal number of processing containers in consensus")

config/keys.go

@@ -123,8 +123,6 @@ const (
 	SnowQuorumSizeKey                                  = "snow-quorum-size"
 	SnowPreferenceQuorumSizeKey                        = "snow-preference-quorum-size"
 	SnowConfidenceQuorumSizeKey                        = "snow-confidence-quorum-size"
-	SnowVirtuousCommitThresholdKey                     = "snow-virtuous-commit-threshold"
-	SnowRogueCommitThresholdKey                        = "snow-rogue-commit-threshold"
 	SnowCommitThresholdKey                             = "snow-commit-threshold"
 	SnowConcurrentRepollsKey                           = "snow-concurrent-repolls"
 	SnowOptimalProcessingKey                           = "snow-optimal-processing"

snow/consensus/snowball/consensus.go

@@ -124,9 +124,8 @@ type Unary interface {
 	// Return whether a choice has been finalized
 	Finalized() bool
 
-	// Returns a new binary snowball instance with the agreement parameters
-	// transferred. Takes in the new beta value and the original choice
-	Extend(beta, originalPreference int) Binary
+	// Returns a new binary snowball instance with the original choice.
+	Extend(originalPreference int) Binary
 
 	// Returns a new unary snowflake instance with the same state
 	Clone() Unary

snow/consensus/snowball/consensus_performance_test.go

@@ -22,8 +22,7 @@ func TestDualAlphaOptimization(t *testing.T) {
 			K:               20,
 			AlphaPreference: 15,
 			AlphaConfidence: 15,
-			BetaVirtuous:    15,
-			BetaRogue:       20,
+			Beta:            20,
 		}
 		seed   uint64 = 0
 		source        = prng.NewMT19937()

snow/consensus/snowball/factory.go

@@ -13,23 +13,23 @@ var (
 type snowballFactory struct{}
 
 func (snowballFactory) NewNnary(params Parameters, choice ids.ID) Nnary {
-	sb := newNnarySnowball(params.BetaVirtuous, params.BetaRogue, choice)
+	sb := newNnarySnowball(params.Beta, choice)
 	return &sb
 }
 
 func (snowballFactory) NewUnary(params Parameters) Unary {
-	sb := newUnarySnowball(params.BetaVirtuous)
+	sb := newUnarySnowball(params.Beta)
 	return &sb
 }
 
 type snowflakeFactory struct{}
 
 func (snowflakeFactory) NewNnary(params Parameters, choice ids.ID) Nnary {
-	sf := newNnarySnowflake(params.BetaVirtuous, params.BetaRogue, choice)
+	sf := newNnarySnowflake(params.Beta, choice)
 	return &sf
 }
 
 func (snowflakeFactory) NewUnary(params Parameters) Unary {
-	sf := newUnarySnowflake(params.BetaVirtuous)
+	sf := newUnarySnowflake(params.Beta)
 	return &sf
 }

snow/consensus/snowball/flat_test.go

@@ -18,8 +18,7 @@ func TestFlat(t *testing.T) {
 		K:               3,
 		AlphaPreference: 2,
 		AlphaConfidence: 3,
-		BetaVirtuous:    1,
-		BetaRogue:       2,
+		Beta:            2,
 	}
 	f := NewFlat(SnowballFactory, params, Red)
 	f.Add(Green)
@@ -51,7 +50,7 @@ func TestFlat(t *testing.T) {
 
 	require.True(f.RecordPoll(threeGreen))
 	require.Equal(Green, f.Preference())
-	require.False(f.Finalized()) // Not finalized before BetaRogue rounds
+	require.False(f.Finalized()) // Not finalized before Beta rounds
 
 	require.True(f.RecordPoll(threeGreen))
 	require.Equal(Green, f.Preference())

snow/consensus/snowball/nnary_snowball.go

@@ -11,9 +11,9 @@ import (
 
 var _ Nnary = (*nnarySnowball)(nil)
 
-func newNnarySnowball(betaVirtuous, betaRogue int, choice ids.ID) nnarySnowball {
+func newNnarySnowball(beta int, choice ids.ID) nnarySnowball {
 	return nnarySnowball{
-		nnarySnowflake:     newNnarySnowflake(betaVirtuous, betaRogue, choice),
+		nnarySnowflake:     newNnarySnowflake(beta, choice),
 		preference:         choice,
 		preferenceStrength: make(map[ids.ID]int),
 	}

snow/consensus/snowball/nnary_snowball_test.go

@@ -12,10 +12,9 @@ import (
 func TestNnarySnowball(t *testing.T) {
 	require := require.New(t)
 
-	betaVirtuous := 2
-	betaRogue := 2
+	beta := 2
 
-	sb := newNnarySnowball(betaVirtuous, betaRogue, Red)
+	sb := newNnarySnowball(beta, Red)
 	sb.Add(Blue)
 	sb.Add(Green)
 
@@ -54,10 +53,9 @@ func TestNnarySnowball(t *testing.T) {
 func TestVirtuousNnarySnowball(t *testing.T) {
 	require := require.New(t)
 
-	betaVirtuous := 1
-	betaRogue := 2
+	beta := 1
 
-	sb := newNnarySnowball(betaVirtuous, betaRogue, Red)
+	sb := newNnarySnowball(beta, Red)
 
 	require.Equal(Red, sb.Preference())
 	require.False(sb.Finalized())
@@ -70,10 +68,9 @@ func TestVirtuousNnarySnowball(t *testing.T) {
 func TestNarySnowballRecordUnsuccessfulPoll(t *testing.T) {
 	require := require.New(t)
 
-	betaVirtuous := 2
-	betaRogue := 2
+	beta := 2
 
-	sb := newNnarySnowball(betaVirtuous, betaRogue, Red)
+	sb := newNnarySnowball(beta, Red)
 	sb.Add(Blue)
 
 	require.Equal(Red, sb.Preference())
@@ -109,10 +106,9 @@ func TestNarySnowballRecordUnsuccessfulPoll(t *testing.T) {
 func TestNarySnowballDifferentSnowflakeColor(t *testing.T) {
 	require := require.New(t)
 
-	betaVirtuous := 2
-	betaRogue := 2
+	beta := 2
 
-	sb := newNnarySnowball(betaVirtuous, betaRogue, Red)
+	sb := newNnarySnowball(beta, Red)
 	sb.Add(Blue)
 
 	require.Equal(Red, sb.Preference())

snow/consensus/snowball/nnary_snowflake.go

@@ -11,11 +11,10 @@ import (
 
 var _ Nnary = (*nnarySnowflake)(nil)
 
-func newNnarySnowflake(betaVirtuous, betaRogue int, choice ids.ID) nnarySnowflake {
+func newNnarySnowflake(beta int, choice ids.ID) nnarySnowflake {
 	return nnarySnowflake{
-		nnarySlush:   newNnarySlush(choice),
-		betaVirtuous: betaVirtuous,
-		betaRogue:    betaRogue,
+		nnarySlush: newNnarySlush(choice),
+		beta:       beta,
 	}
 }
 
@@ -25,29 +24,20 @@ type nnarySnowflake struct {
 	// wrap the n-nary slush logic
 	nnarySlush
 
-	// betaVirtuous is the number of consecutive successful queries required for
-	// finalization on a virtuous instance.
-	betaVirtuous int
-
-	// betaRogue is the number of consecutive successful queries required for
-	// finalization on a rogue instance.
-	betaRogue int
+	// beta is the number of consecutive successful queries required for
+	// finalization.
+	beta int
 
 	// confidence tracks the number of successful polls in a row that have
 	// returned the preference
 	confidence int
 
-	// rogue tracks if this instance has multiple choices or only one
-	rogue bool
-
 	// finalized prevents the state from changing after the required number of
 	// consecutive polls has been reached
 	finalized bool
 }
 
-func (sf *nnarySnowflake) Add(choice ids.ID) {
-	sf.rogue = sf.rogue || choice != sf.preference
-}
+func (*nnarySnowflake) Add(_ ids.ID) {}
 
 func (sf *nnarySnowflake) RecordSuccessfulPoll(choice ids.ID) {
 	if sf.finalized {
@@ -62,8 +52,7 @@ func (sf *nnarySnowflake) RecordSuccessfulPoll(choice ids.ID) {
 		sf.confidence = 1
 	}
 
-	sf.finalized = (!sf.rogue && sf.confidence >= sf.betaVirtuous) ||
-		sf.confidence >= sf.betaRogue
+	sf.finalized = sf.confidence >= sf.beta
 	sf.nnarySlush.RecordSuccessfulPoll(choice)
 }
 

snow/consensus/snowball/nnary_snowflake_test.go

@@ -12,10 +12,9 @@ import (
 func TestNnarySnowflake(t *testing.T) {
 	require := require.New(t)
 
-	betaVirtuous := 2
-	betaRogue := 2
+	beta := 2
 
-	sf := newNnarySnowflake(betaVirtuous, betaRogue, Red)
+	sf := newNnarySnowflake(beta, Red)
 	sf.Add(Blue)
 	sf.Add(Green)
 
@@ -50,25 +49,24 @@ func TestNnarySnowflake(t *testing.T) {
 func TestNnarySnowflakeConfidenceReset(t *testing.T) {
 	require := require.New(t)
 
-	betaVirtuous := 4
-	betaRogue := 4
+	beta := 4
 
-	sf := newNnarySnowflake(betaVirtuous, betaRogue, Red)
+	sf := newNnarySnowflake(beta, Red)
 	sf.Add(Blue)
 	sf.Add(Green)
 
 	require.Equal(Red, sf.Preference())
 	require.False(sf.Finalized())
 
 	// Increase Blue's confidence without finalizing
-	for i := 0; i < betaRogue-1; i++ {
+	for i := 0; i < beta-1; i++ {
 		sf.RecordSuccessfulPoll(Blue)
 		require.Equal(Blue, sf.Preference())
 		require.False(sf.Finalized())
 	}
 
 	// Increase Red's confidence without finalizing
-	for i := 0; i < betaRogue-1; i++ {
+	for i := 0; i < beta-1; i++ {
 		sf.RecordSuccessfulPoll(Red)
 		require.Equal(Red, sf.Preference())
 		require.False(sf.Finalized())
@@ -83,40 +81,9 @@ func TestNnarySnowflakeConfidenceReset(t *testing.T) {
 func TestVirtuousNnarySnowflake(t *testing.T) {
 	require := require.New(t)
 
-	betaVirtuous := 2
-	betaRogue := 3
-
-	sb := newNnarySnowflake(betaVirtuous, betaRogue, Red)
-	require.Equal(Red, sb.Preference())
-	require.False(sb.Finalized())
-
-	sb.RecordSuccessfulPoll(Red)
-	require.Equal(Red, sb.Preference())
-	require.False(sb.Finalized())
-
-	sb.RecordSuccessfulPoll(Red)
-	require.Equal(Red, sb.Preference())
-	require.True(sb.Finalized())
-}
-
-func TestRogueNnarySnowflake(t *testing.T) {
-	require := require.New(t)
-
-	betaVirtuous := 1
-	betaRogue := 2
-
-	sb := newNnarySnowflake(betaVirtuous, betaRogue, Red)
-	require.False(sb.rogue)
-
-	sb.Add(Red)
-	require.False(sb.rogue)
-
-	sb.Add(Blue)
-	require.True(sb.rogue)
-
-	sb.Add(Red)
-	require.True(sb.rogue)
+	beta := 2
 
+	sb := newNnarySnowflake(beta, Red)
 	require.Equal(Red, sb.Preference())
 	require.False(sb.Finalized())