replace basecli state presenters with cmds

.gitignore

@@ -2,3 +2,4 @@
 vendor
 merkleeyes.db
 build
+shunit2

Makefile

@@ -3,7 +3,7 @@ GOTOOLS = \
 					github.com/Masterminds/glide
 PACKAGES=$(shell go list ./... | grep -v '/vendor/')
 
-all: test install
+all: get_vendor_deps test install
 
 build:
 	go build ./cmd/...
@@ -15,15 +15,24 @@ dist:
 	@bash scripts/dist.sh
 	@bash scripts/publish.sh
 
+clitest/shunit2:
+	wget "https://raw.githubusercontent.com/kward/shunit2/master/source/2.1/src/shunit2" \
+		-q -O clitest/shunit2
+
+test_cli: clitest/shunit2
+	# sudo apt-get install jq
+	@./clitest/basictx.sh
+	# @./clitest/ibc.sh
+
 test:
 	go test $(PACKAGES)
 	#go run tests/tendermint/*.go
 
-get_deps:
-	go get -d ./...
+# get_deps:
+# 	go get -d ./...
 
-update_deps:
-	go get -d -u ./...
+# update_deps:
+# 	go get -d -u ./...
 
 get_vendor_deps: tools
 	glide install

clitest/basictx.sh

@@ -0,0 +1,143 @@
+#!/bin/bash
+
+oneTimeSetUp() {
+  BASE_DIR=$HOME/.basecoin_test_basictx
+  LOG=$BASE_DIR/test.log
+  SERVER_LOG=$BASE_DIR/basecoin.log
+
+  rm -rf $BASE_DIR
+  mkdir -p $BASE_DIR
+
+  ACCOUNTS=(jae ethan bucky rigel igor)
+  RICH=${ACCOUNTS[0]}
+  POOR=${ACCOUNTS[1]}
+
+  # set up client
+  prepareClient
+
+  # start basecoin server (with counter)
+  initServer
+  echo pid $PID_SERVER
+
+  initClient
+
+  echo "...Testing may begin!"
+  echo
+  echo
+  echo
+}
+
+oneTimeTearDown() {
+  echo
+  echo
+  echo "stopping basecoin test server..."
+  kill -9 $PID_SERVER >/dev/null 2>&1
+  sleep 1
+}
+
+prepareClient() {
+  echo "Preparing client keys..."
+  export BC_HOME=$BASE_DIR/client
+  basecli reset_all
+  assertTrue $?
+
+  for i in "${!ACCOUNTS[@]}"; do
+      newKey ${ACCOUNTS[$i]}
+  done
+}
+
+initServer() {
+  echo "Setting up genesis..."
+  SERVE_DIR=$BASE_DIR/server
+  rm -rf $SERVE_DIR 2>/dev/null
+  basecoin init --home=$SERVE_DIR >>$SERVER_LOG
+
+  #change the genesis to the first account
+  GENKEY=$(basecli keys get ${RICH} -o json | jq .pubkey.data)
+  GENJSON=$(cat $SERVE_DIR/genesis.json)
+  echo $GENJSON | jq '.app_options.accounts[0].pub_key.data='$GENKEY > $SERVE_DIR/genesis.json
+
+  echo "Starting server..."
+  basecoin start --home=$SERVE_DIR >>$SERVER_LOG 2>&1 &
+  sleep 5
+  PID_SERVER=$!
+}
+
+initClient() {
+  echo "Attaching client..."
+  # hard-code the expected validator hash
+  basecli init --chainid=test_chain_id --node=tcp://localhost:46657 --valhash=EB168E17E45BAEB194D4C79067FFECF345C64DE6
+  assertTrue "initialized light-client" $?
+}
+
+# newKeys makes a key for a given username, second arg optional password
+newKey(){
+  assertNotNull "keyname required" "$1"
+  KEYPASS=${2:-qwertyuiop}
+  (echo $KEYPASS; echo $KEYPASS) | basecli keys new $1 >>$LOG 2>/dev/null
+  assertTrue "created $1" $?
+  assertTrue "$1 doesn't exist" "basecli keys get $1"
+}
+
+# getAddr gets the address for a key name
+getAddr() {
+  assertNotNull "keyname required" "$1"
+  RAW=$(basecli keys get $1)
+  assertTrue "no key for $1" $?
+  # print the addr
+  echo $RAW | cut -d' ' -f2
+}
+
+test00GetAccount() {
+  SENDER=$(getAddr $RICH)
+  RECV=$(getAddr $POOR)
+
+  assertFalse "requires arg" "basecli query account"
+  ACCT=$(basecli query account $SENDER)
+  assertTrue "must have proper genesis account" $?
+  assertEquals "no tx" "0" $(echo $ACCT | jq .data.sequence)
+  assertEquals "has money" "9007199254740992" $(echo $ACCT | jq .data.coins[0].amount)
+
+  ACCT2=$(basecli query account $RECV)
+  assertFalse "has no genesis account" $?
+}
+
+test01SendTx() {
+  SENDER=$(getAddr $RICH)
+  RECV=$(getAddr $POOR)
+
+  assertFalse "missing dest" "basecli tx send --amount=992mycoin --sequence=1 2>/dev/null"
+  assertFalse "bad password" "echo foo | basecli tx send --amount=992mycoin --sequence=1 --to=$RECV --name=$RICH 2>/dev/null"
+  # we have to remove the password request from stdout, to just get the json
+  RES=$(echo qwertyuiop | basecli tx send --amount=992mycoin --sequence=1 --to=$RECV --name=$RICH 2>/dev/null | tail -n +2)
+  assertTrue "sent tx" $?
+  HASH=$(echo $RES | jq .hash | tr -d \")
+  TX_HEIGHT=$(echo $RES | jq .height)
+  assertEquals "good check" "0" $(echo $RES | jq .check_tx.code)
+  assertEquals "good deliver" "0" $(echo $RES | jq .deliver_tx.code)
+
+  # make sure sender goes down
+  ACCT=$(basecli query account $SENDER)
+  assertTrue "must have genesis account" $?
+  assertEquals "one tx" "1" $(echo $ACCT | jq .data.sequence)
+  assertEquals "has money" "9007199254740000" $(echo $ACCT | jq .data.coins[0].amount)
+
+  # make sure recipient goes up
+  ACCT2=$(basecli query account $RECV)
+  assertTrue "must have new account" $?
+  assertEquals "no tx" "0" $(echo $ACCT2 | jq .data.sequence)
+  assertEquals "has money" "992" $(echo $ACCT2 | jq .data.coins[0].amount)
+
+  # make sure tx is indexed
+  TX=$(basecli query tx $HASH)
+  assertTrue "found tx" $?
+  assertEquals "proper height" $TX_HEIGHT $(echo $TX | jq .height)
+  assertEquals "type=send" '"send"' $(echo $TX | jq .data.type)
+  assertEquals "proper sender" "\"$SENDER\"" $(echo $TX | jq .data.data.inputs[0].address)
+  assertEquals "proper out amount" "992" $(echo $TX | jq .data.data.outputs[0].coins[0].amount)
+}
+
+
+# load and run these tests with shunit2!
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" #get this files directory
+. $DIR/shunit2

clitest/ibc.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+echo "ibc test not implemented"