Skip to content

Commit

Permalink
Minor improvs overall
Browse files Browse the repository at this point in the history
  • Loading branch information
rodrigo-pino committed Sep 27, 2023
1 parent beec66c commit 2b095c4
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 19 deletions.
26 changes: 10 additions & 16 deletions integration_tests/cairozero_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,11 @@ import (
)

func TestCairoZeroFiles(t *testing.T) {
runtimeErrors := make([]error, 0)

root := "./cairo_files/"
testFiles, err := os.ReadDir(root)
require.NoError(t, err)

// filter is for debugging purposes
filter := ""

for _, dirEntry := range testFiles {
Expand All @@ -38,49 +37,44 @@ func TestCairoZeroFiles(t *testing.T) {

compiledOutput, err := compileZeroCode(path)
if err != nil {
runtimeErrors = append(runtimeErrors, err)
t.Error(err)
continue
}

pyTraceFile, pyMemoryFile, err := runPythonVm(compiledOutput)
if err != nil {
runtimeErrors = append(runtimeErrors, err)
t.Error(err)
continue
}

traceFile, memoryFile, err := runVm(compiledOutput)
if err != nil {
runtimeErrors = append(runtimeErrors, err)
t.Error(err)
continue
}

pyTrace, pyMemory, err := decodeProof(pyTraceFile, pyMemoryFile)
if err != nil {
runtimeErrors = append(runtimeErrors, err)
t.Error(err)
continue
}

trace, memory, err := decodeProof(traceFile, memoryFile)
if err != nil {
runtimeErrors = append(runtimeErrors, err)
t.Error(err)
continue
}

if !assert.Equal(t, pyTrace, trace) {
t.Logf("pytrace:\n%s", traceRepr(pyTrace))
t.Logf("trace:\n%s", traceRepr(trace))
t.Logf("pytrace:\n%s\n", traceRepr(pyTrace))
t.Logf("trace:\n%s\n", traceRepr(trace))
}
if !assert.Equal(t, pyMemory, memory) {
t.Logf("pymemory;\n%s", memoryRepr(pyMemory))
t.Logf("memory;\n%s", memoryRepr(memory))
t.Logf("pymemory;\n%s\n", memoryRepr(pyMemory))
t.Logf("memory;\n%s\n", memoryRepr(memory))
}
}

require.NoError(t, err)
for i := range runtimeErrors {
assert.NoError(t, runtimeErrors[i])
}

clean(root)
}

Expand Down
6 changes: 3 additions & 3 deletions pkg/runners/zero/zero.go
Original file line number Diff line number Diff line change
Expand Up @@ -270,15 +270,15 @@ func (runner *ZeroRunner) RunUntilPc(pc *memory.MemoryAddress) error {
if runner.steps() >= runner.maxsteps {
return fmt.Errorf(
"pc %s step %d: max step limit exceeded (%d)",
runner.pc().String(),
runner.pc(),
runner.steps(),
runner.maxsteps,
)
}

err := runner.vm.RunStep(runner.hintrunner)
if err != nil {
return fmt.Errorf("pc %d step %d: %w", runner.pc(), runner.steps(), err)
return fmt.Errorf("pc %s step %d: %w", runner.pc(), runner.steps(), err)
}
}
return nil
Expand All @@ -289,7 +289,7 @@ func (runner *ZeroRunner) RunFor(steps uint64) error {
if runner.steps() >= runner.maxsteps {
return fmt.Errorf(
"pc %s step %d: max step limit exceeded (%d)",
runner.pc().String(),
runner.pc(),
runner.steps(),
runner.maxsteps,
)
Expand Down

0 comments on commit 2b095c4

Please sign in to comment.