From 68e77cd51842da51f8f0dd8cdb51bebbd5ca2d4c Mon Sep 17 00:00:00 2001 From: agnusmor Date: Wed, 14 Feb 2024 16:26:02 +0100 Subject: [PATCH 1/2] fix executor error closebatch --- state/batchV2.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/state/batchV2.go b/state/batchV2.go index f10b0ddef7..822242760e 100644 --- a/state/batchV2.go +++ b/state/batchV2.go @@ -165,7 +165,8 @@ func (s *State) ExecuteBatchV2(ctx context.Context, batch Batch, L1InfoTreeRoot if err != nil { log.Error("error executing batch: ", err) return nil, err - } else if processBatchResponse != nil && processBatchResponse.Error != executor.ExecutorError_EXECUTOR_ERROR_NO_ERROR { + + } else if processBatchResponse != nil && processBatchResponse.Error != executor.ExecutorError_EXECUTOR_ERROR_NO_ERROR && processBatchResponse.Error != executor.ExecutorError_EXECUTOR_ERROR_CLOSE_BATCH { err = executor.ExecutorErr(processBatchResponse.Error) s.eventLog.LogExecutorErrorV2(ctx, processBatchResponse.Error, processBatchRequest) } From b04964dbdf42afe9ec93956bebc262dae15de491 Mon Sep 17 00:00:00 2001 From: agnusmor Date: Wed, 14 Feb 2024 21:20:08 +0100 Subject: [PATCH 2/2] fix linter --- state/batchV2.go | 1 - 1 file changed, 1 deletion(-) diff --git a/state/batchV2.go b/state/batchV2.go index 822242760e..caa01c58cf 100644 --- a/state/batchV2.go +++ b/state/batchV2.go @@ -165,7 +165,6 @@ func (s *State) ExecuteBatchV2(ctx context.Context, batch Batch, L1InfoTreeRoot if err != nil { log.Error("error executing batch: ", err) return nil, err - } else if processBatchResponse != nil && processBatchResponse.Error != executor.ExecutorError_EXECUTOR_ERROR_NO_ERROR && processBatchResponse.Error != executor.ExecutorError_EXECUTOR_ERROR_CLOSE_BATCH { err = executor.ExecutorErr(processBatchResponse.Error) s.eventLog.LogExecutorErrorV2(ctx, processBatchResponse.Error, processBatchRequest)