Resolve lint issues for rvgol and rvsol

Author: mininny

op-e2e/e2eutils/disputegame/output_asterisc_helper.go

@@ -77,7 +77,7 @@ func (g *OutputAsteriscGameHelper) CreateHonestActor(ctx context.Context, l2Node
 	prestateProvider := outputs.NewPrestateProvider(rollupClient, actorCfg.PrestateBlock)
 	l1Head := g.GetL1Head(ctx)
 	accessor, err := outputs.NewOutputAsteriscTraceAccessor(
-		logger, metrics.NoopMetrics, cfg.Asterisc, vm.NewOpProgramServerExecutor(), l2Client, prestateProvider, cfg.AsteriscAbsolutePreState, rollupClient, dir, l1Head, splitDepth, actorCfg.PrestateBlock, actorCfg.PoststateBlock)
+		logger, metrics.NoopMetrics, cfg.Asterisc, vm.NewOpProgramServerExecutor(logger), l2Client, prestateProvider, cfg.AsteriscAbsolutePreState, rollupClient, dir, l1Head, splitDepth, actorCfg.PrestateBlock, actorCfg.PoststateBlock)
 	g.Require.NoError(err, "Failed to create output asterisc trace accessor")
 	return op_e2e_disputegame.NewOutputHonestHelper(g.T, g.Require, &g.OutputGameHelper, g.Game, accessor)
 }
@@ -279,7 +279,7 @@ func (g *OutputAsteriscGameHelper) createAsteriscTraceProvider(ctx context.Conte
 		localContext = outputs.CreateLocalContext(pre, post)
 		dir := filepath.Join(cfg.Datadir, "asterisc-trace")
 		subdir := filepath.Join(dir, localContext.Hex())
-		return asterisc.NewTraceProviderForTest(logger, metrics.NoopMetrics.VmMetrics(types.TraceTypeAsterisc.String()), cfg, localInputs, subdir, g.MaxDepth(ctx)-splitDepth-1), nil
+		return asterisc.NewTraceProviderForTest(logger, metrics.NoopMetrics.ToTypedVmMetrics(types.TraceTypeAsterisc.String()), cfg, localInputs, subdir, g.MaxDepth(ctx)-splitDepth-1), nil
 	})
 
 	claims, err := g.Game.GetAllClaims(ctx, rpcblock.Latest)

op-e2e/faultproofs/precompile_test.go

@@ -262,7 +262,7 @@ func runAsterisc(t *testing.T, ctx context.Context, sys *e2esys.System, inputs u
 	asteriscOpts(&cfg)
 
 	logger := testlog.Logger(t, log.LevelInfo).New("role", "asterisc")
-	executor := vm.NewExecutor(logger, metrics.NoopMetrics.VmMetrics("asterisc"), cfg.Asterisc, vm.NewOpProgramServerExecutor(), cfg.AsteriscAbsolutePreState, inputs)
+	executor := vm.NewExecutor(logger, metrics.NoopMetrics.ToTypedVmMetrics("asterisc"), cfg.Asterisc, vm.NewOpProgramServerExecutor(logger), cfg.AsteriscAbsolutePreState, inputs)
 
 	t.Log("Running asterisc")
 	err := executor.DoGenerateProof(ctx, proofsDir, math.MaxUint, math.MaxUint, extraVmArgs...)

rvsol/src/RISCV.sol

@@ -1129,10 +1129,10 @@ contract RISCV is IBigStepper {
                     // futex - not supported, for now
                     revertWithCode(0xf001ca11) // unsupported system call
                 }
-//                case 101 {
-//                    // nanosleep - not supported, for now
-//                    revertWithCode(0xf001ca11) // unsupported system call
-//                }
+                //                case 101 {
+                //                    // nanosleep - not supported, for now
+                //                    revertWithCode(0xf001ca11) // unsupported system call
+                //                }
                 default {
                     // Ignore(no-op) unsupported system calls
                     setRegister(toU64(10), toU64(0))