TrueCloudLab/neoneo-go
7
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1002 from nspcc-dev/neo3/interop/sort_find

Browse source 
core: sort results of Storage.Find interop and NEO.getRegisterValidators
This commit is contained in:
Roman Khimov 2020-05-30 15:34:41 +03:00 committed by GitHub
commit 46cd14a892
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 38 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkg/core/interop_neo.go
View file

@ -1,10 +1,11 @@
package core
import (
"bytes"
"errors"
"fmt"
"math"
"strings"
"sort"
"github.com/nspcc-dev/neo-go/pkg/core/interop"
"github.com/nspcc-dev/neo-go/pkg/core/interop/runtime"
@ -422,19 +423,20 @@ func storageFind(ic *interop.Context, v *vm.VM) error {
if err != nil {
return err
}
prefix := string(v.Estack().Pop().Bytes())
siMap, err := ic.DAO.GetStorageItems(stc.ScriptHash)
prefix := v.Estack().Pop().Bytes()
siMap, err := ic.DAO.GetStorageItemsWithPrefix(stc.ScriptHash, prefix)
if err != nil {
return err
}
filteredMap := vm.NewMapItem()
for k, v := range siMap {
if strings.HasPrefix(k, prefix) {
filteredMap.Add(vm.NewByteArrayItem([]byte(k)),
vm.NewByteArrayItem(v.Value))
}
filteredMap.Add(vm.NewByteArrayItem(append(prefix, []byte(k)...)), vm.NewByteArrayItem(v.Value))
}
sort.Slice(filteredMap.Value().([]vm.MapElement), func(i, j int) bool {
return bytes.Compare(filteredMap.Value().([]vm.MapElement)[i].Key.Value().([]byte),
filteredMap.Value().([]vm.MapElement)[j].Key.Value().([]byte)) == -1
})
item := vm.NewMapIterator(filteredMap)
v.Estack().PushVal(item)

28
pkg/core/interop_neo_test.go
View file

@ -51,7 +51,7 @@ func TestStorageFind(t *testing.T) {
v, contractState, context, chain := createVMAndContractState(t)
defer chain.Close()
skeys := [][]byte{{0x01, 0x02}, {0x02, 0x01}}
skeys := [][]byte{{0x01, 0x02}, {0x02, 0x01}, {0x01, 0x01}}
items := []*state.StorageItem{
{
Value: []byte{0x01, 0x02, 0x03, 0x04},
@ -59,6 +59,9 @@ func TestStorageFind(t *testing.T) {
{
Value: []byte{0x04, 0x03, 0x02, 0x01},
},
{
Value: []byte{0x03, 0x04, 0x05, 0x06},
},
}
require.NoError(t, context.DAO.PutContractState(contractState))
@ -83,6 +86,18 @@ func TestStorageFind(t *testing.T) {
require.NoError(t, enumerator.Next(context, v))
require.True(t, v.Estack().Pop().Bool())
v.Estack().PushVal(iter)
require.NoError(t, iterator.Key(context, v))
require.Equal(t, []byte{0x01, 0x01}, v.Estack().Pop().Bytes())
v.Estack().PushVal(iter)
require.NoError(t, enumerator.Value(context, v))
require.Equal(t, []byte{0x03, 0x04, 0x05, 0x06}, v.Estack().Pop().Bytes())
v.Estack().PushVal(iter)
require.NoError(t, enumerator.Next(context, v))
require.True(t, v.Estack().Pop().Bool())
v.Estack().PushVal(iter)
require.NoError(t, iterator.Key(context, v))
require.Equal(t, []byte{0x01, 0x02}, v.Estack().Pop().Bytes())
@ -96,6 +111,17 @@ func TestStorageFind(t *testing.T) {
require.False(t, v.Estack().Pop().Bool())
})
t.Run("normal invocation, empty result", func(t *testing.T) {
v.Estack().PushVal([]byte{0x03})
v.Estack().PushVal(vm.NewInteropItem(&StorageContext{ScriptHash: scriptHash}))
err := storageFind(context, v)
require.NoError(t, err)
require.NoError(t, enumerator.Next(context, v))
require.False(t, v.Estack().Pop().Bool())
})
t.Run("invalid type for StorageContext", func(t *testing.T) {
v.Estack().PushVal([]byte{0x01})
v.Estack().PushVal(vm.NewInteropItem(nil))

2
pkg/core/native/native_neo.go
View file

@ -3,6 +3,7 @@ package native
import (
"math/big"
"sort"
"strings"
"github.com/nspcc-dev/neo-go/pkg/core/blockchainer"
"github.com/nspcc-dev/neo-go/pkg/core/dao"
@ -344,6 +345,7 @@ func (n *NEO) getRegisteredValidators(d dao.DAO) ([]keyWithVotes, error) {
}
arr = append(arr, keyWithVotes{key, &votes.Balance})
}
sort.Slice(arr, func(i, j int) bool { return strings.Compare(arr[i].Key, arr[j].Key) == -1 })
return arr, nil
}