Fixes some build issues when importing flow-go as a dependency

engine/consensus/dkg/reactor_engine_test.go

@@ -1,4 +1,4 @@
-package dkg
+package dkg_test
 
 import (
 	"math/rand"
@@ -10,6 +10,7 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
+	"github.com/onflow/flow-go/engine/consensus/dkg"
 	dkgmodel "github.com/onflow/flow-go/model/dkg"
 	"github.com/onflow/flow-go/model/flow"
 	dkgmodule "github.com/onflow/flow-go/module/dkg"
@@ -52,7 +53,7 @@ func TestEpochSetup(t *testing.T) {
 	// create a block for each view of interest
 	blocks := make(map[uint64]*flow.Header)
 	var view uint64
-	for view = 100; view <= 250; view += DefaultPollStep {
+	for view = 100; view <= 250; view += dkg.DefaultPollStep {
 		header := unittest.BlockHeaderFixture()
 		header.View = view
 		blocks[view] = &header
@@ -116,7 +117,7 @@ func TestEpochSetup(t *testing.T) {
 	).Return(controller, nil)
 
 	viewEvents := gadgets.NewViews()
-	engine := NewReactorEngine(
+	engine := dkg.NewReactorEngine(
 		unittest.Logger(),
 		me,
 		state,
@@ -127,7 +128,7 @@ func TestEpochSetup(t *testing.T) {
 
 	engine.EpochSetupPhaseStarted(currentCounter, firstBlock)
 
-	for view = 100; view <= 250; view += DefaultPollStep {
+	for view = 100; view <= 250; view += dkg.DefaultPollStep {
 		viewEvents.BlockFinalized(blocks[view])
 	}
 
@@ -192,7 +193,7 @@ func TestReactorEngine_EpochCommittedPhaseStarted(t *testing.T) {
 	})
 	logger := zerolog.New(os.Stdout).Level(zerolog.WarnLevel).Hook(hook)
 
-	engine := NewReactorEngine(
+	engine := dkg.NewReactorEngine(
 		logger,
 		me,
 		state,

go.mod

@@ -47,7 +47,7 @@ require (
 	github.com/onflow/flow-core-contracts/lib/go/templates v0.7.9
 	github.com/onflow/flow-emulator v0.20.3
 	github.com/onflow/flow-go-sdk v0.21.0
-	github.com/onflow/flow-go/crypto v0.18.0
+	github.com/onflow/flow-go/crypto v0.21.3
 	github.com/onflow/flow/protobuf/go/flow v0.2.2
 	github.com/opentracing/opentracing-go v1.2.0
 	github.com/pelletier/go-toml v1.9.4 // indirect

integration/go.mod

@@ -23,7 +23,7 @@ require (
 	github.com/onflow/flow-emulator v0.20.3
 	github.com/onflow/flow-go v0.18.0 // replaced by version on-disk
 	github.com/onflow/flow-go-sdk v0.21.0
-	github.com/onflow/flow-go/crypto v0.18.0 // replaced by version on-disk
+	github.com/onflow/flow-go/crypto v0.21.3 // replaced by version on-disk
 	github.com/onflow/flow/protobuf/go/flow v0.2.2
 	github.com/plus3it/gorecurcopy v0.0.1
 	github.com/prometheus/common v0.20.0 // indirect

module/dkg.go

@@ -1,5 +1,3 @@
-// +build relic
-
 package module
 
 import (
@@ -49,10 +47,10 @@ type DKGController interface {
 	// encountered in one of the protocol phases.
 	Run() error
 
-	// EndPhase0 notifies the controller to end phase 1, and start phase 2.
+	// EndPhase1 notifies the controller to end phase 1, and start phase 2.
 	EndPhase1() error
 
-	// EndPhase1 notifies the controller to end phase 2, and start phase 3.
+	// EndPhase2 notifies the controller to end phase 2, and start phase 3.
 	EndPhase2() error
 
 	// End terminates the DKG state machine and records the artifacts.
@@ -85,34 +83,3 @@ type DKGControllerFactory interface {
 	// Create instantiates a new DKGController.
 	Create(dkgInstanceID string, participants flow.IdentityList, seed []byte) (DKGController, error)
 }
-
-// DKGBroker extends the crypto.DKGProcessor interface with methods that enable
-// a controller to access the channel of incoming messages, and actively fetch
-// new DKG broadcast messages.
-type DKGBroker interface {
-	crypto.DKGProcessor
-
-	// GetIndex returns the index of this node in the DKG committee list.
-	GetIndex() int
-
-	// GetPrivateMsgCh returns the channel through which a user can receive
-	// incoming private DKGMessages.
-	GetPrivateMsgCh() <-chan messages.DKGMessage
-
-	// GetBroadcastMsgCh returns the channel through which a user can receive
-	// incoming broadcast DKGMessages.
-	GetBroadcastMsgCh() <-chan messages.DKGMessage
-
-	// Poll instructs the broker to actively fetch broadcast messages (ex. read
-	// from DKG smart contract). The messages will be forwarded through the
-	// broker's message channel (cf. GetMsgCh). The method does not return until
-	// all received messages are processed by the consumer.
-	Poll(referenceBlock flow.Identifier) error
-
-	// SubmitResult instructs the broker to publish the results of the DKG run
-	// (ex. publish to DKG smart contract).
-	SubmitResult(crypto.PublicKey, []crypto.PublicKey) error
-
-	// Shutdown causes the broker to stop listening and forwarding messages.
-	Shutdown()
-}

module/dkg_broker.go

@@ -0,0 +1,40 @@
+// +build relic
+
+package module
+
+import (
+	"github.com/onflow/flow-go/crypto"
+	"github.com/onflow/flow-go/model/flow"
+	"github.com/onflow/flow-go/model/messages"
+)
+
+// DKGBroker extends the crypto.DKGProcessor interface with methods that enable
+// a controller to access the channel of incoming messages, and actively fetch
+// new DKG broadcast messages.
+type DKGBroker interface {
+	crypto.DKGProcessor
+
+	// GetIndex returns the index of this node in the DKG committee list.
+	GetIndex() int
+
+	// GetPrivateMsgCh returns the channel through which a user can receive
+	// incoming private DKGMessages.
+	GetPrivateMsgCh() <-chan messages.DKGMessage
+
+	// GetBroadcastMsgCh returns the channel through which a user can receive
+	// incoming broadcast DKGMessages.
+	GetBroadcastMsgCh() <-chan messages.DKGMessage
+
+	// Poll instructs the broker to actively fetch broadcast messages (ex. read
+	// from DKG smart contract). The messages will be forwarded through the
+	// broker's message channel (cf. GetMsgCh). The method does not return until
+	// all received messages are processed by the consumer.
+	Poll(referenceBlock flow.Identifier) error
+
+	// SubmitResult instructs the broker to publish the results of the DKG run
+	// (ex. publish to DKG smart contract).
+	SubmitResult(crypto.PublicKey, []crypto.PublicKey) error
+
+	// Shutdown causes the broker to stop listening and forwarding messages.
+	Shutdown()
+}