fix after discussion

multiversx · Jan 30, 2025 · baab3b6 · baab3b6
1 parent 7f27f09
commit baab3b6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/process/block/metablock.go b/process/block/metablock.go
@@ -437,15 +437,15 @@ func (mp *metaProcessor) checkProofsForShardData(header *block.MetaBlock) error
 			continue
 		}
 
-		if !common.ShouldBlockHavePrevProof(shardHeader.hdr, mp.enableEpochsHandler, common.EquivalentMessagesFlag) {
-			continue
-		}
-
 		err := mp.checkProofRequestingNextHeaderBlockingIfMissing(shardData.ShardID, shardData.HeaderHash, shardData.Nonce)
 		if err != nil {
 			return err
 		}
 
+		if !common.ShouldBlockHavePrevProof(shardHeader.hdr, mp.enableEpochsHandler, common.EquivalentMessagesFlag) {
+			continue
+		}
+
 		shardHeadersStorer, err := mp.store.GetStorer(dataRetriever.BlockHeaderUnit)
 		if err != nil {
 			return err

diff --git a/process/block/shardblock.go b/process/block/shardblock.go
@@ -301,10 +301,6 @@ func (sp *shardProcessor) ProcessBlock(
 				return fmt.Errorf("%w for header hash %s", process.ErrMissingHeader, hex.EncodeToString(metaBlockHash))
 			}
 
-			if !common.ShouldBlockHavePrevProof(hInfo.hdr, sp.enableEpochsHandler, common.EquivalentMessagesFlag) {
-				continue
-			}
-
 			if !sp.enableEpochsHandler.IsFlagEnabledInEpoch(common.EquivalentMessagesFlag, hInfo.hdr.GetEpoch()) {
 				continue
 			}