fix gasused

smartcontractkit · Oct 2, 2023 · 397b278 · 397b278
1 parent 83c2271
commit 397b278
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/integration-tests/actions/ccip_helpers.go b/integration-tests/actions/ccip_helpers.go
@@ -1201,12 +1201,16 @@ func (destCCIP *DestCCIPModule) AssertEventExecutionStateChanged(
 				if err != nil {
 					lggr.Warn().Msg("Failed to get receipt for ExecStateChanged event")
 				}
+				var gasUsed uint64
+				if receipt != nil {
+					gasUsed = receipt.GasUsed
+				}
 				if abihelpers.MessageExecutionState(e.State) == abihelpers.ExecutionStateSuccess {
 					reports.UpdatePhaseStats(reqNo, seqNum, testreporters.ExecStateChanged, receivedAt.Sub(timeNow),
 						testreporters.Success,
 						testreporters.TransactionStats{
 							TxHash:  vLogs.TxHash.Hex(),
-							GasUsed: receipt.GasUsed,
+							GasUsed: gasUsed,
 						})
 					return nil
 				} else {
@@ -1266,9 +1270,13 @@ func (destCCIP *DestCCIPModule) AssertEventReportAccepted(
 				if err != nil {
 					lggr.Warn().Msg("Failed to get receipt for ReportAccepted event")
 				}
+				var gasUsed uint64
+				if receipt != nil {
+					gasUsed = receipt.GasUsed
+				}
 				reports.UpdatePhaseStats(reqNo, seqNum, testreporters.Commit, totalTime, testreporters.Success,
 					testreporters.TransactionStats{
-						GasUsed:    receipt.GasUsed,
+						GasUsed:    gasUsed,
 						TxHash:     reportAccepted.Raw.TxHash.String(),
 						CommitRoot: fmt.Sprintf("%x", reportAccepted.Report.MerkleRoot),
 					})
@@ -1315,9 +1323,13 @@ func (destCCIP *DestCCIPModule) AssertReportBlessed(
 				if err != nil {
 					lggr.Fatal().Err(err).Msg("Failed to get receipt for ReportBlessed event")
 				}
+				var gasUsed uint64
+				if receipt != nil {
+					gasUsed = receipt.GasUsed
+				}
 				reports.UpdatePhaseStats(reqNo, seqNum, testreporters.ReportBlessed, receivedAt.Sub(prevEventAt), testreporters.Success,
 					testreporters.TransactionStats{
-						GasUsed:    receipt.GasUsed,
+						GasUsed:    gasUsed,
 						TxHash:     vLogs.TxHash.String(),
 						CommitRoot: fmt.Sprintf("%x", CommitReport.MerkleRoot),
 					})

diff --git a/integration-tests/load/ccip_loadgen.go b/integration-tests/load/ccip_loadgen.go
@@ -203,10 +203,14 @@ func (c *CCIPE2ELoad) Call(_ *wasp.Generator) *wasp.CallResult {
 			txConfirmationTime = hdr.Timestamp
 		}
 	}
+	var gasUsed uint64
+	if rcpt != nil {
+		gasUsed = rcpt.GasUsed
+	}
 	c.reports.UpdatePhaseStats(msgSerialNo, 0, testreporters.TX, startTime.Sub(txConfirmationTime), testreporters.Success,
 		testreporters.TransactionStats{
 			Fee:                fee.String(),
-			GasUsed:            rcpt.GasUsed,
+			GasUsed:            gasUsed,
 			TxHash:             sendTx.Hash().Hex(),
 			NoOfTokensSent:     len(msg.TokenAmounts),
 			MessageBytesLength: len(msg.Data),