Auto generate app_types.go

Author: tjayrush

sdk

@@ -27,16 +27,16 @@ func ApprovalBy(field ApprovalField, order SortOrder) func(p1, p2 Approval) bool
 	case ApprovalAllowance: // wei
 		return func(p1, p2 Approval) bool {
 			if order == Ascending {
-				return p1.Allowance < p2.Allowance
+				return p1.Allowance.LessThan(&p2.Allowance)
 			}
-			return p1.Allowance > p2.Allowance
+			return p2.Allowance.LessThan(&p1.Allowance)
 		}
 	case ApprovalDate: // datetime
 		return func(p1, p2 Approval) bool {
 			if order == Ascending {
-				return p1.Date < p2.Date
+				return p1.Date() < p2.Date()
 			}
-			return p1.Date > p2.Date
+			return p1.Date() > p2.Date()
 		}
 	case ApprovalLastAppBlock: // blknum
 		return func(p1, p2 Approval) bool {
@@ -47,19 +47,17 @@ func ApprovalBy(field ApprovalField, order SortOrder) func(p1, p2 Approval) bool
 		}
 	case ApprovalOwner: // address
 		return func(p1, p2 Approval) bool {
-			cmp := p1.Owner.Cmp(p2.Address.Owner)
 			if order == Ascending {
-				return cmp == -1
+				return p1.Owner.Hex() < p2.Owner.Hex()
 			}
-			return cmp == 1
+			return p1.Owner.Hex() > p2.Owner.Hex()
 		}
 	case ApprovalSpender: // address
 		return func(p1, p2 Approval) bool {
-			cmp := p1.Spender.Cmp(p2.Address.Spender)
 			if order == Ascending {
-				return cmp == -1
+				return p1.Spender.Hex() < p2.Spender.Hex()
 			}
-			return cmp == 1
+			return p1.Spender.Hex() > p2.Spender.Hex()
 		}
 	case ApprovalTimestamp: // timestamp
 		return func(p1, p2 Approval) bool {
@@ -70,11 +68,10 @@ func ApprovalBy(field ApprovalField, order SortOrder) func(p1, p2 Approval) bool
 		}
 	case ApprovalToken: // address
 		return func(p1, p2 Approval) bool {
-			cmp := p1.Token.Cmp(p2.Address.Token)
 			if order == Ascending {
-				return cmp == -1
+				return p1.Token.Hex() < p2.Token.Hex()
 			}
-			return cmp == 1
+			return p1.Token.Hex() > p2.Token.Hex()
 		}
 
 	}

src/apps/chifra/pkg/types/types_approval_sort.go

@@ -0,0 +1,15 @@
+package sdk
+
+import "github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/types"
+
+// Modeler interface exposes the Model method for SDK consumers
+type Modeler interface {
+	Model(chain, format string, verbose bool, extraOpts map[string]any) types.Model
+}
+
+// Model type alias for the return type of Model()
+type Model = types.Model
+
+{{range .Commands}}{{if .HasSdkEndpoints}}{{range .ReturnTypesArray}}
+type {{replace . "types." ""}} = types.{{replace . "types." ""}}{{end}}
+{{end}}{{end}}

src/dev_tools/goMaker/templates/generators/codebase/sdk_app+types.go.tmpl

@@ -662,7 +662,7 @@ func (c *Command) BaseTypes() string {
 }
 
 // ----------------------------------------------------------------------
-func (c *Command) ReturnTypes() string {
+func (c *Command) ReturnTypesArray() []string {
 	present := map[string]bool{}
 	ret := []string{}
 	for _, op := range c.Options {
@@ -678,6 +678,12 @@ func (c *Command) ReturnTypes() string {
 			present[retType] = true
 		}
 	}
+	return ret
+}
+
+// ----------------------------------------------------------------------
+func (c *Command) ReturnTypes() string {
+	ret := c.ReturnTypesArray()
 	return strings.Join(ret, "|\n")
 }