fix after review

multiversx · Oct 11, 2024 · 0585d97 · 0585d97
1 parent be94f0e
commit 0585d97
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/node/external/transactionAPI/apiTransactionProcessor.go b/node/external/transactionAPI/apiTransactionProcessor.go
@@ -595,6 +595,7 @@ func putMiniblockFieldsOnInnerTxs(tx *transaction.ApiTransactionResult) {
 	for _, innerTx := range tx.InnerTransactions {
 		innerTx.Epoch = tx.Epoch
 		innerTx.Round = tx.Round
+		innerTx.MiniBlockHash = tx.MiniBlockHash
 	}
 }
 

diff --git a/process/smartContract/processorV2/processV2.go b/process/smartContract/processorV2/processV2.go
@@ -1431,7 +1431,6 @@ func (sc *scProcessor) getOriginalTxHashIfIntraShardRelayedSCR(
 	// even for intra-shard sc calls
 	if !bytes.Equal(relayedSCR.PrevTxHash, relayedSCR.OriginalTxHash) {
 		return txHash, relayedSCR.OriginalTxHash, isRelayed
-
 	}
 
 	return relayedSCR.OriginalTxHash, relayedSCR.OriginalTxHash, isRelayed

diff --git a/process/smartContract/processorV2/process_test.go b/process/smartContract/processorV2/process_test.go
@@ -4084,8 +4084,8 @@ func TestProcessGetOriginalTxHashForRelayedIntraShard(t *testing.T) {
 	scrHash := []byte("hash")
 
 	// scr not relayed
-	logHash, scrHash, isRelayed := sc.getOriginalTxHashIfIntraShardRelayedSCR(scr, scrHash)
-	assert.Equal(t, scrHash, logHash)
+	hashForLogSave, scrHash, isRelayed := sc.getOriginalTxHashIfIntraShardRelayedSCR(scr, scrHash)
+	assert.Equal(t, scrHash, hashForLogSave)
 	assert.Equal(t, scrHash, scrHash)
 	assert.False(t, isRelayed)
 
@@ -4094,14 +4094,14 @@ func TestProcessGetOriginalTxHashForRelayedIntraShard(t *testing.T) {
 	scr.RelayerAddr = bytes.Repeat([]byte{1}, 32)
 	scr.SndAddr = bytes.Repeat([]byte{1}, 32)
 	scr.RcvAddr = bytes.Repeat([]byte{1}, 32)
-	logHash, originalTxHash, isRelayed := sc.getOriginalTxHashIfIntraShardRelayedSCR(scr, scrHash)
-	assert.Equal(t, scr.OriginalTxHash, logHash)
+	hashForLogSave, originalTxHash, isRelayed := sc.getOriginalTxHashIfIntraShardRelayedSCR(scr, scrHash)
+	assert.Equal(t, scr.OriginalTxHash, hashForLogSave)
 	assert.Equal(t, scr.OriginalTxHash, originalTxHash)
 	assert.True(t, isRelayed)
 
 	scr.RcvAddr = bytes.Repeat([]byte{2}, 32)
-	logHash, originalTxHash, _ = sc.getOriginalTxHashIfIntraShardRelayedSCR(scr, scrHash)
-	assert.Equal(t, scrHash, logHash)
+	hashForLogSave, originalTxHash, _ = sc.getOriginalTxHashIfIntraShardRelayedSCR(scr, scrHash)
+	assert.Equal(t, scrHash, hashForLogSave)
 	assert.Equal(t, scr.OriginalTxHash, originalTxHash)
 }