Replace snowball/snowflake interface with single shared snow interface

snow/consensus/snowball/binary_slush.go

@@ -5,8 +5,6 @@ package snowball
 
 import "fmt"
 
-var _ BinarySlush = (*binarySlush)(nil)
-
 func newBinarySlush(choice int) binarySlush {
 	return binarySlush{
 		preference: choice,

snow/consensus/snowball/binary_snowball.go

@@ -5,7 +5,7 @@ package snowball
 
 import "fmt"
 
-var _ BinarySnowball = (*binarySnowball)(nil)
+var _ BinarySnow = (*binarySnowball)(nil)
 
 func newBinarySnowball(beta, choice int) binarySnowball {
 	return binarySnowball{

snow/consensus/snowball/binary_snowflake.go

@@ -5,7 +5,7 @@ package snowball
 
 import "fmt"
 
-var _ BinarySnowflake = (*binarySnowflake)(nil)
+var _ BinarySnow = (*binarySnowflake)(nil)
 
 func newBinarySnowflake(beta, choice int) binarySnowflake {
 	return binarySnowflake{

snow/consensus/snowball/consensus.go

@@ -40,15 +40,19 @@ type Consensus interface {
 	Finalized() bool
 }
 
-// NnarySnowball augments NnarySnowflake with a counter that tracks the total
-// number of positive responses from a network sample.
-type NnarySnowball interface{ NnarySnowflake }
-
-// NnarySnowflake is a snowflake instance deciding between an unbounded number
-// of values. After performing a network sample of k nodes, if you have alpha
-// votes for one of the choices, you should vote for that choice. Otherwise, you
-// should reset.
-type NnarySnowflake interface {
+// ConsensusFactory produces NnarySnowflake instances
+type ConsensusFactory interface {
+	New(params Parameters, choice ids.ID) NnarySnow
+	NewUnary(params Parameters) UnarySnow
+}
+
+// NnarySnow is a snow instance deciding between an unbounded number
+// of values.
+// The caller samples k nodes and then calls
+// 1. RecordSuccessfulPoll if choice collects >= alphaConfidence votes
+// 2. RecordPollPreference if choice collects >= alphaPreference votes
+// 3. RecordUnsuccessfulPoll otherwise
+type NnarySnow interface {
 	fmt.Stringer
 
 	// Adds a new possible choice
@@ -73,29 +77,12 @@ type NnarySnowflake interface {
 	Finalized() bool
 }
 
-// NnarySlush is a slush instance deciding between an unbounded number of
-// values. After performing a network sample of k nodes, if you have alpha
-// votes for one of the choices, you should vote for that choice.
-type NnarySlush interface {
-	fmt.Stringer
-
-	// Returns the currently preferred choice to be finalized
-	Preference() ids.ID
-
-	// RecordSuccessfulPoll records a successful poll towards finalizing the
-	// specified choice. Assumes the choice was previously added.
-	RecordSuccessfulPoll(choice ids.ID)
-}
-
-// BinarySnowball augments BinarySnowflake with a counter that tracks the total
-// number of positive responses from a network sample.
-type BinarySnowball interface{ BinarySnowflake }
-
-// BinarySnowflake is a snowball instance deciding between two values
-// After performing a network sample of k nodes, if you have alpha votes for
-// one of the choices, you should vote for that choice. Otherwise, you should
-// reset.
-type BinarySnowflake interface {
+// BinarySnow is a snow instance deciding between two values.
+// The caller samples k nodes and then calls
+// 1. RecordSuccessfulPoll if choice collects >= alphaConfidence votes
+// 2. RecordPollPreference if choice collects >= alphaPreference votes
+// 3. RecordUnsuccessfulPoll otherwise
+type BinarySnow interface {
 	fmt.Stringer
 
 	// Returns the currently preferred choice to be finalized
@@ -116,31 +103,20 @@ type BinarySnowflake interface {
 	Finalized() bool
 }
 
-// BinarySlush is a slush instance deciding between two values. After performing
-// a network sample of k nodes, if you have alpha votes for one of the choices,
-// you should vote for that choice.
-type BinarySlush interface {
-	fmt.Stringer
-
-	// Returns the currently preferred choice to be finalized
-	Preference() int
-
-	// RecordSuccessfulPoll records a successful poll towards finalizing the
-	// specified choice
-	RecordSuccessfulPoll(choice int)
-}
-
-// UnarySnowball is a snowball instance deciding on one value. After performing
-// a network sample of k nodes, if you have alpha votes for the choice, you
-// should vote. Otherwise, you should reset.
-type UnarySnowball interface {
+// UnarySnow is a snow instance deciding on one value.
+// The caller samples k nodes and then calls
+// 1. RecordSuccessfulPoll if choice collects >= alphaConfidence votes
+// 2. RecordPollPreference if choice collects >= alphaPreference votes
+// 3. RecordUnsuccessfulPoll otherwise
+type UnarySnow interface {
 	fmt.Stringer
 
-	// RecordSuccessfulPoll records a successful poll towards finalizing
+	// RecordSuccessfulPoll records a successful poll that reaches an alpha
+	// confidence threshold.
 	RecordSuccessfulPoll()
 
-	// RecordPollPreference records a poll that strengthens the preference but
-	// did not contribute towards finalizing
+	// RecordPollPreference records a poll that receives an alpha preference
+	// threshold, but not an alpha confidence threshold.
 	RecordPollPreference()
 
 	// RecordUnsuccessfulPoll resets the snowflake counter of this instance
@@ -151,31 +127,8 @@ type UnarySnowball interface {
 
 	// 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) BinarySnowball
-
-	// Returns a new unary snowball instance with the same state
-	Clone() UnarySnowball
-}
-
-// UnarySnowflake is a snowflake instance deciding on one value. After
-// performing a network sample of k nodes, if you have alpha votes for the
-// choice, you should vote. Otherwise, you should reset.
-type UnarySnowflake interface {
-	fmt.Stringer
-
-	// RecordSuccessfulPoll records a successful poll towards finalizing
-	RecordSuccessfulPoll()
-
-	// RecordUnsuccessfulPoll resets the snowflake counter of this instance
-	RecordUnsuccessfulPoll()
-
-	// 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) BinarySnowflake
+	Extend(beta, originalPreference int) BinarySnow
 
 	// Returns a new unary snowflake instance with the same state
-	Clone() UnarySnowflake
+	Clone() UnarySnow
 }

snow/consensus/snowball/consensus_performance_test.go

@@ -29,10 +29,10 @@ func TestDualAlphaOptimization(t *testing.T) {
 		source        = prng.NewMT19937()
 	)
 
-	singleAlphaNetwork := NewNetwork(params, numColors, source)
+	singleAlphaNetwork := NewNetwork(SnowballFactory{}, params, numColors, source)
 
 	params.AlphaPreference = params.K/2 + 1
-	dualAlphaNetwork := NewNetwork(params, numColors, source)
+	dualAlphaNetwork := NewNetwork(SnowballFactory{}, params, numColors, source)
 
 	source.Seed(seed)
 	for i := 0; i < numNodes; i++ {
@@ -62,8 +62,8 @@ func TestTreeConvergenceOptimization(t *testing.T) {
 		source           = prng.NewMT19937()
 	)
 
-	treeNetwork := NewNetwork(params, numColors, source)
-	flatNetwork := NewNetwork(params, numColors, source)
+	treeNetwork := NewNetwork(SnowballFactory{}, params, numColors, source)
+	flatNetwork := NewNetwork(SnowballFactory{}, params, numColors, source)
 
 	source.Seed(seed)
 	for i := 0; i < numNodes; i++ {

snow/consensus/snowball/consensus_reversibility_test.go

@@ -23,7 +23,7 @@ func TestSnowballGovernance(t *testing.T) {
 		source              = prng.NewMT19937()
 	)
 
-	nBitwise := NewNetwork(params, numColors, source)
+	nBitwise := NewNetwork(SnowballFactory{}, params, numColors, source)
 
 	source.Seed(seed)
 	for i := 0; i < numRed; i++ {

snow/consensus/snowball/consensus_test.go

@@ -16,7 +16,7 @@ var (
 	_ Consensus = (*Byzantine)(nil)
 )
 
-func NewByzantine(_ Parameters, choice ids.ID) Consensus {
+func NewByzantine(_ ConsensusFactory, _ Parameters, choice ids.ID) Consensus {
 	return &Byzantine{
 		preference: choice,
 	}

snow/consensus/snowball/flat.go

@@ -10,17 +10,19 @@ import (
 
 var _ Consensus = (*Flat)(nil)
 
-func NewFlat(params Parameters, choice ids.ID) Consensus {
+func NewFlat(factory ConsensusFactory, params Parameters, choice ids.ID) Consensus {
+	sf := factory.New(params, choice)
+
 	return &Flat{
-		nnarySnowball: newNnarySnowball(params.BetaVirtuous, params.BetaRogue, choice),
-		params:        params,
+		NnarySnow: sf,
+		params:    params,
 	}
 }
 
-// Flat is a naive implementation of a multi-choice snowball instance
+// Flat is a naive implementation of a multi-choice snow instance
 type Flat struct {
 	// wraps the n-nary snowball logic
-	nnarySnowball
+	NnarySnow
 
 	// params contains all the configurations of a snowball instance
 	params Parameters

snow/consensus/snowball/flat_test.go

@@ -21,7 +21,7 @@ func TestFlat(t *testing.T) {
 		BetaVirtuous:    1,
 		BetaRogue:       2,
 	}
-	f := NewFlat(params, Red)
+	f := NewFlat(SnowballFactory{}, params, Red)
 	f.Add(Green)
 	f.Add(Blue)
 

snow/consensus/snowball/network_test.go

@@ -9,20 +9,22 @@ import (
 	"github.com/ava-labs/avalanchego/utils/sampler"
 )
 
-type newConsensusFunc func(params Parameters, choice ids.ID) Consensus
+type newConsensusFunc func(cf ConsensusFactory, params Parameters, choice ids.ID) Consensus
 
 type Network struct {
 	params         Parameters
 	colors         []ids.ID
 	rngSource      sampler.Source
 	nodes, running []Consensus
+	cf             ConsensusFactory
 }
 
 // Create a new network with [numColors] different possible colors to finalize.
-func NewNetwork(params Parameters, numColors int, rngSource sampler.Source) *Network {
+func NewNetwork(cf ConsensusFactory, params Parameters, numColors int, rngSource sampler.Source) *Network {
 	n := &Network{
 		params:    params,
 		rngSource: rngSource,
+		cf:        cf,
 	}
 	for i := 0; i < numColors; i++ {
 		n.colors = append(n.colors, ids.Empty.Prefix(uint64(i)))
@@ -35,7 +37,7 @@ func (n *Network) AddNode(newConsensusFunc newConsensusFunc) Consensus {
 	s.Initialize(uint64(len(n.colors)))
 	indices, _ := s.Sample(len(n.colors))
 
-	consensus := newConsensusFunc(n.params, n.colors[int(indices[0])])
+	consensus := newConsensusFunc(n.cf, n.params, n.colors[int(indices[0])])
 	for _, index := range indices[1:] {
 		consensus.Add(n.colors[int(index)])
 	}
@@ -56,7 +58,7 @@ func (n *Network) AddNodeSpecificColor(
 	initialPreference int,
 	options []int,
 ) Consensus {
-	consensus := newConsensusFunc(n.params, n.colors[initialPreference])
+	consensus := newConsensusFunc(n.cf, n.params, n.colors[initialPreference])
 
 	for _, i := range options {
 		consensus.Add(n.colors[i])

snow/consensus/snowball/nnary_slush.go

@@ -9,8 +9,6 @@ import (
 	"github.com/ava-labs/avalanchego/ids"
 )
 
-var _ NnarySlush = (*nnarySlush)(nil)
-
 func newNnarySlush(choice ids.ID) nnarySlush {
 	return nnarySlush{
 		preference: choice,

snow/consensus/snowball/nnary_snowball.go

@@ -9,7 +9,22 @@ import (
 	"github.com/ava-labs/avalanchego/ids"
 )
 
-var _ NnarySnowball = (*nnarySnowball)(nil)
+var (
+	_ NnarySnow        = (*nnarySnowball)(nil)
+	_ ConsensusFactory = SnowballFactory{}
+)
+
+type SnowballFactory struct{}
+
+func (SnowballFactory) New(params Parameters, choice ids.ID) NnarySnow {
+	sb := newNnarySnowball(params.BetaVirtuous, params.BetaRogue, choice)
+	return &sb
+}
+
+func (SnowballFactory) NewUnary(params Parameters) UnarySnow {
+	sb := newUnarySnowball(params.BetaVirtuous)
+	return &sb
+}
 
 func newNnarySnowball(betaVirtuous, betaRogue int, choice ids.ID) nnarySnowball {
 	return nnarySnowball{

snow/consensus/snowball/nnary_snowflake.go

@@ -9,7 +9,22 @@ import (
 	"github.com/ava-labs/avalanchego/ids"
 )
 
-var _ NnarySnowflake = (*nnarySnowflake)(nil)
+var (
+	_ NnarySnow        = (*nnarySnowflake)(nil)
+	_ ConsensusFactory = (SnowflakeFactory{})
+)
+
+type SnowflakeFactory struct{}
+
+func (SnowflakeFactory) New(params Parameters, choice ids.ID) NnarySnow {
+	sf := newNnarySnowflake(params.BetaVirtuous, params.BetaRogue, choice)
+	return &sf
+}
+
+func (SnowflakeFactory) NewUnary(params Parameters) UnarySnow {
+	sf := newUnarySnowflake(params.BetaVirtuous)
+	return &sf
+}
 
 func newNnarySnowflake(betaVirtuous, betaRogue int, choice ids.ID) nnarySnowflake {
 	return nnarySnowflake{