add new version libs

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

Author: pfi79

cmd/common/signer/signer.go

@@ -19,7 +19,7 @@ import (
 	"strings"
 
 	"github.com/hyperledger/fabric-lib-go/bccsp/utils"
-	"github.com/hyperledger/fabric-protos-go/msp"
+	"github.com/hyperledger/fabric-protos-go-apiv2/msp"
 	"github.com/hyperledger/fabric/common/util"
 	"github.com/hyperledger/fabric/protoutil"
 	"github.com/pkg/errors"

cmd/configtxgen/main.go

@@ -18,7 +18,7 @@ import (
 	"github.com/hyperledger/fabric-config/protolator/protoext/peerext"
 	"github.com/hyperledger/fabric-lib-go/bccsp/factory"
 	"github.com/hyperledger/fabric-lib-go/common/flogging"
-	cb "github.com/hyperledger/fabric-protos-go/common"
+	cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
 	"github.com/hyperledger/fabric/internal/configtxgen/encoder"
 	"github.com/hyperledger/fabric/internal/configtxgen/genesisconfig"
 	"github.com/hyperledger/fabric/internal/configtxgen/metadata"

cmd/configtxlator/main.go

@@ -14,19 +14,19 @@ import (
 	"os"
 	"reflect"
 
-	"github.com/golang/protobuf/proto"
 	"github.com/gorilla/handlers"
 	"github.com/hyperledger/fabric-config/protolator"
 	"github.com/hyperledger/fabric-lib-go/common/flogging"
-	cb "github.com/hyperledger/fabric-protos-go/common"
-	_ "github.com/hyperledger/fabric-protos-go/msp"
-	_ "github.com/hyperledger/fabric-protos-go/orderer"
-	_ "github.com/hyperledger/fabric-protos-go/orderer/etcdraft"
-	_ "github.com/hyperledger/fabric-protos-go/peer"
+	cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
+	_ "github.com/hyperledger/fabric-protos-go-apiv2/msp"
+	_ "github.com/hyperledger/fabric-protos-go-apiv2/orderer"
+	_ "github.com/hyperledger/fabric-protos-go-apiv2/orderer/etcdraft"
+	_ "github.com/hyperledger/fabric-protos-go-apiv2/peer"
 	"github.com/hyperledger/fabric/internal/configtxlator/metadata"
 	"github.com/hyperledger/fabric/internal/configtxlator/rest"
 	"github.com/hyperledger/fabric/internal/configtxlator/update"
 	"github.com/pkg/errors"
+	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/reflect/protoreflect"
 	"google.golang.org/protobuf/reflect/protoregistry"
 	"gopkg.in/alecthomas/kingpin.v2"
@@ -131,7 +131,7 @@ func encodeProto(msgName string, input, output *os.File) error {
 		return errors.Wrapf(err, "error encode input")
 	}
 
-	msgType := reflect.TypeOf(proto.MessageV1(mt.Zero().Interface()))
+	msgType := reflect.TypeOf(mt.Zero().Interface())
 
 	if msgType == nil {
 		return errors.Errorf("message of type %s unknown", msgType)
@@ -143,6 +143,9 @@ func encodeProto(msgName string, input, output *os.File) error {
 		return errors.Wrapf(err, "error decoding input")
 	}
 
+	if msg == nil {
+		return errors.New("error marshaling: proto: Marshal called with nil")
+	}
 	out, err := proto.Marshal(msg)
 	if err != nil {
 		return errors.Wrapf(err, "error marshaling")
@@ -162,7 +165,7 @@ func decodeProto(msgName string, input, output *os.File) error {
 		return errors.Wrapf(err, "error encode input")
 	}
 
-	msgType := reflect.TypeOf(proto.MessageV1(mt.Zero().Interface()))
+	msgType := reflect.TypeOf(mt.Zero().Interface())
 
 	if msgType == nil {
 		return errors.Errorf("message of type %s unknown", msgType)
@@ -217,6 +220,9 @@ func computeUpdt(original, updated, output *os.File, channelID string) error {
 
 	cu.ChannelId = channelID
 
+	if cu == nil {
+		return errors.New("error marshaling computed config update: proto: Marshal called with nil")
+	}
 	outBytes, err := proto.Marshal(cu)
 	if err != nil {
 		return errors.Wrapf(err, "error marshaling computed config update")

cmd/osnadmin/main.go

@@ -16,10 +16,10 @@ import (
 	"net/http"
 	"os"
 
-	"github.com/golang/protobuf/proto"
-	"github.com/hyperledger/fabric-protos-go/common"
+	"github.com/hyperledger/fabric-protos-go-apiv2/common"
 	"github.com/hyperledger/fabric/internal/osnadmin"
 	"github.com/hyperledger/fabric/protoutil"
+	"google.golang.org/protobuf/proto"
 	"gopkg.in/alecthomas/kingpin.v2"
 )
 

cmd/osnadmin/main_test.go

@@ -18,9 +18,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/golang/protobuf/proto"
 	"github.com/hyperledger/fabric-lib-go/bccsp"
-	cb "github.com/hyperledger/fabric-protos-go/common"
+	cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
 	"github.com/hyperledger/fabric/cmd/osnadmin/mocks"
 	"github.com/hyperledger/fabric/common/crypto/tlsgen"
 	"github.com/hyperledger/fabric/orderer/common/channelparticipation"
@@ -29,6 +28,7 @@ import (
 	"github.com/hyperledger/fabric/protoutil"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+	"google.golang.org/protobuf/proto"
 )
 
 var _ = Describe("osnadmin", func() {

cmd/osnadmin/mocks/channel_management.go

@@ -9,7 +9,7 @@ package main
 import (
 	"testing"
 
-	cb "github.com/hyperledger/fabric-protos-go/common"
+	cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
 	"github.com/hyperledger/fabric/orderer/common/types"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"

cmd/osnadmin/osnadmin_suite_test.go

@@ -7,7 +7,7 @@ SPDX-License-Identifier: Apache-2.0
 package capabilities
 
 import (
-	cb "github.com/hyperledger/fabric-protos-go/common"
+	cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
 )
 
 const (

common/capabilities/application.go

@@ -9,7 +9,7 @@ package capabilities
 import (
 	"testing"
 
-	cb "github.com/hyperledger/fabric-protos-go/common"
+	cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
 	"github.com/stretchr/testify/require"
 )
 

common/capabilities/application_test.go

@@ -8,7 +8,7 @@ package capabilities
 
 import (
 	"github.com/hyperledger/fabric-lib-go/common/flogging"
-	cb "github.com/hyperledger/fabric-protos-go/common"
+	cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
 	"github.com/pkg/errors"
 )