[FAB-7641] Fix panic when iterating over private data

The gossip pull delegates fetching data from the data retriever which is
a bridge between gossip and the transient store.
The data retriever quries the ledger and iterates over an iterator until
Next() returns nil (or error).
However, Next() can also return an object that has its inner fields be nil
which represent that this current data element has no data in it, and
iteration must continue on.

This change set makes the code skip if the inner element is nil,
and adds a unit test for this.

Change-Id: Ica249e3b3a5081b1fc7357baa45bf9d0bc209e11
Signed-off-by: yacovm <yacovm@il.ibm.com>

gossip/privdata/dataretriever.go

@@ -90,6 +90,10 @@ func (dr *dataRetriever) CollectionRWSet(dig *gossip2.PvtDataDigest) []util.Priv
 				return pRWsets
 			}
 			rws := res.PvtSimulationResults
+			if rws == nil {
+				logger.Debug("Skipping empty PvtSimulationResults received at block height", res.ReceivedAtBlockHeight)
+				continue
+			}
 			pRWsets = append(pRWsets, dr.extractPvtRWsets(rws.NsPvtRwset, dig.Namespace, dig.Collection)...)
 		}
 	} else { // Since ledger height is above block sequence number private data is available in the ledger

gossip/privdata/dataretriever_test.go

@@ -69,8 +69,10 @@ func TestNewDataRetriever_GetDataFromTransientStore(t *testing.T) {
 	namespace := "testChaincodeName1"
 	collectionName := "testCollectionName"
 
-	rwSetScanner.
-		On("Next").Return(&transientstore.EndorserPvtSimulationResults{
+	rwSetScanner.On("Next").Return(&transientstore.EndorserPvtSimulationResults{
+		ReceivedAtBlockHeight: 2,
+		PvtSimulationResults:  nil,
+	}, nil).Once().On("Next").Return(&transientstore.EndorserPvtSimulationResults{
 		ReceivedAtBlockHeight: 2,
 		PvtSimulationResults: &rwset.TxPvtReadWriteSet{
 			DataModel: rwset.TxReadWriteSet_KV,