fix merge errors

OffchainLabs · Aug 25, 2023 · b5e83e1 · b5e83e1
1 parent 8072011
commit b5e83e1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/arbos/tx_processor.go b/arbos/tx_processor.go
@@ -112,7 +112,7 @@ func (p *TxProcessor) ExecuteWASM(scope *vm.ScopeContext, input []byte, interpre
 	acting := contract.Address()
 
 	var tracingInfo *util.TracingInfo
-	if interpreter.Config().Debug {
+	if interpreter.Config().Tracer != nil {
 		caller := contract.CallerAddress
 		tracingInfo = util.NewTracingInfo(interpreter.Evm(), caller, acting, util.TracingDuringEVM)
 	}

diff --git a/system_tests/program_test.go b/system_tests/program_test.go
@@ -828,9 +828,9 @@ func setupProgramTest(t *testing.T, file string, jit bool) (
 	l2config.BlockValidator.Enable = false
 	l2config.Staker.Enable = true
 	l2config.BatchPoster.Enable = true
-	l2config.L1Reader.Enable = true
+	l2config.ParentChainReader.Enable = true
 	l2config.Sequencer.MaxRevertGasReject = 0
-	l2config.L1Reader.OldHeaderTimeout = 10 * time.Minute
+	l2config.ParentChainReader.OldHeaderTimeout = 10 * time.Minute
 	valConf := valnode.TestValidationConfig
 	valConf.UseJit = jit
 	_, valStack := createTestValidationNode(t, ctx, &valConf)