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

rpcbinding: improve indentation for internal unwrappers

Browse source
This commit is contained in:
Roman Khimov 2022-12-02 15:52:52 +03:00
parent c058ab5604
commit ec5ebc8c18
2 changed files with 163 additions and 158 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -23,7 +23,7 @@ func (c *ContractReader) {{.Name}}({{range $index, $arg := .Arguments -}}
if err != nil { if err != nil {
return nil, err return nil, err
} }
return {{etTypeConverter .ExtendedReturn "item"}} return {{addIndent (etTypeConverter .ExtendedReturn "item") "\t"}}
} ( {{- end -}} {{if .ItemTo -}} itemTo{{ .ItemTo }}( {{- end -}} } ( {{- end -}} {{if .ItemTo -}} itemTo{{ .ItemTo }}( {{- end -}}
unwrap.{{.Unwrapper}}(c.invoker.Call(Hash, "{{ .NameABI }}" unwrap.{{.Unwrapper}}(c.invoker.Call(Hash, "{{ .NameABI }}"
{{- range $arg := .Arguments -}}, {{.Name}}{{end -}} )) {{- if or .ItemTo (eq .Unwrapper "Item") -}} ) {{- end}} {{- range $arg := .Arguments -}}, {{.Name}}{{end -}} )) {{- if or .ItemTo (eq .Unwrapper "Item") -}} ) {{- end}}
@ -319,6 +319,7 @@ func Generate(cfg binding.Config) error {
ctr.NamedTypes = cfg.NamedTypes ctr.NamedTypes = cfg.NamedTypes
var srcTemplate = template.Must(template.New("generate").Funcs(template.FuncMap{ var srcTemplate = template.Must(template.New("generate").Funcs(template.FuncMap{
"addIndent": addIndent,
"etTypeConverter": etTypeConverter, "etTypeConverter": etTypeConverter,
"etTypeToStr": func(et binding.ExtendedType) string { "etTypeToStr": func(et binding.ExtendedType) string {
r, _ := extendedTypeToGo(et, ctr.NamedTypes) r, _ := extendedTypeToGo(et, ctr.NamedTypes)
@ -467,7 +468,7 @@ func etTypeConverter(et binding.ExtendedType, v string) string {
} }
res := make(` + at + `, len(arr)) res := make(` + at + `, len(arr))
for i := range res { for i := range res {
res[i], err = ` + strings.ReplaceAll(etTypeConverter(*et.Value, "arr[i]"), "\n", "\n\t\t") + ` res[i], err = ` + addIndent(etTypeConverter(*et.Value, "arr[i]"), "\t\t") + `
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -491,11 +492,11 @@ func etTypeConverter(et binding.ExtendedType, v string) string {
} }
res := make(` + at + `) res := make(` + at + `)
for i := range m { for i := range m {
k, err := ` + strings.ReplaceAll(etTypeConverter(binding.ExtendedType{Base: et.Key}, "m[i].Key"), "\n", "\n\t\t") + ` k, err := ` + addIndent(etTypeConverter(binding.ExtendedType{Base: et.Key}, "m[i].Key"), "\t\t") + `
if err != nil { if err != nil {
return nil, err return nil, err
} }
v, err := ` + strings.ReplaceAll(etTypeConverter(*et.Value, "m[i].Value"), "\n", "\n\t\t") + ` v, err := ` + addIndent(etTypeConverter(*et.Value, "m[i].Value"), "\t\t") + `
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -673,3 +674,7 @@ func toTypeName(s string) string {
return c return c
}, strings.ToUpper(s[0:1])+s[1:]) }, strings.ToUpper(s[0:1])+s[1:])
} }
func addIndent(str string, ind string) string {
return strings.ReplaceAll(str, "\n", "\n"+ind)
}