Reorg state package and fix all imports

app/app.go

@@ -18,7 +18,6 @@ import (
 	"github.com/tendermint/basecoin/modules/roles"
 	"github.com/tendermint/basecoin/stack"
 	sm "github.com/tendermint/basecoin/state"
-	"github.com/tendermint/basecoin/state/merkle"
 	"github.com/tendermint/basecoin/version"
 )
 
@@ -32,7 +31,7 @@ const (
 type Basecoin struct {
 	info *sm.ChainState
 
-	state *merkle.Store
+	state *Store
 
 	handler basecoin.Handler
 	height  uint64
@@ -42,7 +41,7 @@ type Basecoin struct {
 var _ abci.Application = &Basecoin{}
 
 // NewBasecoin - create a new instance of the basecoin application
-func NewBasecoin(handler basecoin.Handler, store *merkle.Store, logger log.Logger) *Basecoin {
+func NewBasecoin(handler basecoin.Handler, store *Store, logger log.Logger) *Basecoin {
 	return &Basecoin{
 		handler: handler,
 		info:    sm.NewChainState(),

app/app_test.go

@@ -16,7 +16,6 @@ import (
 	"github.com/tendermint/basecoin/modules/nonce"
 	"github.com/tendermint/basecoin/stack"
 	"github.com/tendermint/basecoin/state"
-	"github.com/tendermint/basecoin/state/merkle"
 	wire "github.com/tendermint/go-wire"
 	"github.com/tendermint/tmlibs/log"
 )
@@ -84,7 +83,7 @@ func (at *appTest) reset() {
 	// Note: switch logger if you want to get more info
 	logger := log.TestingLogger()
 	// logger := log.NewTracingLogger(log.NewTMLogger(os.Stdout))
-	store := merkle.NewStore("", 0, logger.With("module", "store"))
+	store := NewStore("", 0, logger.With("module", "store"))
 	at.app = NewBasecoin(
 		DefaultHandler("mycoin"),
 		store,
@@ -142,7 +141,7 @@ func TestSetOption(t *testing.T) {
 	require := require.New(t)
 
 	logger := log.TestingLogger()
-	store := merkle.NewStore("", 0, logger.With("module", "store"))
+	store := NewStore("", 0, logger.With("module", "store"))
 	app := NewBasecoin(
 		DefaultHandler("atom"),
 		store,

app/genesis_test.go

@@ -12,7 +12,6 @@ import (
 	"github.com/tendermint/tmlibs/log"
 
 	"github.com/tendermint/basecoin/modules/coin"
-	"github.com/tendermint/basecoin/state/merkle"
 )
 
 const genesisFilepath = "./testdata/genesis.json"
@@ -20,7 +19,7 @@ const genesisAcctFilepath = "./testdata/genesis2.json"
 
 func TestLoadGenesisDoNotFailIfAppOptionsAreMissing(t *testing.T) {
 	logger := log.TestingLogger()
-	store := merkle.NewStore("", 0, logger)
+	store := NewStore("", 0, logger)
 	app := NewBasecoin(DefaultHandler("mycoin"), store, logger)
 	err := app.LoadGenesis("./testdata/genesis3.json")
 	require.Nil(t, err, "%+v", err)
@@ -30,7 +29,7 @@ func TestLoadGenesis(t *testing.T) {
 	assert, require := assert.New(t), require.New(t)
 
 	logger := log.TestingLogger()
-	store := merkle.NewStore("", 0, logger)
+	store := NewStore("", 0, logger)
 	app := NewBasecoin(DefaultHandler("mycoin"), store, logger)
 	err := app.LoadGenesis(genesisFilepath)
 	require.Nil(err, "%+v", err)
@@ -60,7 +59,7 @@ func TestLoadGenesisAccountAddress(t *testing.T) {
 	assert, require := assert.New(t), require.New(t)
 
 	logger := log.TestingLogger()
-	store := merkle.NewStore("", 0, logger)
+	store := NewStore("", 0, logger)
 	app := NewBasecoin(DefaultHandler("mycoin"), store, logger)
 	err := app.LoadGenesis(genesisAcctFilepath)
 	require.Nil(err, "%+v", err)

app/store.go

@@ -1,4 +1,4 @@
-package merkle
+package app
 
 import (
 	"bytes"
@@ -9,16 +9,17 @@ import (
 
 	abci "github.com/tendermint/abci/types"
 	"github.com/tendermint/go-wire"
+	"github.com/tendermint/merkleeyes/iavl"
 	cmn "github.com/tendermint/tmlibs/common"
 	dbm "github.com/tendermint/tmlibs/db"
 	"github.com/tendermint/tmlibs/log"
 
-	"github.com/tendermint/merkleeyes/iavl"
+	"github.com/tendermint/basecoin/state"
 )
 
 // Store contains the merkle tree, and all info to handle abci requests
 type Store struct {
-	State
+	state.State
 	height    uint64
 	hash      []byte
 	persisted bool
@@ -48,7 +49,7 @@ func NewStore(dbName string, cacheSize int, logger log.Logger) *Store {
 			nil,
 		)
 		return &Store{
-			State:  NewState(tree, false),
+			State:  state.NewState(tree, false),
 			height: initialHeight,
 			logger: logger,
 		}
@@ -94,7 +95,7 @@ func NewStore(dbName string, cacheSize int, logger log.Logger) *Store {
 	}
 
 	return &Store{
-		State:     NewState(tree, true),
+		State:     state.NewState(tree, true),
 		height:    chainState.Height,
 		hash:      chainState.Hash,
 		persisted: true,

benchmarks/app_test.go

@@ -18,7 +18,6 @@ import (
 	"github.com/tendermint/basecoin/modules/nonce"
 	"github.com/tendermint/basecoin/modules/roles"
 	"github.com/tendermint/basecoin/stack"
-	"github.com/tendermint/basecoin/state/merkle"
 )
 
 type BenchApp struct {
@@ -55,13 +54,13 @@ func NewBenchApp(h basecoin.Handler, chainID string, n int,
 	// logger = log.NewTracingLogger(logger)
 
 	// TODO: disk writing
-	var store *merkle.Store
+	var store *app.Store
 
 	if persist {
 		tmpDir, _ := ioutil.TempDir("", "bc-app-benchmark")
-		store = merkle.NewStore(tmpDir, 500, logger)
+		store = app.NewStore(tmpDir, 500, logger)
 	} else {
-		store = merkle.NewStore("", 0, logger)
+		store = app.NewStore("", 0, logger)
 	}
 
 	app := app.NewBasecoin(

cmd/basecoin/commands/start.go

@@ -20,7 +20,6 @@ import (
 	"github.com/tendermint/tendermint/types"
 
 	"github.com/tendermint/basecoin/app"
-	"github.com/tendermint/basecoin/state/merkle"
 )
 
 // StartCmd - command to start running the basecoin node!
@@ -56,7 +55,7 @@ func init() {
 func startCmd(cmd *cobra.Command, args []string) error {
 	rootDir := viper.GetString(cli.HomeFlag)
 
-	store := merkle.NewStore(
+	store := app.NewStore(
 		path.Join(rootDir, "data", "merkleeyes.db"),
 		EyesCacheSize,
 		logger.With("module", "store"),

docs/guide/counter/plugins/counter/counter_test.go

@@ -5,16 +5,17 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
 	abci "github.com/tendermint/abci/types"
+	"github.com/tendermint/go-wire"
+	"github.com/tendermint/tmlibs/log"
+
 	"github.com/tendermint/basecoin"
 	"github.com/tendermint/basecoin/app"
 	"github.com/tendermint/basecoin/modules/auth"
 	"github.com/tendermint/basecoin/modules/base"
 	"github.com/tendermint/basecoin/modules/coin"
 	"github.com/tendermint/basecoin/modules/nonce"
-	"github.com/tendermint/basecoin/state/merkle"
-	"github.com/tendermint/go-wire"
-	"github.com/tendermint/tmlibs/log"
 )
 
 func TestCounterPlugin(t *testing.T) {
@@ -25,7 +26,7 @@ func TestCounterPlugin(t *testing.T) {
 	logger := log.TestingLogger()
 	// logger := log.NewTracingLogger(log.NewTMLogger(os.Stdout))
 
-	store := merkle.NewStore("", 0, logger.With("module", "store"))
+	store := app.NewStore("", 0, logger.With("module", "store"))
 	h := NewHandler("gold")
 	bcApp := app.NewBasecoin(
 		h,

glide.lock

@@ -1,5 +1,5 @@
-hash: 2848c30b31fb205f846dd7dfca14ebed8a3249cbc5aaa759066b2bab3e4bbf42
-updated: 2017-07-26T15:18:56.353872835-04:00
+hash: 45eed61138603d4d03518ea822068cf32b45d0a219bb7f3b836e52129f2a3a2b
+updated: 2017-07-26T16:26:38.678294279-04:00
 imports:
 - name: github.com/bgentry/speakeasy
   version: 4aabc24848ce5fd31929f7d1e4ea74d3709c14cd
@@ -133,7 +133,7 @@ imports:
   - data
   - data/base58
 - name: github.com/tendermint/light-client
-  version: fcf4e411583135a1900157b8b0274c41e20ea3a1
+  version: 1c53d04dcc65c2fd15526152ed0651af10a09982
   subpackages:
   - certifiers
   - certifiers/client

glide.yaml

@@ -22,7 +22,7 @@ import:
   subpackages:
   - data
 - package: github.com/tendermint/light-client
-  version: unstable
+  version: 1c53d04dcc65c2fd15526152ed0651af10a09982
   subpackages:
   - proofs
   - certifiers