From 1f5a27896534ea63300388b484baac4e4de14cdc Mon Sep 17 00:00:00 2001
From: Ethan Buchman <ethan@coinculture.info>
Date: Mon, 22 May 2017 07:44:50 -0400
Subject: [PATCH] fix build/tests

---
 app/app_test.go                  | 7 +++----
 cmd/basecli/commands/adapters.go | 1 -
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/app_test.go b/app/app_test.go
index d37a6ade8e..1f150e8c48 100644
--- a/app/app_test.go
+++ b/app/app_test.go
@@ -9,7 +9,6 @@ import (
 	"github.com/stretchr/testify/require"
 
 	abci "github.com/tendermint/abci/types"
-	"github.com/tendermint/basecoin/state"
 	"github.com/tendermint/basecoin/types"
 	wire "github.com/tendermint/go-wire"
 	eyes "github.com/tendermint/merkleeyes/client"
@@ -38,7 +37,7 @@ func newAppTest(t *testing.T) *appTest {
 
 // make a tx sending 5mycoin from each accIn to accOut
 func (at *appTest) getTx(seq int) *types.SendTx {
-	tx := types.GetTx(seq, at.accOut, at.accIn)
+	tx := types.MakeSendTx(seq, at.accOut, at.accIn)
 	types.SignTx(at.chainID, tx, at.accIn)
 	return tx
 }
@@ -123,7 +122,7 @@ func TestSetOption(t *testing.T) {
 	res = app.SetOption("base/account", string(accsInBytes))
 	require.EqualValues(res, "Success")
 	// make sure it is set correctly, with some balance
-	acct := state.GetAccount(app.GetState(), accIn.PubKey.Address())
+	acct := types.GetAccount(app.GetState(), accIn.PubKey.Address())
 	require.NotNil(acct)
 	assert.Equal(accIn.Balance, acct.Balance)
 
@@ -149,7 +148,7 @@ func TestSetOption(t *testing.T) {
 }`
 	res = app.SetOption("base/account", unsortAcc)
 	require.EqualValues(res, "Success")
-	acct = state.GetAccount(app.GetState(), unsortAddr)
+	acct = types.GetAccount(app.GetState(), unsortAddr)
 	require.NotNil(acct)
 	assert.True(acct.Balance.IsValid())
 	assert.Equal(unsortCoins, acct.Balance)
diff --git a/cmd/basecli/commands/adapters.go b/cmd/basecli/commands/adapters.go
index fa2cfec08e..516cb2f0df 100644
--- a/cmd/basecli/commands/adapters.go
+++ b/cmd/basecli/commands/adapters.go
@@ -14,7 +14,6 @@ import (
 	"github.com/tendermint/light-client/commands"
 	"github.com/tendermint/light-client/proofs"
 
-	"github.com/tendermint/basecoin/state"
 	btypes "github.com/tendermint/basecoin/types"
 )