Merge PR #2346: bugfix in validatorset query and refactor transaction…

… search
cosmos · Sep 17, 2018 · a3df7af · a3df7af
1 parent 2263cea
commit a3df7af
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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)
 }