From 08880966770e81bfa9c926de5ec2fddf8d9e4c3f Mon Sep 17 00:00:00 2001
From: Christopher Goes <cwgoes@protonmail.ch>
Date: Mon, 2 Apr 2018 12:44:55 +0200
Subject: [PATCH] Replace Result.ToQuery with Error.QueryResult (closes #765)

---
 baseapp/baseapp.go      |  2 +-
 store/iavlstore.go      |  4 ++--
 store/rootmultistore.go |  6 +++---
 types/errors.go         | 11 +++++++++++
 types/result.go         |  8 --------
 5 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/baseapp/baseapp.go b/baseapp/baseapp.go
index e0ef39cde6..dfbb821fe8 100644
--- a/baseapp/baseapp.go
+++ b/baseapp/baseapp.go
@@ -261,7 +261,7 @@ func (app *BaseApp) Query(req abci.RequestQuery) (res abci.ResponseQuery) {
 	queryable, ok := app.cms.(sdk.Queryable)
 	if !ok {
 		msg := "application doesn't support queries"
-		return sdk.ErrUnknownRequest(msg).Result().ToQuery()
+		return sdk.ErrUnknownRequest(msg).QueryResult()
 	}
 	return queryable.Query(req)
 }
diff --git a/store/iavlstore.go b/store/iavlstore.go
index 96110c59c9..e736fbda2e 100644
--- a/store/iavlstore.go
+++ b/store/iavlstore.go
@@ -141,7 +141,7 @@ func (st *iavlStore) ReverseIterator(start, end []byte) Iterator {
 func (st *iavlStore) Query(req abci.RequestQuery) (res abci.ResponseQuery) {
 	if len(req.Data) == 0 {
 		msg := "Query cannot be zero length"
-		return sdk.ErrTxDecode(msg).Result().ToQuery()
+		return sdk.ErrTxDecode(msg).QueryResult()
 	}
 
 	tree := st.tree
@@ -175,7 +175,7 @@ func (st *iavlStore) Query(req abci.RequestQuery) (res abci.ResponseQuery) {
 
 	default:
 		msg := fmt.Sprintf("Unexpected Query path: %v", req.Path)
-		return sdk.ErrUnknownRequest(msg).Result().ToQuery()
+		return sdk.ErrUnknownRequest(msg).QueryResult()
 	}
 	return
 }
diff --git a/store/rootmultistore.go b/store/rootmultistore.go
index a39c35813f..9be28967c2 100644
--- a/store/rootmultistore.go
+++ b/store/rootmultistore.go
@@ -205,18 +205,18 @@ func (rs *rootMultiStore) Query(req abci.RequestQuery) abci.ResponseQuery {
 	path := req.Path
 	storeName, subpath, err := parsePath(path)
 	if err != nil {
-		return err.Result().ToQuery()
+		return err.QueryResult()
 	}
 
 	store := rs.getStoreByName(storeName)
 	if store == nil {
 		msg := fmt.Sprintf("no such store: %s", storeName)
-		return sdk.ErrUnknownRequest(msg).Result().ToQuery()
+		return sdk.ErrUnknownRequest(msg).QueryResult()
 	}
 	queryable, ok := store.(Queryable)
 	if !ok {
 		msg := fmt.Sprintf("store %s doesn't support queries", storeName)
-		return sdk.ErrUnknownRequest(msg).Result().ToQuery()
+		return sdk.ErrUnknownRequest(msg).QueryResult()
 	}
 
 	// trim the path and make the query
diff --git a/types/errors.go b/types/errors.go
index 1115d39376..4874c43628 100644
--- a/types/errors.go
+++ b/types/errors.go
@@ -3,6 +3,8 @@ package types
 import (
 	"fmt"
 	"runtime"
+
+	abci "github.com/tendermint/abci/types"
 )
 
 // ABCI Response Code
@@ -121,6 +123,7 @@ type Error interface {
 	TraceCause(cause error, msg string) Error
 	Cause() error
 	Result() Result
+	QueryResult() abci.ResponseQuery
 }
 
 func NewError(code CodeType, msg string) Error {
@@ -220,3 +223,11 @@ func (err *sdkError) Result() Result {
 		Log:  err.ABCILog(),
 	}
 }
+
+// QueryResult allows us to return sdk.Error.QueryResult() in query responses
+func (err *sdkError) QueryResult() abci.ResponseQuery {
+	return abci.ResponseQuery{
+		Code: uint32(err.ABCICode()),
+		Log:  err.ABCILog(),
+	}
+}
diff --git a/types/result.go b/types/result.go
index c1afec00ce..412a9778de 100644
--- a/types/result.go
+++ b/types/result.go
@@ -38,11 +38,3 @@ type Result struct {
 func (res Result) IsOK() bool {
 	return res.Code.IsOK()
 }
-
-// ToQuery allows us to return sdk.Error.Result() in query responses
-func (res Result) ToQuery() abci.ResponseQuery {
-	return abci.ResponseQuery{
-		Code: uint32(res.Code),
-		Log:  res.Log,
-	}
-}