From 41894c8cd1b1dc05c5971c20a3fc1fdec5385b59 Mon Sep 17 00:00:00 2001 From: Carmen Cabrera Date: Mon, 22 Jan 2024 11:44:09 +0100 Subject: [PATCH] use any instead of interface{} --- pkg/hintrunner/hintparser.go | 20 ++++++++++---------- pkg/hintrunner/zerohint.go | 2 +- pkg/parsers/starknet/hint.go | 8 ++++---- pkg/parsers/starknet/starknet.go | 4 ++-- pkg/utils/keccak_test.go | 6 +++--- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/pkg/hintrunner/hintparser.go b/pkg/hintrunner/hintparser.go index 7951c4f0f..bb7814b9c 100644 --- a/pkg/hintrunner/hintparser.go +++ b/pkg/hintrunner/hintparser.go @@ -87,7 +87,7 @@ type DerefDeref struct { // AST Functionality -func (expression IdentifierExp) Evaluate() (interface{}, error) { +func (expression IdentifierExp) Evaluate() (any, error) { switch { case expression.DerefCastExp != nil: return expression.DerefCastExp.Evaluate() @@ -98,7 +98,7 @@ func (expression IdentifierExp) Evaluate() (interface{}, error) { } } -func (expression DerefCastExp) Evaluate() (interface{}, error) { +func (expression DerefCastExp) Evaluate() (any, error) { value, err := expression.CastExp.ValueExpr.Evaluate() if err != nil { return nil, err @@ -124,7 +124,7 @@ func (expression DerefCastExp) Evaluate() (interface{}, error) { } } -func (expression CastExp) Evaluate() (interface{}, error) { +func (expression CastExp) Evaluate() (any, error) { value, err := expression.ValueExpr.Evaluate() if err != nil { return nil, err @@ -157,7 +157,7 @@ func (expression CastExp) Evaluate() (interface{}, error) { } } -func (expression Expression) Evaluate() (interface{}, error) { +func (expression Expression) Evaluate() (any, error) { switch { case expression.CellRefExp != nil: return expression.CellRefExp.Evaluate() @@ -170,7 +170,7 @@ func (expression Expression) Evaluate() (interface{}, error) { } } -func (expression RegisterOffset) Evaluate() (interface{}, error) { +func (expression RegisterOffset) Evaluate() (any, error) { offsetValue, _ := expression.Offset.Evaluate() offset := int16(*offsetValue) if expression.Operator == "-" { @@ -180,7 +180,7 @@ func (expression RegisterOffset) Evaluate() (interface{}, error) { return EvaluateRegister(expression.Register, offset) } -func (expression CellRefExp) Evaluate() (interface{}, error) { +func (expression CellRefExp) Evaluate() (any, error) { if expression.RegisterOffset != nil { return expression.RegisterOffset.Evaluate() } @@ -211,7 +211,7 @@ func (expression OffsetExp) Evaluate() (*int, error) { } } -func (expression DerefExp) Evaluate() (interface{}, error) { +func (expression DerefExp) Evaluate() (any, error) { cellRefExp, err := expression.CellRefExp.Evaluate() if err != nil { return nil, err @@ -223,7 +223,7 @@ func (expression DerefExp) Evaluate() (interface{}, error) { return Deref{cellRef}, nil } -func (expression BinOpExp) Evaluate() (interface{}, error) { +func (expression BinOpExp) Evaluate() (any, error) { leftExp, err := expression.LeftExp.Evaluate() if err != nil { return nil, err @@ -276,7 +276,7 @@ func (expression BinOpExp) Evaluate() (interface{}, error) { return nil, fmt.Errorf("invalid binary operation") } -func (expression LeftExp) Evaluate() (interface{}, error) { +func (expression LeftExp) Evaluate() (any, error) { switch{ case expression.CellRefExp != nil: return expression.CellRefExp.Evaluate() @@ -286,7 +286,7 @@ func (expression LeftExp) Evaluate() (interface{}, error) { return nil, fmt.Errorf("Unexpected left expression in binary operation") } -func (expression RightExp) Evaluate() (interface{}, error) { +func (expression RightExp) Evaluate() (any, error) { switch{ case expression.DerefExp != nil: return expression.DerefExp.Evaluate() diff --git a/pkg/hintrunner/zerohint.go b/pkg/hintrunner/zerohint.go index 8dba0e387..3abf0418e 100644 --- a/pkg/hintrunner/zerohint.go +++ b/pkg/hintrunner/zerohint.go @@ -109,7 +109,7 @@ func GetParameters(zeroProgram *zero.ZeroProgram, hint zero.Hint, hintPC uint64) return cellRefParams, resOpParams, nil } -func ParseIdentifier(value string) (interface{}, error) { +func ParseIdentifier(value string) (any, error) { identifierExp, err := parser.ParseString("", value) if err != nil { return nil, err diff --git a/pkg/parsers/starknet/hint.go b/pkg/parsers/starknet/hint.go index 9900efcec..40d90e801 100644 --- a/pkg/parsers/starknet/hint.go +++ b/pkg/parsers/starknet/hint.go @@ -295,7 +295,7 @@ func (ro *ResOperand) UnmarshalJSON(data []byte) error { return err } - var op interface{} + var op any for k := range resOp { switch ResOperandName(k) { case DerefName: @@ -330,7 +330,7 @@ type InnerDoubleDeref struct { } func (i *InnerDoubleDeref) UnmarshalJSON(data []byte) error { - var s []interface{} + var s []any err := json.Unmarshal(data, &s) if err != nil { return err @@ -413,7 +413,7 @@ func (d *DerefOrImmediate) UnmarshalJSON(data []byte) error { return err } - var op interface{} + var op any for k := range rawDerefOrImmediate { switch ResOperandName(k) { case DerefName: @@ -450,7 +450,7 @@ func (h *Hint) UnmarshalJSON(data []byte) error { for k, v := range rawHint { h.Name = HintName(k) - var args interface{} + var args any switch h.Name { // Starknet hints diff --git a/pkg/parsers/starknet/starknet.go b/pkg/parsers/starknet/starknet.go index aaf45d9a5..eab3caa71 100644 --- a/pkg/parsers/starknet/starknet.go +++ b/pkg/parsers/starknet/starknet.go @@ -99,7 +99,7 @@ type Hints struct { // Hints are serialized as tuples of (index, []hint) // https://github.com/starkware-libs/cairo/blob/main/crates/cairo-lang-starknet/src/casm_contract_class.rs#L90 func (hints *Hints) UnmarshalJSON(data []byte) error { - var rawHints []interface{} + var rawHints []any if err := json.Unmarshal(data, &rawHints); err != nil { return err } @@ -124,7 +124,7 @@ func (hints *Hints) UnmarshalJSON(data []byte) error { } func (hints *Hints) MarshalJSON() ([]byte, error) { - var rawHints []interface{} + var rawHints []any rawHints = append(rawHints, hints.Index) rawHints = append(rawHints, hints.Hints) diff --git a/pkg/utils/keccak_test.go b/pkg/utils/keccak_test.go index 1f77ef714..1ce97c9ff 100644 --- a/pkg/utils/keccak_test.go +++ b/pkg/utils/keccak_test.go @@ -160,7 +160,7 @@ func TestCairoKeccak(t *testing.T) { func TestKeccakU256sLEInputs(t *testing.T) { cases := []struct { - input interface{} + input any expected string }{ { @@ -210,7 +210,7 @@ func TestKeccakU256sLEInputs(t *testing.T) { } // Helper Function for converting various input types to uint256 -func ConvertToUint256(input interface{}) *uint256.Int { +func ConvertToUint256(input any) *uint256.Int { switch v := input.(type) { case string: return StringToUint256(v) @@ -252,7 +252,7 @@ func createUint256IntFromBytes(b []byte) *uint256.Int { // BE (Big Endian) Input Tests func TestKeccakU256sBEInputs(t *testing.T) { cases := []struct { - input interface{} + input any expected string }{ {