Merge PR #3395: Store Refactor 2

store/rootmulti/proof_test.go

@@ -3,19 +3,18 @@ package rootmulti
 import (
 	"testing"
 
-	"github.com/cosmos/cosmos-sdk/types"
 	"github.com/stretchr/testify/require"
 	abci "github.com/tendermint/tendermint/abci/types"
 	dbm "github.com/tendermint/tendermint/libs/db"
 
 	"github.com/cosmos/cosmos-sdk/store/iavl"
-	stypes "github.com/cosmos/cosmos-sdk/store/types"
+	"github.com/cosmos/cosmos-sdk/store/types"
 )
 
 func TestVerifyIAVLStoreQueryProof(t *testing.T) {
 	// Create main tree for testing.
 	db := dbm.NewMemDB()
-	iStore, err := iavl.LoadStore(db, types.CommitID{}, stypes.PruneNothing)
+	iStore, err := iavl.LoadStore(db, types.CommitID{}, types.PruneNothing)
 	store := iStore.(*iavl.Store)
 	require.Nil(t, err)
 	store.Set([]byte("MYKEY"), []byte("MYVALUE"))

store/rootmulti/store.go

@@ -12,10 +12,11 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/store/cachemulti"
 	"github.com/cosmos/cosmos-sdk/store/dbadapter"
+	"github.com/cosmos/cosmos-sdk/store/errors"
 	"github.com/cosmos/cosmos-sdk/store/iavl"
 	"github.com/cosmos/cosmos-sdk/store/tracekv"
 	"github.com/cosmos/cosmos-sdk/store/transient"
-	"github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/store/types"
 )
 
 const (
@@ -288,12 +289,12 @@ func (rs *Store) Query(req abci.RequestQuery) abci.ResponseQuery {
 	store := rs.getStoreByName(storeName)
 	if store == nil {
 		msg := fmt.Sprintf("no such store: %s", storeName)
-		return types.ErrUnknownRequest(msg).QueryResult()
+		return errors.ErrUnknownRequest(msg).QueryResult()
 	}
 	queryable, ok := store.(types.Queryable)
 	if !ok {
 		msg := fmt.Sprintf("store %s doesn't support queries", storeName)
-		return types.ErrUnknownRequest(msg).QueryResult()
+		return errors.ErrUnknownRequest(msg).QueryResult()
 	}
 
 	// trim the path and make the query
@@ -305,12 +306,12 @@ func (rs *Store) Query(req abci.RequestQuery) abci.ResponseQuery {
 	}
 
 	if res.Proof == nil || len(res.Proof.Ops) == 0 {
-		return types.ErrInternal("substore proof was nil/empty when it should never be").QueryResult()
+		return errors.ErrInternal("substore proof was nil/empty when it should never be").QueryResult()
 	}
 
 	commitInfo, errMsg := getCommitInfo(rs.db, res.Height)
 	if errMsg != nil {
-		return types.ErrInternal(errMsg.Error()).QueryResult()
+		return errors.ErrInternal(errMsg.Error()).QueryResult()
 	}
 
 	// Restore origin path and append proof op.
@@ -327,9 +328,9 @@ func (rs *Store) Query(req abci.RequestQuery) abci.ResponseQuery {
 // parsePath expects a format like /<storeName>[/<subpath>]
 // Must start with /, subpath may be empty
 // Returns error if it doesn't start with /
-func parsePath(path string) (storeName string, subpath string, err types.Error) {
+func parsePath(path string) (storeName string, subpath string, err errors.Error) {
 	if !strings.HasPrefix(path, "/") {
-		err = types.ErrUnknownRequest(fmt.Sprintf("invalid path: %s", path))
+		err = errors.ErrUnknownRequest(fmt.Sprintf("invalid path: %s", path))
 		return
 	}
 

store/rootmulti/store_test.go

@@ -8,8 +8,8 @@ import (
 	"github.com/tendermint/tendermint/crypto/merkle"
 	dbm "github.com/tendermint/tendermint/libs/db"
 
-	stypes "github.com/cosmos/cosmos-sdk/store/types"
-	"github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/store/errors"
+	"github.com/cosmos/cosmos-sdk/store/types"
 )
 
 const useDebugDB = false
@@ -157,37 +157,37 @@ func TestMultiStoreQuery(t *testing.T) {
 	// Test bad path.
 	query := abci.RequestQuery{Path: "/key", Data: k, Height: ver}
 	qres := multi.Query(query)
-	require.EqualValues(t, types.CodeUnknownRequest, qres.Code)
-	require.EqualValues(t, types.CodespaceRoot, qres.Codespace)
+	require.EqualValues(t, errors.CodeUnknownRequest, qres.Code)
+	require.EqualValues(t, errors.CodespaceRoot, qres.Codespace)
 
 	query.Path = "h897fy32890rf63296r92"
 	qres = multi.Query(query)
-	require.EqualValues(t, types.CodeUnknownRequest, qres.Code)
-	require.EqualValues(t, types.CodespaceRoot, qres.Codespace)
+	require.EqualValues(t, errors.CodeUnknownRequest, qres.Code)
+	require.EqualValues(t, errors.CodespaceRoot, qres.Codespace)
 
 	// Test invalid store name.
 	query.Path = "/garbage/key"
 	qres = multi.Query(query)
-	require.EqualValues(t, types.CodeUnknownRequest, qres.Code)
-	require.EqualValues(t, types.CodespaceRoot, qres.Codespace)
+	require.EqualValues(t, errors.CodeUnknownRequest, qres.Code)
+	require.EqualValues(t, errors.CodespaceRoot, qres.Codespace)
 
 	// Test valid query with data.
 	query.Path = "/store1/key"
 	qres = multi.Query(query)
-	require.EqualValues(t, types.CodeOK, qres.Code)
+	require.EqualValues(t, errors.CodeOK, qres.Code)
 	require.Equal(t, v, qres.Value)
 
 	// Test valid but empty query.
 	query.Path = "/store2/key"
 	query.Prove = true
 	qres = multi.Query(query)
-	require.EqualValues(t, types.CodeOK, qres.Code)
+	require.EqualValues(t, errors.CodeOK, qres.Code)
 	require.Nil(t, qres.Value)
 
 	// Test store2 data.
 	query.Data = k2
 	qres = multi.Query(query)
-	require.EqualValues(t, types.CodeOK, qres.Code)
+	require.EqualValues(t, errors.CodeOK, qres.Code)
 	require.Equal(t, v2, qres.Value)
 }
 
@@ -196,7 +196,7 @@ func TestMultiStoreQuery(t *testing.T) {
 
 func newMultiStoreWithMounts(db dbm.DB) *Store {
 	store := NewStore(db)
-	store.pruningOpts = stypes.PruneSyncable
+	store.pruningOpts = types.PruneSyncable
 	store.MountStoreWithDB(
 		types.NewKVStoreKey("store1"), types.StoreTypeIAVL, nil)
 	store.MountStoreWithDB(