Fix BCCSP race

Signed-off-by: Liran Funaro <liran.funaro@gmail.com>

Author: liran-funaro

cmd/config/cobra_test_exports.go

@@ -131,18 +131,17 @@ func UnitTestRunner(
 	t.Cleanup(cancel)
 
 	wg.Add(1)
-	go func() {
+	wg.Go(func() {
 		t.Logf("Starting command: %s", args[0])
 		defer t.Logf("Command exited: %s", args[0])
-		defer wg.Done()
-		_, err := cmd.ExecuteContextC(ctx)
-		err = connection.FilterStreamRPCError(err)
+		_, execErr := cmd.ExecuteContextC(ctx)
+		execErr = connection.FilterStreamRPCError(execErr)
 		if cmdTest.Err == nil {
-			assert.NoError(t, err)
-		} else if assert.Error(t, err) {
-			assert.Equal(t, cmdTest.Err.Error(), err.Error())
+			assert.NoError(t, execErr)
+		} else if assert.Error(t, execErr) {
+			assert.Equal(t, cmdTest.Err.Error(), execErr.Error())
 		}
-	}()
+	})
 
 	assert.Eventually(t, func() bool {
 		return len(getMissing(cmdTest, cmdStdOut.String(), loggerPath)) == 0

service/verifier/main_test.go

@@ -0,0 +1,18 @@
+/*
+Copyright IBM Corp. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
+
+package verifier
+
+import (
+	"testing"
+
+	"github.com/hyperledger/fabric-lib-go/bccsp/factory"
+)
+
+func TestMain(m *testing.M) {
+	_ = factory.InitFactories(nil)
+	m.Run()
+}

service/verifier/policy/main_test.go

@@ -0,0 +1,18 @@
+/*
+Copyright IBM Corp. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
+
+package policy
+
+import (
+	"testing"
+
+	"github.com/hyperledger/fabric-lib-go/bccsp/factory"
+)
+
+func TestMain(m *testing.M) {
+	_ = factory.InitFactories(nil)
+	m.Run()
+}

service/verifier/policy/policy_test.go

@@ -119,9 +119,6 @@ func TestParsePolicyItem(t *testing.T) {
 func TestParseLifecycleEndorsementPolicy(t *testing.T) {
 	t.Parallel()
 
-	// Initialize factory before parallel subtests to avoid data race
-	require.NotNil(t, factory.GetDefault())
-
 	t.Run("valid bundle returns verifier", func(t *testing.T) {
 		t.Parallel()
 		bundle, cryptoPath := createTestBundle(t)

service/verifier/verifier_server.go

@@ -10,6 +10,7 @@ import (
 	"context"
 
 	"github.com/cockroachdb/errors"
+	"github.com/hyperledger/fabric-lib-go/bccsp/factory"
 	"github.com/hyperledger/fabric-lib-go/common/flogging"
 	"github.com/hyperledger/fabric-x-common/api/committerpb"
 	"golang.org/x/sync/errgroup"
@@ -42,6 +43,7 @@ var (
 // New instantiate a new VerifierServer.
 func New(config *Config) *Server {
 	logger.Info("Initializing new verifier server")
+	_ = factory.InitFactories(nil)
 	return &Server{
 		config:      config,
 		metrics:     newMonitoring(),

utils/signature/main_test.go

@@ -0,0 +1,18 @@
+/*
+Copyright IBM Corp. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
+
+package signature
+
+import (
+	"testing"
+
+	"github.com/hyperledger/fabric-lib-go/bccsp/factory"
+)
+
+func TestMain(m *testing.M) {
+	_ = factory.InitFactories(nil)
+	m.Run()
+}