[FAB-9854] Fix compilation error

This CR fixes a compilation error in fabric that
got created due to a race in conflicting merges.

Change-Id: I97162b9fdb0643b9e6c875b6bacbef1683a20c7e
Signed-off-by: manish <manish.sethi@gmail.com>

Author: manish-sethi

core/transientstore/store.go

@@ -10,13 +10,12 @@ import (
 	"errors"
 
 	"github.com/golang/protobuf/proto"
-	"github.com/hyperledger/fabric/protos/ledger/rwset"
-	"github.com/hyperledger/fabric/protos/transientstore"
-
 	"github.com/hyperledger/fabric/common/flogging"
 	"github.com/hyperledger/fabric/common/ledger/util/leveldbhelper"
 	"github.com/hyperledger/fabric/common/util"
 	"github.com/hyperledger/fabric/core/ledger"
+	"github.com/hyperledger/fabric/protos/ledger/rwset"
+	"github.com/hyperledger/fabric/protos/transientstore"
 	"github.com/syndtr/goleveldb/leveldb/iterator"
 )
 
@@ -404,13 +403,13 @@ func (scanner *RwsetScanner) NextWithConfig() (*EndorserPvtSimulationResultsWith
 		if err := proto.Unmarshal(dbVal[1:], txPvtRWSetWithConfig); err != nil {
 			return nil, err
 		}
-		filteredTxPvtRWSet = pvtdatastorage.TrimPvtWSet(txPvtRWSetWithConfig.GetPvtRwset(), scanner.filter)
+		filteredTxPvtRWSet = trimPvtWSet(txPvtRWSetWithConfig.GetPvtRwset(), scanner.filter)
 	} else {
 		// old proto, i.e., TxPvtReadWriteSet
 		if err := proto.Unmarshal(dbVal, txPvtRWSet); err != nil {
 			return nil, err
 		}
-		filteredTxPvtRWSet = pvtdatastorage.TrimPvtWSet(txPvtRWSet, scanner.filter)
+		filteredTxPvtRWSet = trimPvtWSet(txPvtRWSet, scanner.filter)
 	}
 
 	txPvtRWSetWithConfig.PvtRwset = filteredTxPvtRWSet