From 739db259e39a1feca182869543d631a9cd519068 Mon Sep 17 00:00:00 2001 From: Evgeniy Stratonikov Date: Thu, 31 Mar 2022 09:55:25 +0300 Subject: [PATCH] smartcontract: remove unused `ParameterFromStackItem` It is exists from the times we used `smartcontract.Parameter` somewhere in the `NotificationEvent`/`ApplicationLog`. `stackitem.ToJSON` now handles this. Signed-off-by: Evgeniy Stratonikov --- pkg/smartcontract/convertor.go | 72 -------------------------- pkg/smartcontract/convertor_test.go | 79 ----------------------------- 2 files changed, 151 deletions(-) delete mode 100644 pkg/smartcontract/convertor.go delete mode 100644 pkg/smartcontract/convertor_test.go diff --git a/pkg/smartcontract/convertor.go b/pkg/smartcontract/convertor.go deleted file mode 100644 index fe977a91d..000000000 --- a/pkg/smartcontract/convertor.go +++ /dev/null @@ -1,72 +0,0 @@ -package smartcontract - -import ( - "fmt" - "math/big" - - "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" -) - -// ParameterFromStackItem converts stackitem.Item to Parameter. -func ParameterFromStackItem(i stackitem.Item, seen map[stackitem.Item]bool) Parameter { - switch t := i.(type) { - case stackitem.Null, *stackitem.Pointer: - return NewParameter(AnyType) - case *stackitem.BigInteger: - return Parameter{ - Type: IntegerType, - Value: i.Value().(*big.Int), - } - case stackitem.Bool: - return Parameter{ - Type: BoolType, - Value: i.Value().(bool), - } - case *stackitem.ByteArray: - return Parameter{ - Type: ByteArrayType, - Value: i.Value().([]byte), - } - case *stackitem.Interop: - return Parameter{ - Type: InteropInterfaceType, - Value: nil, - } - case *stackitem.Buffer: - return Parameter{ - Type: ByteArrayType, - Value: i.Value().([]byte), - } - case *stackitem.Struct, *stackitem.Array: - var value []Parameter - - if !seen[i] { - seen[i] = true - for _, stackItem := range i.Value().([]stackitem.Item) { - parameter := ParameterFromStackItem(stackItem, seen) - value = append(value, parameter) - } - } - return Parameter{ - Type: ArrayType, - Value: value, - } - case *stackitem.Map: - value := make([]ParameterPair, 0) - if !seen[i] { - seen[i] = true - for _, element := range i.Value().([]stackitem.MapElement) { - value = append(value, ParameterPair{ - Key: ParameterFromStackItem(element.Key, seen), - Value: ParameterFromStackItem(element.Value, seen), - }) - } - } - return Parameter{ - Type: MapType, - Value: value, - } - default: - panic(fmt.Sprintf("unknown stack item type: %v", t)) - } -} diff --git a/pkg/smartcontract/convertor_test.go b/pkg/smartcontract/convertor_test.go deleted file mode 100644 index 3aaae34d5..000000000 --- a/pkg/smartcontract/convertor_test.go +++ /dev/null @@ -1,79 +0,0 @@ -package smartcontract - -import ( - "math/big" - "testing" - - "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" - "github.com/stretchr/testify/assert" -) - -var toContractParameterTestCases = []struct { - input stackitem.Item - result Parameter -}{ - { - input: stackitem.NewStruct([]stackitem.Item{ - stackitem.NewBigInteger(big.NewInt(1)), - stackitem.NewBool(true), - }), - result: Parameter{Type: ArrayType, Value: []Parameter{ - {Type: IntegerType, Value: big.NewInt(1)}, - {Type: BoolType, Value: true}, - }}, - }, - { - input: stackitem.NewBool(false), - result: Parameter{Type: BoolType, Value: false}, - }, - { - input: stackitem.NewByteArray([]byte{0x01, 0x02, 0x03}), - result: Parameter{Type: ByteArrayType, Value: []byte{0x01, 0x02, 0x03}}, - }, - { - input: stackitem.NewBuffer([]byte{0x01, 0x02, 0x03}), - result: Parameter{Type: ByteArrayType, Value: []byte{0x01, 0x02, 0x03}}, - }, - { - input: stackitem.NewArray([]stackitem.Item{stackitem.NewBigInteger(big.NewInt(2)), stackitem.NewBool(true)}), - result: Parameter{Type: ArrayType, Value: []Parameter{ - {Type: IntegerType, Value: big.NewInt(2)}, - {Type: BoolType, Value: true}, - }}, - }, - { - input: stackitem.NewInterop(nil), - result: Parameter{Type: InteropInterfaceType, Value: nil}, - }, - { - input: stackitem.NewMapWithValue([]stackitem.MapElement{ - {Key: stackitem.NewBigInteger(big.NewInt(1)), Value: stackitem.NewBool(true)}, - {Key: stackitem.NewByteArray([]byte("qwerty")), Value: stackitem.NewBigInteger(big.NewInt(3))}, - {Key: stackitem.NewBool(true), Value: stackitem.NewBool(false)}, - }), - result: Parameter{ - Type: MapType, - Value: []ParameterPair{ - { - Key: Parameter{Type: IntegerType, Value: big.NewInt(1)}, - Value: Parameter{Type: BoolType, Value: true}, - }, { - Key: Parameter{Type: ByteArrayType, Value: []byte("qwerty")}, - Value: Parameter{Type: IntegerType, Value: big.NewInt(3)}, - }, { - - Key: Parameter{Type: BoolType, Value: true}, - Value: Parameter{Type: BoolType, Value: false}, - }, - }, - }, - }, -} - -func TestToContractParameter(t *testing.T) { - for _, tc := range toContractParameterTestCases { - seen := make(map[stackitem.Item]bool) - res := ParameterFromStackItem(tc.input, seen) - assert.Equal(t, res, tc.result) - } -}