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

rpcbinding: improve error reporting in generated code

Browse source
This commit is contained in:
Roman Khimov 2022-12-02 16:12:56 +03:00
parent ec5ebc8c18
commit e5aa5ca294
3 changed files with 114 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

12
pkg/smartcontract/rpcbinding/binding.go
View file

@ -235,7 +235,7 @@ func itemTo{{toTypeName $name}}(item stackitem.Item, err error) (*{{toTypeName $
index++
res.{{.Field}}, err = {{etTypeConverter .ExtendedType "arr[index]"}}
if err != nil {
return nil, err
return nil, fmt.Errorf("field {{.Field}}: %w", err)
}
{{end}}
{{end}}
@ -470,7 +470,7 @@ func etTypeConverter(et binding.ExtendedType, v string) string {
for i := range res {
res[i], err = ` + addIndent(etTypeConverter(*et.Value, "arr[i]"), "\t\t") + `
if err != nil {
return nil, err
return nil, fmt.Errorf("item %d: %w", i, err)
}
}
return res, nil
@ -494,11 +494,11 @@ func etTypeConverter(et binding.ExtendedType, v string) string {
for i := range m {
k, err := ` + addIndent(etTypeConverter(binding.ExtendedType{Base: et.Key}, "m[i].Key"), "\t\t") + `
if err != nil {
return nil, err
return nil, fmt.Errorf("key %d: %w", i, err)
}
v, err := ` + addIndent(etTypeConverter(*et.Value, "m[i].Value"), "\t\t") + `
if err != nil {
return nil, err
return nil, fmt.Errorf("value %d: %w", i, err)
}
res[k] = v
}
@ -533,7 +533,6 @@ func scTemplateToRPC(cfg binding.Config, ctr ContractTmpl, imports map[string]st
if ok {
ctr.SafeMethods[len(ctr.SafeMethods)-1].ExtendedReturn = et
if abim.ReturnType == smartcontract.ArrayType && len(et.Name) > 0 {
imports["errors"] = struct{}{}
ctr.SafeMethods[len(ctr.SafeMethods)-1].ItemTo = cutPointer(ctr.Methods[i].ReturnType)
}
}
@ -647,6 +646,9 @@ func addETImports(et binding.ExtendedType, named map[string]binding.ExtendedType
imports["crypto/elliptic"] = struct{}{}
case smartcontract.MapType:
imports["fmt"] = struct{}{}
case smartcontract.ArrayType:
imports["errors"] = struct{}{}
imports["fmt"] = struct{}{}
}
if et.Value != nil {
addETImports(*et.Value, named, imports)