MX-17245 · Improve shard processor coverage

process/block/export_test.go

@@ -798,6 +798,11 @@ func (sp *shardProcessor) CollectExecutionResults(headerHash []byte, header data
 	return sp.collectExecutionResults(headerHash, header, body)
 }
 
+// AddExecutionResultsOnHeader -
+func (sp *shardProcessor) AddExecutionResultsOnHeader(shardHeader data.HeaderHandler) error {
+	return sp.addExecutionResultsOnHeader(shardHeader)
+}
+
 // GetCrossShardIncomingMiniBlocksFromBody -
 func (sp *shardProcessor) GetCrossShardIncomingMiniBlocksFromBody(body *block.Body) []*block.MiniBlock {
 	return sp.getCrossShardIncomingMiniBlocksFromBody(body)
@@ -822,3 +827,13 @@ func GetLastExecutionResultsRootHash(
 func GetHaveTimeForProposal(startTime time.Time, maxDuration time.Duration) func() time.Duration {
 	return getHaveTimeForProposal(startTime, maxDuration)
 }
+
+// ConstructPartialShardBlockProcessorForTest -
+func ConstructPartialShardBlockProcessorForTest(subcomponents map[string]interface{}) (*shardProcessor, error) {
+	sp := &shardProcessor{}
+	err := factory.ConstructPartialComponentForTest(sp, subcomponents)
+	if err != nil {
+		return nil, err
+	}
+	return sp, err
+}

process/block/metablock.go

@@ -476,11 +476,13 @@ func (mp *metaProcessor) getAllMiniBlockDstMeFromShards(metaHdr *block.MetaBlock
 	for _, shardInfo := range metaHdr.ShardInfo {
 		headerInfo, ok := mp.hdrsForCurrBlock.GetHeaderInfo(string(shardInfo.HeaderHash))
 		if !ok {
-			continue
+			return nil, fmt.Errorf("%w for shard info with hash = %s",
+				process.ErrMissingHeader, hex.EncodeToString(shardInfo.HeaderHash))
 		}
 		shardHeader, ok := headerInfo.GetHeader().(data.ShardHeaderHandler)
 		if !ok {
-			continue
+			return nil, fmt.Errorf("%w : for shardInfo.HeaderHash = %s",
+				process.ErrWrongTypeAssertion, hex.EncodeToString(shardInfo.HeaderHash))
 		}
 
 		lastCrossNotarizedHeader, _, err := mp.blockTracker.GetLastCrossNotarizedHeader(shardInfo.ShardID)
@@ -489,13 +491,16 @@ func (mp *metaProcessor) getAllMiniBlockDstMeFromShards(metaHdr *block.MetaBlock
 		}
 
 		if shardHeader.GetRound() > metaHdr.Round {
-			continue
+			return nil, fmt.Errorf("%w : for shard info with hash = %s",
+				process.ErrHigherRoundInBlock, hex.EncodeToString(shardInfo.HeaderHash))
 		}
 		if shardHeader.GetRound() <= lastCrossNotarizedHeader.GetRound() {
-			continue
+			return nil, fmt.Errorf("%w : for shard info with hash = %s",
+				process.ErrLowerRoundInBlock, hex.EncodeToString(shardInfo.HeaderHash))
 		}
 		if shardHeader.GetNonce() <= lastCrossNotarizedHeader.GetNonce() {
-			continue
+			return nil, fmt.Errorf("%w : for shard info with hash = %s",
+				process.ErrLowerNonceInBlock, hex.EncodeToString(shardInfo.HeaderHash))
 		}
 
 		finalCrossMiniBlockHashes := mp.getFinalCrossMiniBlockHashes(shardHeader)

process/block/metablock_test.go

@@ -2795,7 +2795,8 @@ func TestMetaProcessor_VerifyCrossShardMiniBlocksDstMe(t *testing.T) {
 	assert.Nil(t, err)
 
 	err = mp.VerifyCrossShardMiniBlockDstMe(hdr)
-	assert.Nil(t, err)
+	assert.Error(t, err)
+	assert.ErrorIs(t, err, process.ErrMissingHeader)
 }
 
 func TestMetaProcess_CreateNewBlockHeaderProcessHeaderExpectCheckRoundCalled(t *testing.T) {

process/block/shardblock.go

@@ -1853,7 +1853,8 @@ func (sp *shardProcessor) getAllMiniBlockDstMeFromMeta(header data.ShardHeaderHa
 	for _, metaBlockHash := range header.GetMetaBlockHashes() {
 		headerInfo, ok := sp.hdrsForCurrBlock.GetHeaderInfo(string(metaBlockHash))
 		if !ok {
-			return nil, err
+			return nil, fmt.Errorf("%w for metaBlockHash %s",
+				process.ErrMissingHeader, hex.EncodeToString(metaBlockHash))
 		}
 
 		err = sp.addCrossShardMiniBlocksDstMeToMap(header, metaBlockHash, headerInfo.GetHeader(), lastCrossNotarizedHeader, miniBlockMetaHashes)