add fabric-protos-go-apiv2 and change github.com/golang/protobuf on g…

…oogle.golang.org/protobuf Signed-off-by: Fedor Partanskiy <fredprtnsk@gmail.com>
hyperledger · Sep 7, 2024 · 637026e · 637026e
1 parent cbee329
commit 637026e
Show file tree

Hide file tree

Showing 55 changed files with 849 additions and 531 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,27 @@
+#SPDX-License-Identifier: Apache-2.0
+.#*
+*~
+*#
+/bin
+/build
+/.build
+*.cov
+/docs/build/*
+.DS_Store
+.*-dummy
+.gradle
+.idea
+*.iml
+*.log
+.project
+/release
+report.xml
+results.xml
+.settings
+.*.sw*
+tags
+.tags
+TESTS*.xml
+.tox/
+.vagrant/
+.vscode
diff --git a/configtx/application.go b/configtx/application.go
@@ -10,9 +10,9 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/golang/protobuf/proto"
-	cb "github.com/hyperledger/fabric-protos-go/common"
-	pb "github.com/hyperledger/fabric-protos-go/peer"
+	cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
+	pb "github.com/hyperledger/fabric-protos-go-apiv2/peer"
+	"google.golang.org/protobuf/proto"
 )
 
 // Application is a copy of the orderer configuration with the addition of an anchor peers

diff --git a/configtx/application_test.go b/configtx/application_test.go
@@ -15,12 +15,12 @@ import (
 	"math/big"
 	"testing"
 
-	"github.com/golang/protobuf/proto"
 	"github.com/hyperledger/fabric-config/configtx/internal/policydsl"
 	"github.com/hyperledger/fabric-config/protolator"
 	"github.com/hyperledger/fabric-config/protolator/protoext/peerext"
-	cb "github.com/hyperledger/fabric-protos-go/common"
+	cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
 	. "github.com/onsi/gomega"
+	"google.golang.org/protobuf/proto"
 )
 
 func TestNewApplicationGroup(t *testing.T) {
@@ -106,7 +106,7 @@ func TestNewApplicationGroup(t *testing.T) {
 	expectedApplication := &cb.ConfigGroup{}
 	err = protolator.DeepUnmarshalJSON(bytes.NewBufferString(expectedApplicationGroup), expectedApplication)
 	gt.Expect(err).ToNot(HaveOccurred())
-	gt.Expect(applicationGroup).To(Equal(expectedApplication))
+	gt.Expect(proto.Equal(applicationGroup, expectedApplication)).To(BeTrue())
 }
 
 func TestNewApplicationGroupFailure(t *testing.T) {

diff --git a/configtx/capabilities.go b/configtx/capabilities.go
@@ -10,8 +10,8 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/golang/protobuf/proto"
-	cb "github.com/hyperledger/fabric-protos-go/common"
+	cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
+	"google.golang.org/protobuf/proto"
 )
 
 // capabilitiesValue returns the config definition for a set of capabilities.

diff --git a/configtx/channel.go b/configtx/channel.go
@@ -10,7 +10,7 @@ import (
 	"errors"
 	"fmt"
 
-	cb "github.com/hyperledger/fabric-protos-go/common"
+	cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
 )
 
 // ChannelGroup encapsulates the parts of the config that control channels.

diff --git a/configtx/channel_test.go b/configtx/channel_test.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/hyperledger/fabric-config/protolator"
 	"github.com/hyperledger/fabric-config/protolator/protoext/commonext"
-	cb "github.com/hyperledger/fabric-protos-go/common"
+	cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
 	. "github.com/onsi/gomega"
 )
 

diff --git a/configtx/config.go b/configtx/config.go
@@ -24,11 +24,10 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/golang/protobuf/proto"
-	"github.com/golang/protobuf/ptypes"
-	"github.com/golang/protobuf/ptypes/timestamp"
-	cb "github.com/hyperledger/fabric-protos-go/common"
-	mb "github.com/hyperledger/fabric-protos-go/msp"
+	cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
+	mb "github.com/hyperledger/fabric-protos-go-apiv2/msp"
+	"google.golang.org/protobuf/proto"
+	"google.golang.org/protobuf/types/known/timestamppb"
 )
 
 // Channel is a channel configuration.
@@ -535,11 +534,9 @@ func newEnvelope(
 // channelHeader creates a ChannelHeader.
 func channelHeader(headerType cb.HeaderType, version int32, channelID string, epoch uint64) *cb.ChannelHeader {
 	return &cb.ChannelHeader{
-		Type:    int32(headerType),
-		Version: version,
-		Timestamp: &timestamp.Timestamp{
-			Seconds: ptypes.TimestampNow().GetSeconds(),
-		},
+		Type:      int32(headerType),
+		Version:   version,
+		Timestamp: timestamppb.Now(),
 		ChannelId: channelID,
 		Epoch:     epoch,
 	}

diff --git a/configtx/config_test.go b/configtx/config_test.go
@@ -14,11 +14,10 @@ import (
 	"testing"
 
 	"github.com/hyperledger/fabric-config/configtx/orderer"
-
-	"github.com/golang/protobuf/proto"
 	"github.com/hyperledger/fabric-config/protolator"
-	cb "github.com/hyperledger/fabric-protos-go/common"
+	cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
 	. "github.com/onsi/gomega"
+	"google.golang.org/protobuf/proto"
 )
 
 func TestNewConfigTx(t *testing.T) {
@@ -233,8 +232,8 @@ func TestNewCreateChannelTx(t *testing.T) {
 	err = proto.Unmarshal(expectedPayload.Data, &expectedData)
 	gt.Expect(err).NotTo(HaveOccurred())
 
-	expectedConfigUpdate := cb.ConfigUpdate{}
-	err = proto.Unmarshal(expectedData.ConfigUpdate, &expectedConfigUpdate)
+	expectedConfigUpdate := &cb.ConfigUpdate{}
+	err = proto.Unmarshal(expectedData.ConfigUpdate, expectedConfigUpdate)
 	gt.Expect(err).NotTo(HaveOccurred())
 
 	actualPayload := cb.Payload{}
@@ -249,11 +248,11 @@ func TestNewCreateChannelTx(t *testing.T) {
 	err = proto.Unmarshal(actualPayload.Data, &actualData)
 	gt.Expect(err).NotTo(HaveOccurred())
 
-	actualConfigUpdate := cb.ConfigUpdate{}
-	err = proto.Unmarshal(actualData.ConfigUpdate, &actualConfigUpdate)
+	actualConfigUpdate := &cb.ConfigUpdate{}
+	err = proto.Unmarshal(actualData.ConfigUpdate, actualConfigUpdate)
 	gt.Expect(err).NotTo(HaveOccurred())
 
-	gt.Expect(actualConfigUpdate).To(Equal(expectedConfigUpdate))
+	gt.Expect(proto.Equal(actualConfigUpdate, expectedConfigUpdate)).To(BeTrue())
 
 	// setting timestamps to match in ConfigUpdate
 	actualTimestamp := actualHeader.Timestamp
@@ -272,7 +271,7 @@ func TestNewCreateChannelTx(t *testing.T) {
 	expectedEnvelope.Payload, err = proto.Marshal(&expectedPayload)
 	gt.Expect(err).NotTo(HaveOccurred())
 
-	gt.Expect(envelope).To(Equal(&expectedEnvelope))
+	gt.Expect(proto.Equal(envelope, &expectedEnvelope)).To(BeTrue())
 }
 
 func TestNewCreateChannelTxFailure(t *testing.T) {

diff --git a/configtx/consortiums.go b/configtx/consortiums.go
@@ -10,9 +10,9 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/golang/protobuf/proto"
-	cb "github.com/hyperledger/fabric-protos-go/common"
-	mb "github.com/hyperledger/fabric-protos-go/msp"
+	cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
+	mb "github.com/hyperledger/fabric-protos-go-apiv2/msp"
+	"google.golang.org/protobuf/proto"
 )
 
 // Consortium is a group of non-orderer organizations used in channel transactions.

diff --git a/configtx/consortiums_test.go b/configtx/consortiums_test.go
@@ -16,12 +16,11 @@ import (
 	"testing"
 
 	"github.com/hyperledger/fabric-config/configtx/orderer"
-
-	"github.com/golang/protobuf/proto"
 	"github.com/hyperledger/fabric-config/protolator"
 	"github.com/hyperledger/fabric-config/protolator/protoext/commonext"
-	cb "github.com/hyperledger/fabric-protos-go/common"
+	cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
 	. "github.com/onsi/gomega"
+	"google.golang.org/protobuf/proto"
 )
 
 func TestNewConsortiumsGroup(t *testing.T) {

diff --git a/configtx/example_test.go b/configtx/example_test.go
@@ -19,15 +19,15 @@ import (
 	"testing"
 	"time"
 
-	"github.com/golang/protobuf/proto"
 	"github.com/hyperledger/fabric-config/configtx"
 	"github.com/hyperledger/fabric-config/configtx/membership"
 	"github.com/hyperledger/fabric-config/configtx/orderer"
-	cb "github.com/hyperledger/fabric-protos-go/common"
-	mb "github.com/hyperledger/fabric-protos-go/msp"
-	ob "github.com/hyperledger/fabric-protos-go/orderer"
-	pb "github.com/hyperledger/fabric-protos-go/peer"
+	cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
+	mb "github.com/hyperledger/fabric-protos-go-apiv2/msp"
+	ob "github.com/hyperledger/fabric-protos-go-apiv2/orderer"
+	pb "github.com/hyperledger/fabric-protos-go-apiv2/peer"
 	. "github.com/onsi/gomega"
+	"google.golang.org/protobuf/proto"
 )
 
 const (

diff --git a/configtx/internal/policydsl/policyparser.go b/configtx/internal/policydsl/policyparser.go
@@ -14,9 +14,9 @@ import (
 	"strings"
 
 	"github.com/Knetic/govaluate"
-	"github.com/golang/protobuf/proto"
-	cb "github.com/hyperledger/fabric-protos-go/common"
-	mb "github.com/hyperledger/fabric-protos-go/msp"
+	cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
+	mb "github.com/hyperledger/fabric-protos-go-apiv2/msp"
+	"google.golang.org/protobuf/proto"
 )
 
 // Gate values

diff --git a/configtx/internal/policydsl/policyparser_test.go b/configtx/internal/policydsl/policyparser_test.go
@@ -9,10 +9,10 @@ package policydsl_test
 import (
 	"testing"
 
-	"github.com/golang/protobuf/proto"
 	"github.com/hyperledger/fabric-config/configtx/internal/policydsl"
-	cb "github.com/hyperledger/fabric-protos-go/common"
-	mb "github.com/hyperledger/fabric-protos-go/msp"
+	cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
+	mb "github.com/hyperledger/fabric-protos-go-apiv2/msp"
+	"google.golang.org/protobuf/proto"
 
 	. "github.com/onsi/gomega"
 )

diff --git a/configtx/msp.go b/configtx/msp.go
@@ -17,10 +17,10 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/golang/protobuf/proto"
 	"github.com/hyperledger/fabric-config/configtx/membership"
-	cb "github.com/hyperledger/fabric-protos-go/common"
-	mb "github.com/hyperledger/fabric-protos-go/msp"
+	cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
+	mb "github.com/hyperledger/fabric-protos-go-apiv2/msp"
+	"google.golang.org/protobuf/proto"
 )
 
 // MSP is the configuration information for a Fabric MSP.

diff --git a/configtx/msp_test.go b/configtx/msp_test.go
@@ -18,13 +18,13 @@ import (
 	"testing"
 	"time"
 
-	"github.com/golang/protobuf/proto"
 	"github.com/hyperledger/fabric-config/configtx/membership"
 	"github.com/hyperledger/fabric-config/configtx/orderer"
 	"github.com/hyperledger/fabric-config/protolator"
-	cb "github.com/hyperledger/fabric-protos-go/common"
-	mb "github.com/hyperledger/fabric-protos-go/msp"
+	cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
+	mb "github.com/hyperledger/fabric-protos-go-apiv2/msp"
 	. "github.com/onsi/gomega"
+	"google.golang.org/protobuf/proto"
 )
 
 func TestMSPConfigurationFailures(t *testing.T) {
@@ -275,7 +275,7 @@ func TestMSPToProto(t *testing.T) {
 
 	fabricMSPConfigProto, err := msp.toProto()
 	gt.Expect(err).NotTo(HaveOccurred())
-	gt.Expect(fabricMSPConfigProto).To(Equal(expectedFabricMSPConfigProto))
+	gt.Expect(proto.Equal(fabricMSPConfigProto, expectedFabricMSPConfigProto)).To(BeTrue())
 }
 
 func TestMSPToProtoNoNodeOUs(t *testing.T) {
@@ -328,7 +328,7 @@ func TestMSPToProtoNoNodeOUs(t *testing.T) {
 
 	fabricMSPConfigProto, err := msp.toProto()
 	gt.Expect(err).NotTo(HaveOccurred())
-	gt.Expect(fabricMSPConfigProto).To(Equal(expectedFabricMSPConfigProto))
+	gt.Expect(proto.Equal(fabricMSPConfigProto, expectedFabricMSPConfigProto)).To(BeTrue())
 }
 
 func TestParseCertificateFromBytesFailure(t *testing.T) {

diff --git a/configtx/orderer.go b/configtx/orderer.go
@@ -15,11 +15,11 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/golang/protobuf/proto"
 	"github.com/hyperledger/fabric-config/configtx/orderer"
-	cb "github.com/hyperledger/fabric-protos-go/common"
-	ob "github.com/hyperledger/fabric-protos-go/orderer"
-	eb "github.com/hyperledger/fabric-protos-go/orderer/etcdraft"
+	cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
+	ob "github.com/hyperledger/fabric-protos-go-apiv2/orderer"
+	eb "github.com/hyperledger/fabric-protos-go-apiv2/orderer/etcdraft"
+	"google.golang.org/protobuf/proto"
 )
 
 const (

diff --git a/configtx/orderer_test.go b/configtx/orderer_test.go
@@ -16,13 +16,13 @@ import (
 	"testing"
 	"time"
 
-	"github.com/golang/protobuf/proto"
 	"github.com/hyperledger/fabric-config/configtx/orderer"
 	"github.com/hyperledger/fabric-config/protolator"
 	"github.com/hyperledger/fabric-config/protolator/protoext/ordererext"
-	cb "github.com/hyperledger/fabric-protos-go/common"
-	ob "github.com/hyperledger/fabric-protos-go/orderer"
+	cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
+	ob "github.com/hyperledger/fabric-protos-go-apiv2/orderer"
 	. "github.com/onsi/gomega"
+	"google.golang.org/protobuf/proto"
 )
 
 func TestNewOrdererGroup(t *testing.T) {
@@ -3755,14 +3755,14 @@ func TestRemoveOrdererPolicyFailures(t *testing.T) {
 
 	tests := []struct {
 		testName      string
-		ordererGrpMod func(cb.ConfigGroup) *cb.ConfigGroup
+		ordererGrpMod func(*cb.ConfigGroup) *cb.ConfigGroup
 		policyName    string
 		expectedErr   string
 	}{
 		{
 			testName: "when removing blockvalidation policy",
-			ordererGrpMod: func(og cb.ConfigGroup) *cb.ConfigGroup {
-				return &og
+			ordererGrpMod: func(og *cb.ConfigGroup) *cb.ConfigGroup {
+				return proto.Clone(og).(*cb.ConfigGroup)
 			},
 			policyName:  BlockValidationPolicyKey,
 			expectedErr: "BlockValidation policy must be defined",
@@ -3774,7 +3774,7 @@ func TestRemoveOrdererPolicyFailures(t *testing.T) {
 		t.Run(tt.testName, func(t *testing.T) {
 			gt := NewGomegaWithT(t)
 
-			ordererGroup := tt.ordererGrpMod(*ordererGroup)
+			ordererGroup := tt.ordererGrpMod(ordererGroup)
 			if ordererGroup == nil {
 				delete(config.ChannelGroup.Groups, OrdererGroupKey)
 			} else {

diff --git a/configtx/organization.go b/configtx/organization.go
@@ -9,10 +9,10 @@ package configtx
 import (
 	"fmt"
 
-	"github.com/golang/protobuf/proto"
-	cb "github.com/hyperledger/fabric-protos-go/common"
-	mb "github.com/hyperledger/fabric-protos-go/msp"
-	pb "github.com/hyperledger/fabric-protos-go/peer"
+	cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
+	mb "github.com/hyperledger/fabric-protos-go-apiv2/msp"
+	pb "github.com/hyperledger/fabric-protos-go-apiv2/peer"
+	"google.golang.org/protobuf/proto"
 )
 
 // newOrgConfigGroup returns an config group for an organization.

diff --git a/configtx/policies.go b/configtx/policies.go
@@ -12,10 +12,10 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/golang/protobuf/proto"
 	"github.com/hyperledger/fabric-config/configtx/internal/policydsl"
-	cb "github.com/hyperledger/fabric-protos-go/common"
-	mb "github.com/hyperledger/fabric-protos-go/msp"
+	cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
+	mb "github.com/hyperledger/fabric-protos-go-apiv2/msp"
+	"google.golang.org/protobuf/proto"
 )
 
 // getPolicies returns a map of Policy from given map of ConfigPolicy in organization config group.

diff --git a/configtx/policies_test.go b/configtx/policies_test.go
@@ -9,9 +9,9 @@ package configtx
 import (
 	"testing"
 
-	"github.com/golang/protobuf/proto"
-	cb "github.com/hyperledger/fabric-protos-go/common"
+	cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
 	. "github.com/onsi/gomega"
+	"google.golang.org/protobuf/proto"
 )
 
 func TestPolicies(t *testing.T) {