refactor: return nil when error has already been checked

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

Author: MarkDaveny

core/chaincode/lifecycle/ledger_shim.go

@@ -140,7 +140,7 @@ func (ris *ResultsIteratorShim) Next() (*queryresult.KV, error) {
 	if res == nil {
 		return nil, nil
 	}
-	return res.(*queryresult.KV), err
+	return res.(*queryresult.KV), nil
 }
 
 func (ris *ResultsIteratorShim) Close() error {

core/ledger/pvtdatastorage/v11.go

@@ -19,7 +19,7 @@ func v11Format(datakeyBytes []byte) (bool, error) {
 		return false, err
 	}
 	remainingBytes := datakeyBytes[n+1:]
-	return len(remainingBytes) == 0, err
+	return len(remainingBytes) == 0, nil
 }
 
 // v11DecodePK returns block number, tx number, and error.