refactor(fabric): create fabric protoutil package

mbrandenburger · mbrandenburger · commit cec89026aaa1 · 2026-01-09T17:51:15.000+01:00
This commit bundles the dependency on prototuils imported from fabric in
a single package.

Signed-off-by: Marcus Brandenburger &lt;bur@zurich.ibm.com&gt;
diff --git a/integration/nwo/fabric/network/configblock.go b/integration/nwo/fabric/network/configblock.go
@@ -15,10 +15,10 @@ import (
 	"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fabric/topology"
 	"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/proto"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/common/utils"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/protoutil"
 	"github.com/hyperledger/fabric-protos-go-apiv2/common"
 	"github.com/hyperledger/fabric-protos-go-apiv2/msp"
 	protosorderer "github.com/hyperledger/fabric-protos-go-apiv2/orderer"
-	"github.com/hyperledger/fabric/protoutil"
 	"github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"
 	"github.com/onsi/gomega/gexec"
diff --git a/integration/nwo/fabric/network/update.go b/integration/nwo/fabric/network/update.go
@@ -13,7 +13,6 @@ import (
 	"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/errors"
 	"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/proto"
 	cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
-	"github.com/hyperledger/fabric/protoutil"
 )
 
 func computePoliciesMapUpdate(original, updated map[string]*cb.ConfigPolicy) (readSet, writeSet, sameSet map[string]*cb.ConfigPolicy, updatedMembers bool) {
@@ -138,7 +137,12 @@ func computeGroupsMapUpdate(original, updated map[string]*cb.ConfigGroup) (readS
 			continue
 		}
 		updatedMembers = true
-		_, groupWriteSet, _ := computeGroupUpdate(protoutil.NewConfigGroup(), updatedGroup)
+		emptyCnfGrp := &cb.ConfigGroup{
+			Groups:   make(map[string]*cb.ConfigGroup),
+			Values:   make(map[string]*cb.ConfigValue),
+			Policies: make(map[string]*cb.ConfigPolicy),
+		}
+		_, groupWriteSet, _ := computeGroupUpdate(emptyCnfGrp, updatedGroup)
 		writeSet[groupName] = &cb.ConfigGroup{
 			Version:   0,
 			ModPolicy: updatedGroup.ModPolicy,
diff --git a/platform/fabric/core/generic/chaincode/invoke.go b/platform/fabric/core/generic/chaincode/invoke.go
@@ -19,11 +19,11 @@ import (
 	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/core/generic/services"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/core/generic/transaction"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/driver"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/protoutil"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/grpc"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
 	"github.com/hyperledger/fabric-protos-go-apiv2/common"
 	pb "github.com/hyperledger/fabric-protos-go-apiv2/peer"
-	"github.com/hyperledger/fabric/protoutil"
 )
 
 type Invoke struct {
diff --git a/platform/fabric/core/generic/committer/config.go b/platform/fabric/core/generic/committer/config.go
@@ -14,8 +14,8 @@ import (
 	"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/errors"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/core/generic/rwset"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/driver"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/protoutil"
 	"github.com/hyperledger/fabric-protos-go-apiv2/common"
-	"github.com/hyperledger/fabric/protoutil"
 )
 
 const ConfigTXPrefix = "configtx_"
diff --git a/platform/fabric/core/generic/committer/event.go b/platform/fabric/core/generic/committer/event.go
@@ -8,10 +8,9 @@ package committer
 
 import (
 	"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/errors"
-
+	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/protoutil"
 	"github.com/hyperledger/fabric-protos-go-apiv2/common"
 	"github.com/hyperledger/fabric-protos-go-apiv2/peer"
-	"github.com/hyperledger/fabric/protoutil"
 )
 
 // ChaincodeEvent models the chaincode event details.
diff --git a/platform/fabric/core/generic/delivery/deliverclient.go b/platform/fabric/core/generic/delivery/deliverclient.go
@@ -16,11 +16,11 @@ import (
 	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/core/generic/fabricutils"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/core/generic/services"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/driver"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/protoutil"
 	grpc2 "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/grpc"
 	"github.com/hyperledger/fabric-protos-go-apiv2/common"
 	ab "github.com/hyperledger/fabric-protos-go-apiv2/orderer"
 	pb "github.com/hyperledger/fabric-protos-go-apiv2/peer"
-	"github.com/hyperledger/fabric/protoutil"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/types/known/timestamppb"
diff --git a/platform/fabric/core/generic/fabricutils/pr.go b/platform/fabric/core/generic/fabricutils/pr.go
@@ -7,9 +7,9 @@ SPDX-License-Identifier: Apache-2.0
 package fabricutils
 
 import (
+	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/protoutil"
 	pb "github.com/hyperledger/fabric-protos-go-apiv2/peer"
 	"github.com/hyperledger/fabric/core/ledger/kvledger/txmgmt/rwsetutil"
-	"github.com/hyperledger/fabric/protoutil"
 )
 
 // UnpackedProposalResponse contains the interesting artifacts from inside the proposal.
diff --git a/platform/fabric/core/generic/fabricutils/utils.go b/platform/fabric/core/generic/fabricutils/utils.go
@@ -14,9 +14,9 @@ import (
 	"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/errors"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/common/services/logging"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/driver"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/protoutil"
 	"github.com/hyperledger/fabric-protos-go-apiv2/common"
 	"github.com/hyperledger/fabric-protos-go-apiv2/peer"
-	"github.com/hyperledger/fabric/protoutil"
 	"go.uber.org/zap/zapcore"
 )
 
diff --git a/platform/fabric/core/generic/membership/membership.go b/platform/fabric/core/generic/membership/membership.go
@@ -12,14 +12,14 @@ import (
 
 	"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/errors"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/driver"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/protoutil"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/grpc"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
 	"github.com/hyperledger/fabric-lib-go/bccsp/factory"
 	cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
 	"github.com/hyperledger/fabric/common/channelconfig"
 	"github.com/hyperledger/fabric/common/configtx"
 	"github.com/hyperledger/fabric/msp"
-	"github.com/hyperledger/fabric/protoutil"
 )
 
 type Service struct {
diff --git a/platform/fabric/core/generic/rwset/envelope.go b/platform/fabric/core/generic/rwset/envelope.go
@@ -9,9 +9,9 @@ package rwset
 import (
 	"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/errors"
 	"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/proto"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/protoutil"
 	"github.com/hyperledger/fabric-protos-go-apiv2/common"
 	"github.com/hyperledger/fabric-protos-go-apiv2/peer"
-	"github.com/hyperledger/fabric/protoutil"
 )
 
 // TODO: remove this and merge with that in transaction
diff --git a/platform/fabric/core/generic/rwset/loader.go b/platform/fabric/core/generic/rwset/loader.go
@@ -13,8 +13,8 @@ import (
 	"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/proto"
 	driver2 "github.com/hyperledger-labs/fabric-smart-client/platform/common/driver"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/driver"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/protoutil"
 	"github.com/hyperledger/fabric-protos-go-apiv2/common"
-	"github.com/hyperledger/fabric/protoutil"
 )
 
 type Loader struct {
diff --git a/platform/fabric/core/generic/transaction/envelope.go b/platform/fabric/core/generic/transaction/envelope.go
@@ -11,9 +11,9 @@ import (
 
 	"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/errors"
 	"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/proto"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/protoutil"
 	"github.com/hyperledger/fabric-protos-go-apiv2/common"
 	"github.com/hyperledger/fabric-protos-go-apiv2/peer"
-	"github.com/hyperledger/fabric/protoutil"
 )
 
 type Envelope struct {
diff --git a/platform/fabric/core/generic/transaction/id.go b/platform/fabric/core/generic/transaction/id.go
@@ -10,9 +10,8 @@ import (
 	"crypto/rand"
 
 	"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/errors"
-	"github.com/hyperledger/fabric/protoutil"
-
 	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/driver"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/protoutil"
 )
 
 func ComputeTxID(id *driver.TxIDComponents) string {
diff --git a/platform/fabric/core/generic/transaction/manager.go b/platform/fabric/core/generic/transaction/manager.go
@@ -12,8 +12,8 @@ import (
 
 	"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/errors"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/driver"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/protoutil"
 	view2 "github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
-	"github.com/hyperledger/fabric/protoutil"
 )
 
 type ChannelProvider interface {
diff --git a/platform/fabric/core/generic/transaction/pr.go b/platform/fabric/core/generic/transaction/pr.go
@@ -10,9 +10,9 @@ import (
 	"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/errors"
 	"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/proto"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/driver"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/protoutil"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
 	"github.com/hyperledger/fabric-protos-go-apiv2/peer"
-	"github.com/hyperledger/fabric/protoutil"
 )
 
 type ProposalResponse struct {
diff --git a/platform/fabric/core/generic/transaction/proposal.go b/platform/fabric/core/generic/transaction/proposal.go
@@ -12,11 +12,11 @@ import (
 	"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/errors"
 	"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/proto"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/common/services/logging"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/protoutil"
 	cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
 	pb "github.com/hyperledger/fabric-protos-go-apiv2/peer"
 	"github.com/hyperledger/fabric/core/common/ccprovider"
 	"github.com/hyperledger/fabric/msp"
-	"github.com/hyperledger/fabric/protoutil"
 )
 
 // UnpackedProposal contains the interesting artifacts from inside the proposal.
diff --git a/platform/fabric/core/generic/transaction/proposalresponse.go b/platform/fabric/core/generic/transaction/proposalresponse.go
@@ -7,8 +7,8 @@ SPDX-License-Identifier: Apache-2.0
 package transaction
 
 import (
+	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/protoutil"
 	pb "github.com/hyperledger/fabric-protos-go-apiv2/peer"
-	"github.com/hyperledger/fabric/protoutil"
 )
 
 // UnpackedProposalResponse contains the interesting artifacts from inside the proposal.
diff --git a/platform/fabric/core/generic/transaction/transasction.go b/platform/fabric/core/generic/transaction/transasction.go
@@ -17,10 +17,10 @@ import (
 	"github.com/hyperledger-labs/fabric-smart-client/platform/common/services/logging"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/core/generic/fabricutils"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/driver"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/protoutil"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
 	pcommon "github.com/hyperledger/fabric-protos-go-apiv2/common"
 	pb "github.com/hyperledger/fabric-protos-go-apiv2/peer"
-	"github.com/hyperledger/fabric/protoutil"
 )
 
 type Proposal struct {
diff --git a/platform/fabric/protoutil/protoutils.go b/platform/fabric/protoutil/protoutils.go

Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@ import (`
`14`	`14`	`"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/errors"`
`15`	`15`	`"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/core/generic/rwset"`
`16`	`16`	`"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/driver"`
	`17`	`+ "github.com/hyperledger-labs/fabric-smart-client/platform/fabric/protoutil"`
`17`	`18`	`"github.com/hyperledger/fabric-protos-go-apiv2/common"`
`18`		`- "github.com/hyperledger/fabric/protoutil"`
`19`	`19`	`)`
`20`	`20`
`21`	`21`	`const ConfigTXPrefix = "configtx_"`
Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,9 @@ SPDX-License-Identifier: Apache-2.0`
`7`	`7`	`package fabricutils`
`8`	`8`
`9`	`9`	`import (`
	`10`	`+ "github.com/hyperledger-labs/fabric-smart-client/platform/fabric/protoutil"`
`10`	`11`	`pb "github.com/hyperledger/fabric-protos-go-apiv2/peer"`
`11`	`12`	`"github.com/hyperledger/fabric/core/ledger/kvledger/txmgmt/rwsetutil"`
`12`		`- "github.com/hyperledger/fabric/protoutil"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`// UnpackedProposalResponse contains the interesting artifacts from inside the proposal.`