cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

v1.27.0-a #10

Closed
jonathanface wants to merge 473 commits from v1.27.0-a into master
pull from: v1.27.0-a
merge into: cerc-io:master
Conversation 0 Commits 473 Files Changed 452 +8 -4
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9ec2a65d9b - Show all commits

12
cli/state.go
View File

@ -1388,15 +1388,19 @@ func JsonParams(code cid.Cid, method abi.MethodNum, params []byte) (string, erro
p, err := stmgr.GetParamType(ar, code, method) // todo use api for correct actor registry p, err := stmgr.GetParamType(ar, code, method) // todo use api for correct actor registry
if err != nil { if err != nil {
return "", err return fmt.Sprintf("raw:%x; DECODE ERR: %s", params, err.Error()), nil
} }
if err := p.UnmarshalCBOR(bytes.NewReader(params)); err != nil { if err := p.UnmarshalCBOR(bytes.NewReader(params)); err != nil {
return "", err return fmt.Sprintf("raw:%x; DECODE cbor ERR: %s", params, err.Error()), nil
} }
b, err := json.MarshalIndent(p, "", " ") b, err := json.MarshalIndent(p, "", " ")
return string(b), err if err != nil {
return "", err
}
return string(b), nil
} }
func JsonReturn(code cid.Cid, method abi.MethodNum, ret []byte) (string, error) { func JsonReturn(code cid.Cid, method abi.MethodNum, ret []byte) (string, error) {
@ -1407,7 +1411,7 @@ func JsonReturn(code cid.Cid, method abi.MethodNum, ret []byte) (string, error)
re := reflect.New(methodMeta.Ret.Elem()) re := reflect.New(methodMeta.Ret.Elem())
p := re.Interface().(cbg.CBORUnmarshaler) p := re.Interface().(cbg.CBORUnmarshaler)
if err := p.UnmarshalCBOR(bytes.NewReader(ret)); err != nil { if err := p.UnmarshalCBOR(bytes.NewReader(ret)); err != nil {
return "", err return fmt.Sprintf("raw:%x; DECODE ERR: %s", ret, err.Error()), nil
} }
b, err := json.MarshalIndent(p, "", " ") b, err := json.MarshalIndent(p, "", " ")