From a3df7af4281074c5cc410c541288ac150a913992 Mon Sep 17 00:00:00 2001
From: HaoyangLiu <lhy.0318@163.com>
Date: Mon, 17 Sep 2018 22:13:11 +0800
Subject: [PATCH] Merge PR #2346: bugfix in validatorset query and refactor
 transaction search

---
 client/rpc/block.go          | 2 +-
 client/rpc/validators.go     | 2 +-
 client/tx/search.go          | 4 ++--
 x/stake/client/rest/utils.go | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/rpc/block.go b/client/rpc/block.go
index 3b1545fc7a..3824bc3e5c 100644
--- a/client/rpc/block.go
+++ b/client/rpc/block.go
@@ -43,7 +43,7 @@ func getBlock(cliCtx context.CLIContext, height *int64) ([]byte, error) {
 	}
 
 	if !cliCtx.TrustNode {
-		check, err := cliCtx.Certify(*height)
+		check, err := cliCtx.Certify(res.Block.Height)
 		if err != nil {
 			return nil, err
 		}
diff --git a/client/rpc/validators.go b/client/rpc/validators.go
index b034704d48..f708cb1456 100644
--- a/client/rpc/validators.go
+++ b/client/rpc/validators.go
@@ -73,7 +73,7 @@ func getValidators(cliCtx context.CLIContext, height *int64) ([]byte, error) {
 	}
 
 	if !cliCtx.TrustNode {
-		check, err := cliCtx.Certify(*height)
+		check, err := cliCtx.Certify(validatorsRes.BlockHeight)
 		if err != nil {
 			return nil, err
 		}
diff --git a/client/tx/search.go b/client/tx/search.go
index 90c0ca168a..5bc8726db1 100644
--- a/client/tx/search.go
+++ b/client/tx/search.go
@@ -102,7 +102,7 @@ func searchTxs(cliCtx context.CLIContext, cdc *codec.Codec, tags []string) ([]In
 		}
 	}
 
-	info, err := FormatTxResults(cdc, cliCtx, res.Txs)
+	info, err := FormatTxResults(cdc, res.Txs)
 	if err != nil {
 		return nil, err
 	}
@@ -111,7 +111,7 @@ func searchTxs(cliCtx context.CLIContext, cdc *codec.Codec, tags []string) ([]In
 }
 
 // parse the indexed txs into an array of Info
-func FormatTxResults(cdc *codec.Codec, cliCtx context.CLIContext, res []*ctypes.ResultTx) ([]Info, error) {
+func FormatTxResults(cdc *codec.Codec, res []*ctypes.ResultTx) ([]Info, error) {
 	var err error
 	out := make([]Info, len(res))
 	for i := range res {
diff --git a/x/stake/client/rest/utils.go b/x/stake/client/rest/utils.go
index a2266c36c5..8ab5655009 100644
--- a/x/stake/client/rest/utils.go
+++ b/x/stake/client/rest/utils.go
@@ -40,5 +40,5 @@ func queryTxs(node rpcclient.Client, cliCtx context.CLIContext, cdc *codec.Codec
 		}
 	}
 
-	return tx.FormatTxResults(cdc, cliCtx, res.Txs)
+	return tx.FormatTxResults(cdc, res.Txs)
 }