Merge pull request #1091 from nspcc-dev/neo3/rpc/getstorage

rpc: add GetStorageByID RPC client method
This commit is contained in:
Roman Khimov 2020-06-23 22:19:34 +03:00 committed by GitHub
commit 9d675f6e56
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 60 additions and 14 deletions

View file

@ -272,12 +272,18 @@ func (c *Client) GetRawTransactionVerbose(hash util.Uint256) (*result.Transactio
return resp, nil return resp, nil
} }
// GetStorage returns the stored value, according to the contract script hash and the stored key. // GetStorageByID returns the stored value, according to the contract ID and the stored key.
func (c *Client) GetStorage(hash util.Uint160, key []byte) ([]byte, error) { func (c *Client) GetStorageByID(id int32, key []byte) ([]byte, error) {
var ( return c.getStorage(request.NewRawParams(id, hex.EncodeToString(key)))
params = request.NewRawParams(hash.StringLE(), hex.EncodeToString(key)) }
resp string
) // GetStorageByHash returns the stored value, according to the contract script hash and the stored key.
func (c *Client) GetStorageByHash(hash util.Uint160, key []byte) ([]byte, error) {
return c.getStorage(request.NewRawParams(hash.StringLE(), hex.EncodeToString(key)))
}
func (c *Client) getStorage(params request.RawParams) ([]byte, error) {
var resp string
if err := c.performRequest("getstorage", params, &resp); err != nil { if err := c.performRequest("getstorage", params, &resp); err != nil {
return nil, err return nil, err
} }

View file

@ -459,7 +459,7 @@ var rpcClientTestCases = map[string][]rpcClientTestCase{
}, },
"getstorage": { "getstorage": {
{ {
name: "positive", name: "by hash, positive",
invoke: func(c *Client) (interface{}, error) { invoke: func(c *Client) (interface{}, error) {
hash, err := util.Uint160DecodeStringLE("03febccf81ac85e3d795bc5cbd4e84e907812aa3") hash, err := util.Uint160DecodeStringLE("03febccf81ac85e3d795bc5cbd4e84e907812aa3")
if err != nil { if err != nil {
@ -469,7 +469,25 @@ var rpcClientTestCases = map[string][]rpcClientTestCase{
if err != nil { if err != nil {
panic(err) panic(err)
} }
return c.GetStorage(hash, key) return c.GetStorageByHash(hash, key)
},
serverResponse: `{"jsonrpc":"2.0","id":1,"result":"4c696e"}`,
result: func(c *Client) interface{} {
value, err := hex.DecodeString("4c696e")
if err != nil {
panic(err)
}
return value
},
},
{
name: "by ID, positive",
invoke: func(c *Client) (interface{}, error) {
key, err := hex.DecodeString("5065746572")
if err != nil {
panic(err)
}
return c.GetStorageByID(-1, key)
}, },
serverResponse: `{"jsonrpc":"2.0","id":1,"result":"4c696e"}`, serverResponse: `{"jsonrpc":"2.0","id":1,"result":"4c696e"}`,
result: func(c *Client) interface{} { result: func(c *Client) interface{} {
@ -685,7 +703,7 @@ var rpcClientErrorCases = map[string][]rpcClientErrorCase{
}, },
}, },
{ {
name: "getstorage_not_a_hex_response", name: "getstoragebyhash_not_a_hex_response",
invoke: func(c *Client) (interface{}, error) { invoke: func(c *Client) (interface{}, error) {
hash, err := util.Uint160DecodeStringLE("03febccf81ac85e3d795bc5cbd4e84e907812aa3") hash, err := util.Uint160DecodeStringLE("03febccf81ac85e3d795bc5cbd4e84e907812aa3")
if err != nil { if err != nil {
@ -695,7 +713,17 @@ var rpcClientErrorCases = map[string][]rpcClientErrorCase{
if err != nil { if err != nil {
panic(err) panic(err)
} }
return c.GetStorage(hash, key) return c.GetStorageByHash(hash, key)
},
},
{
name: "getstoragebyid_not_a_hex_response",
invoke: func(c *Client) (interface{}, error) {
key, err := hex.DecodeString("5065746572")
if err != nil {
panic(err)
}
return c.GetStorageByID(-1, key)
}, },
}, },
}, },
@ -849,9 +877,15 @@ var rpcClientErrorCases = map[string][]rpcClientErrorCase{
}, },
}, },
{ {
name: "getstorage_invalid_params_error", name: "getstoragebyhash_invalid_params_error",
invoke: func(c *Client) (interface{}, error) { invoke: func(c *Client) (interface{}, error) {
return c.GetStorage(util.Uint160{}, []byte{}) return c.GetStorageByHash(util.Uint160{}, []byte{})
},
},
{
name: "getstoragebyid_invalid_params_error",
invoke: func(c *Client) (interface{}, error) {
return c.GetStorageByID(-1, []byte{})
}, },
}, },
{ {
@ -1013,9 +1047,15 @@ var rpcClientErrorCases = map[string][]rpcClientErrorCase{
}, },
}, },
{ {
name: "getstorage_unmarshalling_error", name: "getstoragebyhash_unmarshalling_error",
invoke: func(c *Client) (interface{}, error) { invoke: func(c *Client) (interface{}, error) {
return c.GetStorage(util.Uint160{}, []byte{}) return c.GetStorageByHash(util.Uint160{}, []byte{})
},
},
{
name: "getstoragebyid_unmarshalling_error",
invoke: func(c *Client) (interface{}, error) {
return c.GetStorageByID(-1, []byte{})
}, },
}, },
{ {