Revert "rm old proto related code from transient store (#1464)" (#1467)

This reverts commit c712090.

Signed-off-by: senthil <[email protected]>

core/transientstore/store.go

@@ -10,6 +10,7 @@ import (
 	"errors"
 
 	"github.com/golang/protobuf/proto"
+	"github.com/hyperledger/fabric-protos-go/ledger/rwset"
 	"github.com/hyperledger/fabric-protos-go/transientstore"
 	"github.com/hyperledger/fabric/common/flogging"
 	"github.com/hyperledger/fabric/common/ledger/util/leveldbhelper"
@@ -24,7 +25,7 @@ var (
 	emptyValue = []byte{}
 	nilByte    = byte('\x00')
 	// ErrStoreEmpty is used to indicate that there are no entries in transient store
-	ErrStoreEmpty = errors.New("transient store is empty")
+	ErrStoreEmpty = errors.New("Transient store is empty")
 )
 
 //////////////////////////////////////////////
@@ -64,7 +65,7 @@ type storeProvider struct {
 	dbProvider *leveldbhelper.Provider
 }
 
-// Store holds an instance of a levelDB.
+// store holds an instance of a levelDB.
 type Store struct {
 	db       *leveldbhelper.DBHandle
 	ledgerID string
@@ -293,22 +294,35 @@ func (scanner *RwsetScanner) Next() (*EndorserPvtSimulationResults, error) {
 		return nil, err
 	}
 
-	rwsetWithConf := &transientstore.TxPvtReadWriteSetWithConfigInfo{}
-	if err := proto.Unmarshal(dbVal[1:], rwsetWithConf); err != nil {
-		return nil, err
-	}
-	rwsetWithConf.PvtRwset = trimPvtWSet(rwsetWithConf.PvtRwset, scanner.filter)
-	rwsetWithConf.CollectionConfigs, err = trimPvtCollectionConfigs(
-		rwsetWithConf.CollectionConfigs,
-		scanner.filter,
-	)
-	if err != nil {
-		return nil, err
+	txPvtRWSet := &rwset.TxPvtReadWriteSet{}
+	txPvtRWSetWithConfig := &transientstore.TxPvtReadWriteSetWithConfigInfo{}
+
+	var filteredTxPvtRWSet *rwset.TxPvtReadWriteSet
+	if dbVal[0] == nilByte {
+		// new proto, i.e., TxPvtReadWriteSetWithConfigInfo
+		if err := proto.Unmarshal(dbVal[1:], txPvtRWSetWithConfig); err != nil {
+			return nil, err
+		}
+
+		filteredTxPvtRWSet = trimPvtWSet(txPvtRWSetWithConfig.GetPvtRwset(), scanner.filter)
+		configs, err := trimPvtCollectionConfigs(txPvtRWSetWithConfig.CollectionConfigs, scanner.filter)
+		if err != nil {
+			return nil, err
+		}
+		txPvtRWSetWithConfig.CollectionConfigs = configs
+	} else {
+		// old proto, i.e., TxPvtReadWriteSet
+		if err := proto.Unmarshal(dbVal, txPvtRWSet); err != nil {
+			return nil, err
+		}
+		filteredTxPvtRWSet = trimPvtWSet(txPvtRWSet, scanner.filter)
 	}
 
+	txPvtRWSetWithConfig.PvtRwset = filteredTxPvtRWSet
+
 	return &EndorserPvtSimulationResults{
 		ReceivedAtBlockHeight:          blockHeight,
-		PvtSimulationResultsWithConfig: rwsetWithConf,
+		PvtSimulationResultsWithConfig: txPvtRWSetWithConfig,
 	}, nil
 }
 

core/transientstore/store_test.go

@@ -154,6 +154,62 @@ func TestTransientStorePersistAndRetrieve(t *testing.T) {
 	assert.Equal(endorsersResults, actualEndorsersResults)
 }
 
+func TestTransientStorePersistAndRetrieveBothOldAndNewProto(t *testing.T) {
+	testStore, cleanup := testStore(t)
+	defer cleanup()
+	assert := assert.New(t)
+	txid := "txid-1"
+	var receivedAtBlockHeight uint64 = 10
+	var err error
+
+	// Create and persist private simulation results with old proto for txid-1
+	samplePvtRWSet := samplePvtData(t)
+	err = testStore.persistOldProto(txid, receivedAtBlockHeight, samplePvtRWSet)
+	assert.NoError(err)
+
+	// Create and persist private simulation results with new proto for txid-1
+	samplePvtRWSetWithConfig := samplePvtDataWithConfigInfo(t)
+	err = testStore.Persist(txid, receivedAtBlockHeight, samplePvtRWSetWithConfig)
+	assert.NoError(err)
+
+	// Construct the expected results
+	var expectedEndorsersResults []*EndorserPvtSimulationResults
+
+	pvtRWSetWithConfigInfo := &transientstore.TxPvtReadWriteSetWithConfigInfo{
+		PvtRwset: samplePvtRWSet,
+	}
+
+	endorser0SimulationResults := &EndorserPvtSimulationResults{
+		ReceivedAtBlockHeight:          receivedAtBlockHeight,
+		PvtSimulationResultsWithConfig: pvtRWSetWithConfigInfo,
+	}
+	expectedEndorsersResults = append(expectedEndorsersResults, endorser0SimulationResults)
+
+	endorser1SimulationResults := &EndorserPvtSimulationResults{
+		ReceivedAtBlockHeight:          receivedAtBlockHeight,
+		PvtSimulationResultsWithConfig: samplePvtRWSetWithConfig,
+	}
+	expectedEndorsersResults = append(expectedEndorsersResults, endorser1SimulationResults)
+
+	// Retrieve simulation results of txid-1 from  store
+	iter, err := testStore.GetTxPvtRWSetByTxid(txid, nil)
+	assert.NoError(err)
+
+	var actualEndorsersResults []*EndorserPvtSimulationResults
+	for {
+		result, err := iter.Next()
+		assert.NoError(err)
+		if result == nil {
+			break
+		}
+		actualEndorsersResults = append(actualEndorsersResults, result)
+	}
+	iter.Close()
+	sortResults(expectedEndorsersResults)
+	sortResults(actualEndorsersResults)
+	assert.Equal(expectedEndorsersResults, actualEndorsersResults)
+}
+
 func TestTransientStorePurgeByTxids(t *testing.T) {
 	testStore, cleanup := testStore(t)
 	defer cleanup()