Merge with develop

client/context/broadcast.go

@@ -107,7 +107,7 @@ func (ctx CLIContext) broadcastTxAsync(txBytes []byte) (*ctypes.ResultBroadcastT
 		return res, err
 	}
 
-	if ctx.Logger != nil {
+	if ctx.Output != nil {
 		if ctx.JSON {
 			type toJSON struct {
 				TxHash string
@@ -119,10 +119,10 @@ func (ctx CLIContext) broadcastTxAsync(txBytes []byte) (*ctypes.ResultBroadcastT
 				return res, err
 			}
 
-			ctx.Logger.Write(bz)
-			io.WriteString(ctx.Logger, "\n")
+			ctx.Output.Write(bz)
+			io.WriteString(ctx.Output, "\n")
 		} else {
-			io.WriteString(ctx.Logger, fmt.Sprintf("async tx sent (tx hash: %s)\n", res.Hash))
+			io.WriteString(ctx.Output, fmt.Sprintf("async tx sent (tx hash: %s)\n", res.Hash))
 		}
 	}
 
@@ -144,21 +144,21 @@ func (ctx CLIContext) broadcastTxCommit(txBytes []byte) (*ctypes.ResultBroadcast
 			Response abci.ResponseDeliverTx
 		}
 
-		if ctx.Logger != nil {
+		if ctx.Output != nil {
 			resJSON := toJSON{res.Height, res.Hash.String(), res.DeliverTx}
 			bz, err := ctx.Codec.MarshalJSON(resJSON)
 			if err != nil {
 				return res, err
 			}
 
-			ctx.Logger.Write(bz)
-			io.WriteString(ctx.Logger, "\n")
+			ctx.Output.Write(bz)
+			io.WriteString(ctx.Output, "\n")
 		}
 
 		return res, nil
 	}
 
-	if ctx.Logger != nil {
+	if ctx.Output != nil {
 		resStr := fmt.Sprintf("Committed at block %d (tx hash: %s)\n", res.Height, res.Hash.String())
 
 		if ctx.PrintResponse {
@@ -167,7 +167,7 @@ func (ctx CLIContext) broadcastTxCommit(txBytes []byte) (*ctypes.ResultBroadcast
 			)
 		}
 
-		io.WriteString(ctx.Logger, resStr)
+		io.WriteString(ctx.Output, resStr)
 	}
 
 	return res, nil

client/context/context.go

@@ -11,14 +11,14 @@ import (
 
 	"github.com/spf13/viper"
 
+	"github.com/cosmos/cosmos-sdk/client/keys"
+	cskeys "github.com/cosmos/cosmos-sdk/crypto/keys"
+	"github.com/cosmos/cosmos-sdk/types"
 	"github.com/tendermint/tendermint/libs/cli"
 	tmlite "github.com/tendermint/tendermint/lite"
 	tmliteProxy "github.com/tendermint/tendermint/lite/proxy"
 	rpcclient "github.com/tendermint/tendermint/rpc/client"
 	"os"
-	"github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/client/keys"
-	cskeys "github.com/cosmos/cosmos-sdk/crypto/keys"
 )
 
 const ctxAccStoreName = "acc"
@@ -29,7 +29,7 @@ type CLIContext struct {
 	Codec         *codec.Codec
 	AccDecoder    auth.AccountDecoder
 	Client        rpcclient.Client
-	Logger        io.Writer
+	Output        io.Writer
 	Height        int64
 	NodeURI       string
 	From          string
@@ -61,6 +61,7 @@ func NewCLIContext() CLIContext {
 
 	return CLIContext{
 		Client:        rpc,
+		Output:        os.Stdout,
 		NodeURI:       nodeURI,
 		AccountStore:  ctxAccStoreName,
 		From:          viper.GetString(client.FlagFrom),
@@ -162,9 +163,9 @@ func (ctx CLIContext) WithAccountDecoder(decoder auth.AccountDecoder) CLIContext
 	return ctx
 }
 
-// WithLogger returns a copy of the context with an updated logger.
-func (ctx CLIContext) WithLogger(w io.Writer) CLIContext {
-	ctx.Logger = w
+// WithOutput returns a copy of the context with an updated output writer (e.g. stdout).
+func (ctx CLIContext) WithOutput(w io.Writer) CLIContext {
+	ctx.Output = w
 	return ctx
 }
 

client/lcd/root.go

@@ -144,7 +144,8 @@ func createHandler(cdc *codec.Codec) http.Handler {
 	staticServer := http.FileServer(statikFS)
 	r.PathPrefix("/swagger-ui/").Handler(http.StripPrefix("/swagger-ui/", staticServer))
 
-	cliCtx := context.NewCLIContext().WithCodec(cdc).WithLogger(os.Stdout)
+	cliCtx := context.NewCLIContext().WithCodec(cdc)
+
 
 	// TODO: make more functional? aka r = keys.RegisterRoutes(r)
 	r.HandleFunc("/version", CLIVersionRequestHandler).Methods("GET")