refactor(fabric): remove import of rwsetutil

This commit moves the rwsetutils imported from fabric into a local
package, including tests.

Signed-off-by: Marcus Brandenburger <bur@zurich.ibm.com>

Author: mbrandenburger

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/core/generic/ledger/kvledger/rwsetutil"
 	"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"
 )
 
 // UnpackedProposalResponse contains the interesting artifacts from inside the proposal.

platform/fabric/core/generic/ledger/kvledger/rwsetutil/kvrwset_proto_util.go

@@ -0,0 +1,23 @@
+/*
+Copyright IBM Corp. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
+
+package rwsetutil
+
+import "github.com/hyperledger/fabric-protos-go-apiv2/ledger/rwset/kvrwset"
+
+// SetRawReads sets the 'readsInfo' field to raw KVReads performed by the query
+func SetRawReads(rqi *kvrwset.RangeQueryInfo, kvReads []*kvrwset.KVRead) {
+	rqi.ReadsInfo = &kvrwset.RangeQueryInfo_RawReads{
+		RawReads: &kvrwset.QueryReads{
+			KvReads: kvReads,
+		},
+	}
+}
+
+// SetMerkelSummary sets the 'readsInfo' field to merkle summary of the raw KVReads of query results
+func SetMerkelSummary(rqi *kvrwset.RangeQueryInfo, merkleSummary *kvrwset.QueryReadsMerkleSummary) {
+	rqi.ReadsInfo = &kvrwset.RangeQueryInfo_ReadsMerkleHashes{ReadsMerkleHashes: merkleSummary}
+}

platform/fabric/core/generic/ledger/kvledger/rwsetutil/kvrwset_proto_util_test.go

@@ -0,0 +1,44 @@
+/*
+Copyright IBM Corp. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
+
+package rwsetutil
+
+import (
+	"testing"
+
+	"github.com/hyperledger/fabric-protos-go-apiv2/ledger/rwset/kvrwset"
+	"github.com/stretchr/testify/require"
+)
+
+func TestSetRawReads(t *testing.T) {
+	rqi := &kvrwset.RangeQueryInfo{StartKey: "start", EndKey: "end"}
+	kvReads := []*kvrwset.KVRead{{Key: "key1"}, {Key: "key2"}}
+
+	expected := &kvrwset.RangeQueryInfo{
+		StartKey: "start",
+		EndKey:   "end",
+		ReadsInfo: &kvrwset.RangeQueryInfo_RawReads{
+			RawReads: &kvrwset.QueryReads{KvReads: kvReads},
+		},
+	}
+
+	SetRawReads(rqi, kvReads)
+	require.Equal(t, expected, rqi)
+}
+
+func TestSetMerkelSummary(t *testing.T) {
+	rqi := &kvrwset.RangeQueryInfo{StartKey: "start", EndKey: "end"}
+	merkleSummary := &kvrwset.QueryReadsMerkleSummary{MaxDegree: 12, MaxLevel: 99}
+
+	expected := &kvrwset.RangeQueryInfo{
+		StartKey:  "start",
+		EndKey:    "end",
+		ReadsInfo: &kvrwset.RangeQueryInfo_ReadsMerkleHashes{ReadsMerkleHashes: merkleSummary},
+	}
+
+	SetMerkelSummary(rqi, merkleSummary)
+	require.Equal(t, expected, rqi)
+}