Merge remote-tracking branch 'origin/main' into pedro/remove_gethnetwork

ten-protocol · Feb 9, 2023 · 16eb861 · 16eb861
2 parents fa203f6 + 6e145dc
commit 16eb861
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/go/enclave/enclave.go b/go/enclave/enclave.go
@@ -248,8 +248,8 @@ func (e *enclaveImpl) SubmitL1Block(block types.Block, receipts types.Receipts,
 	// We remove any transactions considered immune to re-orgs from the mempool.
 	if blockSubmissionResponse.ProducedBatch != nil {
 		err = e.removeOldMempoolTxs(blockSubmissionResponse.ProducedBatch.Header)
-		e.logger.Error("removeOldMempoolTxs fail", "blk", block.Number(), "blkHash", block.Hash(), log.ErrKey, err)
 		if err != nil {
+			e.logger.Error("removeOldMempoolTxs fail", "blk", block.Number(), "blkHash", block.Hash(), log.ErrKey, err)
 			return nil, e.rejectBlockErr(fmt.Errorf("could not remove transactions from mempool. Cause: %w", err))
 		}
 	}