From c7a11416288c2b81233793b743b776fca30e1b8a Mon Sep 17 00:00:00 2001
From: Geoffrey Ragot <geoffrey.ragot@gmail.com>
Date: Wed, 19 Jan 2022 10:11:15 +0100
Subject: [PATCH] Remove 'ok' property from json responses.

---
 pkg/api/controllers/base_controller.go   | 7 +------
 pkg/api/controllers/script_controller.go | 4 +---
 pkg/api/middlewares/ledger_middleware.go | 5 +++--
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/pkg/api/controllers/base_controller.go b/pkg/api/controllers/base_controller.go
index f4badfee6..25a959a97 100644
--- a/pkg/api/controllers/base_controller.go
+++ b/pkg/api/controllers/base_controller.go
@@ -10,9 +10,7 @@ import (
 // Controllers struct
 type BaseController struct{}
 
-type BaseResponse struct {
-	Ok bool `json:"ok"`
-}
+type BaseResponse struct {}
 
 func (ctl *BaseController) response(c *gin.Context, status int, data interface{}) {
 	if data == nil {
@@ -20,12 +18,10 @@ func (ctl *BaseController) response(c *gin.Context, status int, data interface{}
 	}
 	if reflect.TypeOf(data) == reflect.TypeOf(query.Cursor{}) {
 		c.JSON(status, gin.H{
-			"ok":     true,
 			"cursor": data,
 		})
 	} else {
 		c.JSON(status, gin.H{
-			"ok":   true,
 			"data": data,
 		})
 	}
@@ -34,7 +30,6 @@ func (ctl *BaseController) response(c *gin.Context, status int, data interface{}
 func (ctl *BaseController) responseError(c *gin.Context, status int, err error) {
 	c.Abort()
 	c.AbortWithStatusJSON(status, gin.H{
-		"ok":            false,
 		"error":         true,
 		"error_code":    status,
 		"error_message": err.Error(),
diff --git a/pkg/api/controllers/script_controller.go b/pkg/api/controllers/script_controller.go
index 61d289e27..f1d7784e9 100644
--- a/pkg/api/controllers/script_controller.go
+++ b/pkg/api/controllers/script_controller.go
@@ -40,9 +40,7 @@ func (ctl *ScriptController) PostScript(c *gin.Context) {
 
 	err := l.(*ledger.Ledger).Execute(c.Request.Context(), script)
 
-	res := gin.H{
-		"ok": err == nil,
-	}
+	res := gin.H{}
 
 	if err != nil {
 		errStr := err.Error()
diff --git a/pkg/api/middlewares/ledger_middleware.go b/pkg/api/middlewares/ledger_middleware.go
index d277b1c29..b7127c1fa 100644
--- a/pkg/api/middlewares/ledger_middleware.go
+++ b/pkg/api/middlewares/ledger_middleware.go
@@ -32,8 +32,9 @@ func (m *LedgerMiddleware) LedgerMiddleware() gin.HandlerFunc {
 		l, err := m.resolver.GetLedger(c.Request.Context(), name)
 		if err != nil {
 			c.JSON(400, gin.H{
-				"ok":  false,
-				"err": err.Error(),
+				"error":         true,
+				"error_code":    400,
+				"error_message": err.Error(),
 			})
 		}
 		defer func() {