Merge pull request OffchainLabs#512 from OffchainLabs/silence-validat…

…or-context-canceled Silence validator context canceled error
circle-smartin · Apr 13, 2022 · a961c89 · a961c89
2 parents b7d6484 + f036e68
commit a961c89
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/validator/block_validator.go b/validator/block_validator.go
@@ -333,7 +333,9 @@ func (v *BlockValidator) validate(ctx context.Context, validationStatus *validat
 	log.Info("starting validation for block", "blockNr", entry.BlockNumber)
 	gsEnd, delayedMsg, err := v.executeBlock(ctx, entry, preimages, seqMsg, v.validateWasmModuleRoot)
 	if err != nil {
-		log.Error("Validation of block failed", "err", err)
+		if !errors.Is(err, context.Canceled) && !errors.Is(err, context.DeadlineExceeded) {
+			log.Error("Validation of block failed", "err", err)
+		}
 		return
 	}
 	gsExpected := entry.expectedEnd()

diff --git a/validator/stateless_block_validator.go b/validator/stateless_block_validator.go
@@ -346,10 +346,6 @@ func (v *StatelessBlockValidator) executeBlock(ctx context.Context, entry *valid
 			log.Info("validation", "block", entry.BlockNumber, "steps", steps)
 		}
 		if err != nil {
-			if !errors.Is(err, context.Canceled) && !errors.Is(err, context.DeadlineExceeded) {
-				log.Error("running machine failed", "err", err)
-				panic("Failed to run machine: " + err.Error())
-			}
 			return GoGlobalState{}, nil, fmt.Errorf("machine execution failed with error: %w", err)
 		}
 		steps += count