added unit tests

squash me

squash me

squash

state/state.go

@@ -38,7 +38,7 @@ func (s *State) GetChainID() string {
 }
 
 func (s *State) Get(key []byte) (value []byte) {
-	if s.readCache != nil {
+	if s.readCache != nil { //if not a cachewrap
 		value, ok := s.readCache[string(key)]
 		if ok {
 			return value
@@ -48,7 +48,7 @@ func (s *State) Get(key []byte) (value []byte) {
 }
 
 func (s *State) Set(key []byte, value []byte) {
-	if s.readCache != nil {
+	if s.readCache != nil { //if not a cachewrap
 		s.readCache[string(key)] = value
 	}
 	s.store.Set(key, value)
@@ -78,8 +78,14 @@ func (s *State) CacheSync() {
 }
 
 func (s *State) Commit() abci.Result {
-	s.readCache = make(map[string][]byte)
-	return s.store.(*eyes.Client).CommitSync()
+	switch s.store.(type) {
+	case *eyes.Client:
+		s.readCache = make(map[string][]byte)
+		return s.store.(*eyes.Client).CommitSync()
+	default:
+		return abci.NewError(abci.CodeType_InternalError, "can only use commit is store is merkleeyes")
+	}
+
 }
 
 //----------------------------------------

state/state_test.go

@@ -0,0 +1,68 @@
+package state
+
+import (
+	"bytes"
+	"testing"
+
+	"github.com/tendermint/basecoin/types"
+	eyes "github.com/tendermint/merkleeyes/client"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestState(t *testing.T) {
+
+	s := NewState(types.NewMemKVStore())
+
+	s.SetChainID("testchain")
+	assert.True(t, s.GetChainID() == "testchain", "ChainID is improperly stored")
+
+	setRecords := func(kv types.KVStore) {
+		kv.Set([]byte("foo"), []byte("snake"))
+		kv.Set([]byte("bar"), []byte("mouse"))
+	}
+
+	setRecords(s)
+	assert.True(t, bytes.Equal(s.Get([]byte("foo")), []byte("snake")), "state doesn't retrieve after Set")
+	assert.True(t, bytes.Equal(s.Get([]byte("bar")), []byte("mouse")), "state doesn't retrieve after Set")
+
+	// Test account retrieve
+	dumAddr := []byte("dummyAddress")
+
+	acc := &types.Account{
+		PubKey:   nil,
+		Sequence: 1,
+		Balance:  nil,
+	}
+
+	s.SetAccount(dumAddr, acc)
+	assert.True(t, s.GetAccount(dumAddr).Sequence == 1, "GetAccount not retrieving")
+
+	//Test CacheWrap with local mem store
+	store := types.NewMemKVStore()
+	s = NewState(store)
+	cache := s.CacheWrap()
+	setRecords(cache)
+	assert.True(t, !bytes.Equal(store.Get([]byte("foo")), []byte("snake")), "store retrieving before Commit")
+	assert.True(t, !bytes.Equal(store.Get([]byte("bar")), []byte("mouse")), "store retrieving before Commit")
+	cache.CacheSync()
+	assert.True(t, bytes.Equal(store.Get([]byte("foo")), []byte("snake")), "store doesn't retrieve after Commit")
+	assert.True(t, bytes.Equal(store.Get([]byte("bar")), []byte("mouse")), "store doesn't retrieve after Commit")
+
+	//Test Commit on state with non-merkle store
+	assert.True(t, !s.Commit().IsOK(), "Commit shouldn't work with non-merkle store")
+
+	//Test CacheWrap with merkleeyes client store
+	eyesCli := eyes.NewLocalClient("", 0)
+	s = NewState(eyesCli)
+
+	cache = s.CacheWrap()
+	setRecords(cache)
+	assert.True(t, !bytes.Equal(eyesCli.Get([]byte("foo")), []byte("snake")), "store retrieving before Commit")
+	assert.True(t, !bytes.Equal(eyesCli.Get([]byte("bar")), []byte("mouse")), "store retrieving before Commit")
+	cache.CacheSync()
+	assert.True(t, s.Commit().IsOK(), "Bad Commit")
+	assert.True(t, bytes.Equal(eyesCli.Get([]byte("foo")), []byte("snake")), "store doesn't retrieve after Commit")
+	assert.True(t, bytes.Equal(eyesCli.Get([]byte("bar")), []byte("mouse")), "store doesn't retrieve after Commit")
+
+}