feat: reorganize runner package (#654)

* reorganize runner package * restore CLI file * fix
NethermindEth · Sep 9, 2024 · 4d93227 · 4d93227
1 parent e821f4c
commit 4d93227
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 21 deletions.
diff --git a/cmd/cli/main.go b/cmd/cli/main.go
@@ -11,7 +11,7 @@ import (
 	cairoversion "github.com/NethermindEth/cairo-vm-go/pkg/parsers/cairo_version"
 	"github.com/NethermindEth/cairo-vm-go/pkg/parsers/starknet"
 	zero "github.com/NethermindEth/cairo-vm-go/pkg/parsers/zero"
-	runnerzero "github.com/NethermindEth/cairo-vm-go/pkg/runners/zero"
+	"github.com/NethermindEth/cairo-vm-go/pkg/runner"
 	"github.com/urfave/cli/v2"
 )
 
@@ -120,12 +120,12 @@ func main() {
 							return fmt.Errorf("cannot create hints: %w", err)
 						}
 					}
-					program, err := runnerzero.LoadCairoZeroProgram(zeroProgram)
+					program, err := runner.LoadCairoZeroProgram(zeroProgram)
 					if err != nil {
 						return fmt.Errorf("cannot load program: %w", err)
 					}
 					fmt.Println("Running....")
-					runner, err := runnerzero.NewRunner(program, hints, proofmode, collectTrace, maxsteps, layoutName)
+					runner, err := runner.NewRunner(program, hints, proofmode, collectTrace, maxsteps, layoutName)
 					if err != nil {
 						return fmt.Errorf("cannot create runner: %w", err)
 					}

diff --git a/pkg/runners/zero/program.go → pkg/runner/program.go b/pkg/runners/zero/program.go → pkg/runner/program.go
@@ -1,4 +1,4 @@
-package zero
+package runner
 
 import (
 	"fmt"
@@ -8,7 +8,7 @@ import (
 	"github.com/consensys/gnark-crypto/ecc/stark-curve/fp"
 )
 
-type Program struct {
+type ZeroProgram struct {
 	// the bytecode in string format
 	Bytecode []*fp.Element
 	// given a string it returns the pc for that function call
@@ -19,7 +19,9 @@ type Program struct {
 	Builtins []sn.Builtin
 }
 
-func LoadCairoZeroProgram(cairoZeroJson *zero.ZeroProgram) (*Program, error) {
+type CairoProgram struct{}
+
+func LoadCairoZeroProgram(cairoZeroJson *zero.ZeroProgram) (*ZeroProgram, error) {
 	// bytecode
 	bytecode := make([]*fp.Element, len(cairoZeroJson.Data))
 	for i := range cairoZeroJson.Data {
@@ -43,7 +45,7 @@ func LoadCairoZeroProgram(cairoZeroJson *zero.ZeroProgram) (*Program, error) {
 		return nil, err
 	}
 
-	return &Program{
+	return &ZeroProgram{
 		Bytecode:    bytecode,
 		Entrypoints: entrypoints,
 		Labels:      labels,

diff --git a/pkg/runners/zero/program_test.go → pkg/runner/program_test.go b/pkg/runners/zero/program_test.go → pkg/runner/program_test.go
@@ -1,4 +1,4 @@
-package zero
+package runner
 
 import (
 	"testing"
@@ -50,7 +50,7 @@ func TestLoadCairoZeroProgram(t *testing.T) {
 	program, err := LoadCairoZeroProgram(cairoZeroJson)
 	require.NoError(t, err)
 
-	require.Equal(t, &Program{
+	require.Equal(t, &ZeroProgram{
 		Bytecode: []*fp.Element{
 			stringToFelt("0x01"),
 			stringToFelt("0x02"),

diff --git a/pkg/runners/zero/zero.go → pkg/runner/runner.go b/pkg/runners/zero/zero.go → pkg/runner/runner.go
@@ -1,4 +1,4 @@
-package zero
+package runner
 
 import (
 	"errors"
@@ -16,7 +16,7 @@ import (
 
 type ZeroRunner struct {
 	// core components
-	program    *Program
+	program    *ZeroProgram
 	vm         *vm.VirtualMachine
 	hintrunner hintrunner.HintRunner
 	// config
@@ -28,8 +28,10 @@ type ZeroRunner struct {
 	layout      builtins.Layout
 }
 
+type CairoRunner struct{}
+
 // Creates a new Runner of a Cairo Zero program
-func NewRunner(program *Program, hints map[uint64][]hinter.Hinter, proofmode bool, collectTrace bool, maxsteps uint64, layoutName string) (ZeroRunner, error) {
+func NewRunner(program *ZeroProgram, hints map[uint64][]hinter.Hinter, proofmode bool, collectTrace bool, maxsteps uint64, layoutName string) (ZeroRunner, error) {
 	hintrunner := hintrunner.NewHintRunner(hints)
 	layout, err := builtins.GetLayout(layoutName)
 	if err != nil {

diff --git a/pkg/runners/zero/zero_benchmark_test.go → pkg/runner/runner_benchmark_test.go b/pkg/runners/zero/zero_benchmark_test.go → pkg/runner/runner_benchmark_test.go
@@ -1,4 +1,4 @@
-package zero
+package runner
 
 import (
 	"math"

diff --git a/pkg/runners/zero/zero_test.go → pkg/runner/runner_test.go b/pkg/runners/zero/zero_test.go → pkg/runner/runner_test.go
@@ -1,4 +1,4 @@
-package zero
+package runner
 
 import (
 	"fmt"
@@ -414,13 +414,13 @@ func trimmedSegment(segment *memory.Segment) *memory.Segment {
 	return segment
 }
 
-func createProgram(code string) *Program {
+func createProgram(code string) *ZeroProgram {
 	bytecode, err := assembler.CasmToBytecode(code)
 	if err != nil {
 		panic(err)
 	}
 
-	program := Program{
+	program := ZeroProgram{
 		Bytecode: bytecode,
 		Entrypoints: map[string]uint64{
 			"main": 0,
@@ -430,7 +430,7 @@ func createProgram(code string) *Program {
 	return &program
 }
 
-func createProgramWithBuiltins(code string, builtins ...sn.Builtin) *Program {
+func createProgramWithBuiltins(code string, builtins ...sn.Builtin) *ZeroProgram {
 	program := createProgram(code)
 	program.Builtins = builtins
 	return program

diff --git a/pkg/runners/cairo/cairo.go b/pkg/runners/cairo/cairo.go
diff --git a/pkg/runners/cairo/cairo_test.go b/pkg/runners/cairo/cairo_test.go
diff --git a/pkg/runners/cairo/program.go b/pkg/runners/cairo/program.go
diff --git a/pkg/runners/cairo/program_test.go b/pkg/runners/cairo/program_test.go