Merge branch 'master' into develop

2018-05-20 17:12:14 -04:00
parent 5df0b87be5 187be1a5df
commit 5e858129c5
4 changed files with 31 additions and 16 deletions
@@ -61,12 +61,15 @@ func searchTx(ctx context.CoreContext, cdc *wire.Codec, tags []string) ([]byte,
 	}

 	prove := !viper.GetBool(client.FlagTrustNode)
-	res, err := node.TxSearch(query, prove)
+	// TODO: take these as args
+	page := 0
+	perPage := 100
+	res, err := node.TxSearch(query, prove, page, perPage)
 	if err != nil {
 		return nil, err
 	}

-	info, err := formatTxResults(cdc, res)
+	info, err := formatTxResults(cdc, res.Txs)
 	if err != nil {
 		return nil, err
 	}