dstepanov-yadro/neoneo-go
1
0
Fork 0
forked from TrueCloudLab/neoneo-go
Code Pull requests Activity

Merge pull request #2171 from nspcc-dev/fix-sc-json

Browse source 
Smartcontract parameter JSON marshaling fixes
This commit is contained in:
Roman Khimov 2021-09-14 14:48:17 +03:00 committed by GitHub
commit dd0ea4d057
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkg/smartcontract/parameter.go
View file

@ -1,6 +1,7 @@
package smartcontract
import (
"bytes"
"encoding/base64"
"encoding/binary"
"encoding/hex"
@ -54,6 +55,12 @@ func (p Parameter) MarshalJSON() ([]byte, error) {
resultRawValue json.RawMessage
resultErr error
)
if p.Value == nil {
if _, ok := validParamTypes[p.Type]; ok && p.Type != UnknownType {
return json.Marshal(rawParameter{Type: p.Type})
}
return nil, fmt.Errorf("can't marshal %s", p.Type)
}
switch p.Type {
case BoolType, StringType, Hash160Type, Hash256Type:
resultRawValue, resultErr = json.Marshal(p.Value)
@ -66,9 +73,7 @@ func (p Parameter) MarshalJSON() ([]byte, error) {
valStr := strconv.FormatInt(val, 10)
resultRawValue = json.RawMessage(`"` + valStr + `"`)
case PublicKeyType, ByteArrayType, SignatureType:
if p.Value == nil {
resultRawValue = []byte("null")
} else if p.Type == PublicKeyType {
if p.Type == PublicKeyType {
resultRawValue, resultErr = json.Marshal(hex.EncodeToString(p.Value.([]byte)))
} else {
resultRawValue, resultErr = json.Marshal(base64.StdEncoding.EncodeToString(p.Value.([]byte)))
@ -110,7 +115,8 @@ func (p *Parameter) UnmarshalJSON(data []byte) (err error) {
return
}
p.Type = r.Type
if len(r.Value) == 0 {
p.Value = nil
if len(r.Value) == 0 || bytes.Equal(r.Value, []byte("null")) {
return
}
switch r.Type {

12
pkg/smartcontract/parameter_test.go
View file

@ -41,6 +41,10 @@ var marshalJSONTestCases = []struct {
input: Parameter{Type: ByteArrayType},
result: `{"type":"ByteString","value":null}`,
},
{
input: Parameter{Type: SignatureType},
result: `{"type":"Signature"}`,
},
{
input: Parameter{
Type: PublicKeyType,
@ -195,6 +199,14 @@ var unmarshalJSONTestCases = []struct {
input: `{"type":"String","value":"Some string"}`,
result: Parameter{Type: StringType, Value: "Some string"},
},
{
input: `{"type":"Signature"}`,
result: Parameter{Type: SignatureType},
},
{
input: `{"type":"Signature","value":null }`,
result: Parameter{Type: SignatureType},
},
{
input: `{"type":"Array","value":[
{"type": "String", "value": "str 1"},