refactor: update code

Author: colin404

cmd/onex-cacheserver/app/options/options.go

@@ -26,8 +26,8 @@ type ServerOptions struct {
 	Logging        *log.Options                   `json:"log" mapstructure:"log"`
 }
 
-// Ensure ServerOptions implements the app.CliOptions interface.
-var _ app.CliOptions = (*ServerOptions)(nil)
+// Ensure ServerOptions implements the app.NamedFlagSetOptions interface.
+var _ app.NamedFlagSetOptions = (*ServerOptions)(nil)
 
 // NewServerOptions creates a ServerOptions instance with default values.
 func NewServerOptions() *ServerOptions {

cmd/onex-gateway/app/options/options.go

@@ -48,8 +48,8 @@ type ServerOptions struct {
 	Log *log.Options `json:"log" mapstructure:"log"`
 }
 
-// Ensure ServerOptions implements the app.CliOptions interface.
-var _ app.CliOptions = (*ServerOptions)(nil)
+// Ensure ServerOptions implements the app.NamedFlagSetOptions interface.
+var _ app.NamedFlagSetOptions = (*ServerOptions)(nil)
 
 // NewServerOptions creates a ServerOptions instance with default values.
 func NewServerOptions() *ServerOptions {

cmd/onex-nightwatch/app/options/options.go

@@ -47,8 +47,8 @@ type ServerOptions struct {
 	Log          *log.Options    `json:"log" mapstructure:"log"`
 }
 
-// Ensure ServerOptions implements the app.CliOptions interface.
-var _ app.CliOptions = (*ServerOptions)(nil)
+// Ensure ServerOptions implements the app.NamedFlagSetOptions interface.
+var _ app.NamedFlagSetOptions = (*ServerOptions)(nil)
 
 // NewServerOptions creates a ServerOptions instance with default values.
 func NewServerOptions() *ServerOptions {

cmd/onex-pump/app/options/options.go

@@ -31,8 +31,8 @@ type ServerOptions struct {
 	FeatureGates  map[string]bool               `json:"feature-gates"`
 }
 
-// Ensure ServerOptions implements the app.CliOptions interface.
-var _ app.CliOptions = (*ServerOptions)(nil)
+// Ensure ServerOptions implements the app.NamedFlagSetOptions interface.
+var _ app.NamedFlagSetOptions = (*ServerOptions)(nil)
 
 // NewServerOptions creates a ServerOptions instance with default values.
 func NewServerOptions() *ServerOptions {

cmd/onex-toyblc/app/options/options.go

@@ -41,8 +41,8 @@ type ServerOptions struct {
 	Log              *log.Options                `json:"log" mapstructure:"log"`
 }
 
-// Ensure ServerOptions implements the app.CliOptions interface.
-var _ app.CliOptions = (*ServerOptions)(nil)
+// Ensure ServerOptions implements the app.NamedFlagSetOptions interface.
+var _ app.NamedFlagSetOptions = (*ServerOptions)(nil)
 
 // NewServerOptions creates a ServerOptions instance with default values.
 func NewServerOptions() *ServerOptions {

cmd/onex-usercenter/app/options/options.go

@@ -57,8 +57,8 @@ type ServerOptions struct {
 	Log *log.Options `json:"log" mapstructure:"log"`
 }
 
-// Ensure ServerOptions implements the app.CliOptions interface.
-var _ app.CliOptions = (*ServerOptions)(nil)
+// Ensure ServerOptions implements the app.NamedFlagSetOptions interface.
+var _ app.NamedFlagSetOptions = (*ServerOptions)(nil)
 
 // NewServerOptions creates a ServerOptions instance with default values.
 func NewServerOptions() *ServerOptions {

configs/onex.sql

@@ -12,7 +12,7 @@ import (
 func (h *Handler) CreateBlock(c *gin.Context) {
 	var rq v1.CreateBlockRequest
 	if err := core.ShouldBindJSON(c, &rq); err != nil {
-		core.WriteResponse(c, err, nil)
+		core.WriteResponse(c, nil, err)
 		return
 	}
 
@@ -22,5 +22,5 @@ func (h *Handler) CreateBlock(c *gin.Context) {
 
 // ListBlock retrieves a list of blocks based on query parameters.
 func (h *Handler) ListBlock(c *gin.Context) {
-	core.WriteResponse(c, nil, h.bs.List())
+	core.WriteResponse(c, h.bs.List(), nil)
 }

configs/onex.sql.old

@@ -35,5 +35,5 @@ func (h *Handler) ListPeer(c *gin.Context) {
 		}
 	}
 
-	core.WriteResponse(c, nil, slice)
+	core.WriteResponse(c, slice, nil)
 }