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

Jump to bottom

rpcclient: adjust unwrapContract helper #3072

Merged
merged 1 commit into from
Jul 28, 2023
Merged

rpcclient: adjust unwrapContract helper #3072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion pkg/rpcclient/management/management.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,16 +105,23 @@ func (c *ContractReader) GetContract(hash util.Uint160) (*state.Contract, error)
return unwrapContract(c.invoker.Call(Hash, "getContract", hash))
}

// GetContractByID allows to get contract data from its ID.
// GetContractByID allows to get contract data from its ID. In case of missing
// contract it returns nil state.Contract and nil error.
func (c *ContractReader) GetContractByID(id int32) (*state.Contract, error) {
return unwrapContract(c.invoker.Call(Hash, "getContractById", id))
}

// unwrapContract tries to retrieve state.Contract from the provided result.Invoke.
// If the resulting stack contains stackitem.Null, then nil state and nil error
// will be returned.
func unwrapContract(r *result.Invoke, err error) (*state.Contract, error) {
itm, err := unwrap.Item(r, err)
if err != nil {
return nil, err
}
if itm.Equals(stackitem.Null{}) {
return nil, nil
roman-khimov marked this conversation as resolved.
Show resolved Hide resolved
}
res := new(state.Contract)
err = res.FromStackItem(itm)
if err != nil {
Expand Down
13 changes: 12 additions & 1 deletion pkg/rpcclient/management/management_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,17 @@ func TestReader(t *testing.T) {
require.NoError(t, err)
require.False(t, hm)

ta.res = &result.Invoke{
State: "HALT",
Stack: []stackitem.Item{
stackitem.Null{},
},
}

cs, err := man.GetContract(util.Uint160{1, 2, 3})
require.NoError(t, err)
require.Nil(t, cs)

ta.res = &result.Invoke{
State: "HALT",
Stack: []stackitem.Item{
Expand Down Expand Up @@ -127,7 +138,7 @@ func TestReader(t *testing.T) {
}),
},
}
cs, err := man.GetContract(util.Uint160{1, 2, 3})
cs, err = man.GetContract(util.Uint160{1, 2, 3})
require.NoError(t, err)
require.Equal(t, int32(1), cs.ID)
require.Equal(t, uint16(0), cs.UpdateCounter)
Expand Down
Loading