Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: convert felt to uint64 in hints where possible #484

Merged
merged 10 commits into from
Jul 3, 2024
Merged

feat: convert felt to uint64 in hints where possible #484

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6b8318a
convert felt to uint64 where possible
TAdev0 Jun 25, 2024
528c8bb
Merge branch 'main' into felt_to_int
TAdev0 Jun 27, 2024
93f1a5f
make it work
TAdev0 Jun 27, 2024
f57c1f5
update unit test
TAdev0 Jun 27, 2024
d2745c5
Merge branch 'main' into felt_to_int
Sh0g0-1758 Jun 27, 2024
cee27a6
Merge branch 'main' into felt_to_int
TAdev0 Jun 28, 2024
a2a8996
Merge branch 'main' into felt_to_int
TAdev0 Jun 28, 2024
12201a4
Merge branch 'main' into felt_to_int
TAdev0 Jul 3, 2024
fc40e4f
update comment
TAdev0 Jul 3, 2024
dc040e5
Merge branch 'felt_to_int' of https://github.com/TAdev0/cairo-vm-go i…
TAdev0 Jul 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions pkg/hintrunner/zero/zerohint_others.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,11 @@ func newMemContinueHint(continueTarget hinter.ResOperander, memset bool) hinter.
return err
}

newN, ok := n.(fp.Element)
newN, ok := n.(uint64)
if !ok {
return fmt.Errorf("casting n into a felt failed")
TAdev0 marked this conversation as resolved.
Show resolved Hide resolved
}

newN.Sub(&newN, &utils.FeltOne)
newN = newN - 1

if err := ctx.ScopeManager.AssignVariable("n", newN); err != nil {
return err
Expand All @@ -55,7 +54,7 @@ func newMemContinueHint(continueTarget hinter.ResOperander, memset bool) hinter.
}

var continueTargetMv memory.MemoryValue
if utils.FeltLt(&utils.FeltZero, &newN) {
if newN > 0 {
continueTargetMv = memory.MemoryValueFromFieldElement(&utils.FeltOne)
} else {
continueTargetMv = memory.MemoryValueFromFieldElement(&utils.FeltZero)
Expand Down Expand Up @@ -127,12 +126,12 @@ func newMemEnterScopeHint(value hinter.ResOperander, memset bool) hinter.Hinter
// MemcpyEnterScope
//> vm_enter_scope({'n': ids.len})

value, err := hinter.ResolveAsFelt(vm, value)
value, err := hinter.ResolveAsUint64(vm, value)
if err != nil {
return err
}

ctx.ScopeManager.EnterScope(map[string]any{"n": *value})
ctx.ScopeManager.EnterScope(map[string]any{"n": value})
return nil
},
}
Expand Down
10 changes: 5 additions & 5 deletions pkg/hintrunner/zero/zerohint_others_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ func TestZeroHintOthers(t *testing.T) {
{Name: "continue_copying", Kind: uninitialized},
},
ctxInit: func(ctx *hinter.HintRunnerContext) {
err := ctx.ScopeManager.AssignVariable("n", *feltInt64(1))
err := ctx.ScopeManager.AssignVariable("n", uint64(1))
if err != nil {
t.Fatal(err)
}
Expand All @@ -25,7 +25,7 @@ func TestZeroHintOthers(t *testing.T) {
return newMemContinueHint(ctx.operanders["continue_copying"], false)
},
check: func(t *testing.T, ctx *hintTestContext) {
varValueInScopeEquals("n", *feltInt64(0))(t, ctx)
varValueInScopeEquals("n", uint64(0))(t, ctx)
varValueEquals("continue_copying", feltInt64(0))(t, ctx)
},
},
Expand All @@ -34,7 +34,7 @@ func TestZeroHintOthers(t *testing.T) {
{Name: "continue_copying", Kind: uninitialized},
},
ctxInit: func(ctx *hinter.HintRunnerContext) {
err := ctx.ScopeManager.AssignVariable("n", *feltInt64(5))
err := ctx.ScopeManager.AssignVariable("n", uint64(5))
if err != nil {
t.Fatal(err)
}
Expand All @@ -43,7 +43,7 @@ func TestZeroHintOthers(t *testing.T) {
return newMemContinueHint(ctx.operanders["continue_copying"], false)
},
check: func(t *testing.T, ctx *hintTestContext) {
varValueInScopeEquals("n", *feltInt64(4))(t, ctx)
varValueInScopeEquals("n", uint64(4))(t, ctx)
varValueEquals("continue_copying", feltInt64(1))(t, ctx)
},
},
Expand All @@ -56,7 +56,7 @@ func TestZeroHintOthers(t *testing.T) {
makeHinter: func(ctx *hintTestContext) hinter.Hinter {
return newMemEnterScopeHint(ctx.operanders["len"], false)
},
check: varValueInScopeEquals("n", *feltUint64(1)),
check: varValueInScopeEquals("n", uint64(1)),
},
},
"SearchSortedLower": {
Expand Down
Loading