[FAB-4980] Account for the pvtdata during recovery

This CR modifies the recovery code for using the pvt data from the
pvtdata storage to update pvtdata state alongwith the pubdata state

The main change is in the existing test. The test now uses the pvt data also.
In addition, now the test code always runs for the historydb and
is restructured to reduce the verbosity

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

Author: manish-sethi

core/ledger/kvledger/example/committer.go

@@ -35,7 +35,7 @@ func ConstructCommitter(ledger ledger.PeerLedger) *Committer {
 // Commit commits the block
 func (c *Committer) Commit(rawBlock *common.Block) error {
 	logger.Debugf("Committer validating the block...")
-	if err := c.ledger.Commit(rawBlock); err != nil {
+	if err := c.ledger.CommitWithPvtData(&ledger.BlockAndPvtData{Block: rawBlock}); err != nil {
 		return err
 	}
 	return nil

core/ledger/kvledger/kv_ledger.go

@@ -121,13 +121,13 @@ func (l *kvLedger) recoverDBs() error {
 //state DB or history DB or both
 func (l *kvLedger) recommitLostBlocks(firstBlockNum uint64, lastBlockNum uint64, recoverables ...recoverable) error {
 	var err error
-	var block *common.Block
+	var blockAndPvtdata *ledger.BlockAndPvtData
 	for blockNumber := firstBlockNum; blockNumber <= lastBlockNum; blockNumber++ {
-		if block, err = l.GetBlockByNumber(blockNumber); err != nil {
+		if blockAndPvtdata, err = l.GetPvtDataAndBlockByNum(blockNumber, nil); err != nil {
 			return err
 		}
 		for _, r := range recoverables {
-			if err := r.CommitLostBlock(&ledger.BlockAndPvtData{Block: block}); err != nil {
+			if err := r.CommitLostBlock(blockAndPvtdata); err != nil {
 				return err
 			}
 		}