Merge pull request #4718 from ElrondNetwork/test-scr-processor-lookup

iulianpascalau · web-flow · commit 39d7ddcb08bb · 2022-11-21T01:58:00.000+02:00
Improve SCR lookup in smartcontract preprocessor
diff --git a/process/block/preprocess/basePreProcess.go b/process/block/preprocess/basePreProcess.go
@@ -323,10 +323,14 @@ func (bpp *basePreProcess) computeExistingAndRequestMissing(
 		}
 
 		txShardInfoObject := &txShardInfo{senderShardID: miniBlock.SenderShardID, receiverShardID: miniBlock.ReceiverShardID}
+		// TODO refactor this section
 		method := process.SearchMethodJustPeek
 		if miniBlock.Type == block.InvalidBlock {
 			method = process.SearchMethodSearchFirst
 		}
+		if miniBlock.Type == block.SmartContractResultBlock {
+			method = process.SearchMethodPeekWithFallbackSearchFirst
+		}
 
 		for j := 0; j < len(miniBlock.TxHashes); j++ {
 			txHash := miniBlock.TxHashes[j]

Original file line number	Diff line number	Diff line change
`@@ -323,10 +323,14 @@ func (bpp *basePreProcess) computeExistingAndRequestMissing(`
`323`	`323`	`}`
`324`	`324`
`325`	`325`	`txShardInfoObject := &txShardInfo{senderShardID: miniBlock.SenderShardID, receiverShardID: miniBlock.ReceiverShardID}`
	`326`	`+ // TODO refactor this section`
`326`	`327`	`method := process.SearchMethodJustPeek`
`327`	`328`	`if miniBlock.Type == block.InvalidBlock {`
`328`	`329`	`method = process.SearchMethodSearchFirst`
`329`	`330`	`}`
	`331`	`+ if miniBlock.Type == block.SmartContractResultBlock {`
	`332`	`+ method = process.SearchMethodPeekWithFallbackSearchFirst`
	`333`	`+ }`
`330`	`334`
`331`	`335`	`for j := 0; j < len(miniBlock.TxHashes); j++ {`
`332`	`336`	`txHash := miniBlock.TxHashes[j]`