Fix Flakey DKG Tests

integration/dkg/dkg_client_wrapper.go

@@ -14,6 +14,8 @@ import (
 	dkgmod "github.com/onflow/flow-go/module/dkg"
 )
 
+var errClientDisabled = fmt.Errorf("dkg client artifically disabled for tests")
+
 // DKGClientWrapper implements the DKGContractClient interface , and provides a
 // mechanism to simulate a situations where the DKG node cannot access the DKG
 // smart-contract. The client can be disabled so that all requests to the
@@ -59,23 +61,23 @@ func (c *DKGClientWrapper) WaitForSealed(ctx context.Context, txID sdk.Identifie
 // Broadcast implements the DKGContractClient interface
 func (c *DKGClientWrapper) Broadcast(msg model.BroadcastDKGMessage) error {
 	if !c.enabled {
-		return fmt.Errorf("failed to broadcast DKG message")
+		return fmt.Errorf("failed to broadcast DKG message: %w", errClientDisabled)
 	}
 	return c.client.Broadcast(msg)
 }
 
 // ReadBroadcast implements the DKGContractClient interface
 func (c *DKGClientWrapper) ReadBroadcast(fromIndex uint, referenceBlock flow.Identifier) ([]messages.BroadcastDKGMessage, error) {
 	if !c.enabled {
-		return []messages.BroadcastDKGMessage{}, fmt.Errorf("failed to read DKG broadcast messages")
+		return []messages.BroadcastDKGMessage{}, fmt.Errorf("failed to read DKG broadcast messages: %w", errClientDisabled)
 	}
 	return c.client.ReadBroadcast(fromIndex, referenceBlock)
 }
 
 // SubmitResult implements the DKGContractClient interface
 func (c *DKGClientWrapper) SubmitResult(groupPubKey crypto.PublicKey, pubKeys []crypto.PublicKey) error {
 	if !c.enabled {
-		return fmt.Errorf("failed to submit DKG result")
+		return fmt.Errorf("failed to submit DKG result: %w", errClientDisabled)
 	}
 	return c.client.SubmitResult(groupPubKey, pubKeys)
 }

integration/dkg/dkg_emulator_suite.go

@@ -2,7 +2,6 @@ package dkg
 
 import (
 	"fmt"
-	"github.com/onflow/flow-go/module"
 	"os"
 
 	"github.com/rs/zerolog"
@@ -20,12 +19,14 @@ import (
 	sdkcrypto "github.com/onflow/flow-go-sdk/crypto"
 	sdktemplates "github.com/onflow/flow-go-sdk/templates"
 	"github.com/onflow/flow-go-sdk/test"
+
 	dkgeng "github.com/onflow/flow-go/engine/consensus/dkg"
 	"github.com/onflow/flow-go/engine/testutil"
 	"github.com/onflow/flow-go/fvm"
 	"github.com/onflow/flow-go/integration/tests/common"
 	"github.com/onflow/flow-go/model/bootstrap"
 	"github.com/onflow/flow-go/model/flow"
+	"github.com/onflow/flow-go/module"
 	"github.com/onflow/flow-go/module/dkg"
 	emulatormod "github.com/onflow/flow-go/module/emulator"
 	"github.com/onflow/flow-go/network/stub"
@@ -309,7 +310,8 @@ func (s *DKGSuite) startDKGWithParticipants(accounts []*nodeAccount) {
 
 	// sanity check: verify that DKG was started with correct node IDs
 	result := s.executeScript(templates.GenerateGetConsensusNodesScript(s.env), nil)
-	assert.Equal(s.T(), cadence.NewArray(valueNodeIDs), result)
+	require.IsType(s.T(), cadence.Array{}, result)
+	assert.ElementsMatch(s.T(), valueNodeIDs, result.(cadence.Array).Values)
 }
 
 func (s *DKGSuite) claimDKGParticipant(node *node) {

integration/dkg/dkg_emulator_test.go

@@ -108,6 +108,12 @@ func (s *DKGSuite) runTest(goodNodes int, emulatorProblems bool) {
 		}
 	}
 
+	// before ending the test and awaiting successful completion, ensure we leave
+	// the dkg client in an enabled state
+	for _, node := range nodes {
+		node.dkgContractClient.Enable()
+	}
+
 	for _, n := range nodes {
 		n.Done()
 	}