Minor cleanup

cmd/basecli/commands/query.go

@@ -1,8 +1,7 @@
 package commands
 
 import (
-	"fmt"
-
+	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
 	wire "github.com/tendermint/go-wire"
@@ -29,7 +28,7 @@ func doAccountQuery(cmd *cobra.Command, args []string) error {
 	acc := new(btypes.Account)
 	proof, err := proofcmd.GetAndParseAppProof(key, &acc)
 	if lc.IsNoDataErr(err) {
-		return fmt.Errorf("Account bytes are empty for address %X ", addr)
+		return errors.Errorf("Account bytes are empty for address %X ", addr)
 	} else if err != nil {
 		return err
 	}

tests/cli/common.sh

@@ -24,7 +24,9 @@ initServer() {
   assertNotNull "no chain" $2
   CHAIN=$2
   SERVER_LOG=$1/${SERVER_EXE}.log
-  ${SERVER_EXE} init --chain-id $CHAIN $(${CLIENT_EXE} keys get ${RICH} | awk '{print $2}') --home=$SERVE_DIR >>$SERVER_LOG
+
+  GENKEY=$(${CLIENT_EXE} keys get ${RICH} | awk '{print $2}')
+  ${SERVER_EXE} init --chain-id $CHAIN $GENKEY --home=$SERVE_DIR >>$SERVER_LOG
 
   # optionally set the port
   if [ -n "$3" ]; then