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

…oogle.golang.org/protobuf

Signed-off-by: Fedor Partanskiy <[email protected]>

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

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) {

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.

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.

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"
 )
 

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,
 	}

configtx/config_test.go

@@ -13,10 +13,10 @@ import (
 	"fmt"
 	"testing"
 
-	"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) {
@@ -270,7 +270,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) {

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.

configtx/consortiums_test.go

@@ -15,11 +15,11 @@ import (
 	"math/big"
 	"testing"
 
-	"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) {

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 (

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

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"
 )

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.

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) {
@@ -270,7 +270,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) {
@@ -323,7 +323,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) {

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 (

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) {

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.

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.

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) {

configtx/signer.go

@@ -18,9 +18,9 @@ import (
 	"io"
 	"math/big"
 
-	"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"
 )
 
 // SigningIdentity is an MSP Identity that can be used to sign configuration

configtx/signer_test.go

@@ -21,9 +21,9 @@ import (
 	"testing"
 	"time"
 
-	"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 TestSign(t *testing.T) {

configtx/update.go

@@ -10,8 +10,8 @@ import (
 	"bytes"
 	"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"
 )
 
 // Compute computes the difference between two *cb.Configs and returns the

configtx/update_test.go

@@ -9,7 +9,9 @@ package configtx
 import (
 	"testing"
 
-	cb "github.com/hyperledger/fabric-protos-go/common"
+	"google.golang.org/protobuf/proto"
+
+	cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
 	. "github.com/onsi/gomega"
 )
 
@@ -147,7 +149,7 @@ func TestGroupPolicyModification(t *testing.T) {
 		Groups: map[string]*cb.ConfigGroup{},
 	}
 
-	gt.Expect(expectedWriteSet).To(Equal(cu.WriteSet), "Mismatched write set")
+	gt.Expect(proto.Equal(expectedWriteSet, cu.WriteSet)).To(BeTrue(), "Mismatched write set")
 }
 
 func TestGroupValueModification(t *testing.T) {

go.mod

@@ -4,18 +4,18 @@ go 1.20
 
 require (
 	github.com/Knetic/govaluate v3.0.0+incompatible
-	github.com/golang/protobuf v1.5.3
-	github.com/hyperledger/fabric-protos-go v0.3.3
+	github.com/hyperledger/fabric-protos-go-apiv2 v0.3.3
 	github.com/onsi/gomega v1.9.0
+	google.golang.org/protobuf v1.33.0
 )
 
 require (
+	github.com/golang/protobuf v1.5.3 // indirect
 	golang.org/x/net v0.23.0 // indirect
 	golang.org/x/sys v0.18.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
-	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
-	google.golang.org/grpc v1.56.3 // indirect
-	google.golang.org/protobuf v1.32.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5 // indirect
+	google.golang.org/grpc v1.57.0 // indirect
 	gopkg.in/yaml.v2 v2.2.4 // indirect
 )