Merge branch 'rigel/tick-tests' into joon/732-stake-keeper

.gitignore

@@ -1,23 +1,23 @@
+# OS
 .DS_Store
 *.swp
 *.swo
+.vscode
+
+# Build
 vendor
-merkleeyes.db
 build
-docs/guide/*.sh
 tools/bin/*
 examples/build/*
-examples/basecoin/glide.lock
+docs/_build
+
+# Data - ideally these don't exist
 examples/basecoin/app/data
 baseapp/data/*
-docs/_build
-.DS_Store
-coverage.txt
-profile.out
-.vscode
+
+# Testing
 coverage.txt
 profile.out
-client/lcd/keys.db/
 
 ### Vagrant ###
 .vagrant/

CHANGELOG.md

@@ -1,5 +1,37 @@
 # Changelog
 
+## 0.13.0 (April 2, 2018)
+
+BREAKING CHANGES
+
+* [basecoin] Remove cool/sketchy modules -> moved to new `democoin`
+* [basecoin] NewBasecoinApp takes a `map[string]dbm.DB` as temporary measure
+  to allow mounting multiple stores with their own DB until they can share one
+* [staking] Renamed to `simplestake`
+* [builder] Functions don't take `passphrase` as argument
+* [server] GenAppState returns generated seed and address
+* [basecoind] `init` command outputs JSON of everything necessary for testnet
+* [basecoind] `basecoin.db -> data/basecoin.db`
+* [basecli] `data/keys.db -> keys/keys.db`
+
+FEATURES
+
+* [types] `Coin` supports direct arithmetic operations
+* [basecoind] Add `show_validator` and `show_node_id` commands
+* [staking] Initial merge of full staking module!
+* [democoin] New example application to demo custom modules
+
+IMPROVEMENTS
+
+* [makefile] `make install`
+* [testing] Use `/tmp` for directories so they don't get left in the repo
+
+BUG FIXES
+
+* [basecoin] Allow app to be restarted
+* [makefile] Fix build on Windows
+* [basecli] Get confirmation before overriding key with same name
+
 ## 0.12.0 (March 27 2018)
 
 BREAKING CHANGES

Makefile

@@ -19,14 +19,25 @@ gaia:
 
 build:
 	@rm -rf $(shell pwd)/examples/basecoin/vendor/
+	@rm -rf $(shell pwd)/examples/democoin/vendor/
 ifeq ($(OS),Windows_NT)
 	go build $(BUILD_FLAGS) -o build/basecoind.exe ./examples/basecoin/cmd/basecoind
 	go build $(BUILD_FLAGS) -o build/basecli.exe ./examples/basecoin/cmd/basecli
+	go build $(BUILD_FLAGS) -o build/democoind.exe ./examples/democoin/cmd/democoind
+	go build $(BUILD_FLAGS) -o build/democli.exe ./examples/democoin/cmd/democli
 else
 	go build $(BUILD_FLAGS) -o build/basecoind ./examples/basecoin/cmd/basecoind
 	go build $(BUILD_FLAGS) -o build/basecli ./examples/basecoin/cmd/basecli
+	go build $(BUILD_FLAGS) -o build/democoind ./examples/democoin/cmd/democoind
+	go build $(BUILD_FLAGS) -o build/democli ./examples/democoin/cmd/democli
 endif
 
+install: 
+	go install $(BUILD_FLAGS) ./examples/basecoin/cmd/basecoind
+	go install $(BUILD_FLAGS) ./examples/basecoin/cmd/basecli
+	go install $(BUILD_FLAGS) ./examples/democoin/cmd/democoind
+	go install $(BUILD_FLAGS) ./examples/democoin/cmd/democli
+
 dist:
 	@bash publish/dist.sh
 	@bash publish/publish.sh
@@ -74,13 +85,12 @@ test: test_unit # test_cli
 
 test_unit:
 	@rm -rf examples/basecoin/vendor/
+	@rm -rf examples/democoin/vendor/
 	@go test $(PACKAGES)
 
 test_cover:
 	@rm -rf examples/basecoin/vendor/
-	@rm -rf client/lcd/keys.db ~/.tendermint_test
 	@bash tests/test_cover.sh
-	@rm -rf client/lcd/keys.db ~/.tendermint_test
 
 benchmark:
 	@go test -bench=. $(PACKAGES)

baseapp/baseapp.go

@@ -55,6 +55,7 @@ type BaseApp struct {
 var _ abci.Application = (*BaseApp)(nil)
 
 // Create and name new BaseApp
+// NOTE: The db is used to store the version number for now.
 func NewBaseApp(name string, logger log.Logger, db dbm.DB) *BaseApp {
 	return &BaseApp{
 		Logger: logger,
@@ -71,12 +72,18 @@ func (app *BaseApp) Name() string {
 }
 
 // Mount a store to the provided key in the BaseApp multistore
+// Broken until #532 is implemented.
 func (app *BaseApp) MountStoresIAVL(keys ...*sdk.KVStoreKey) {
 	for _, key := range keys {
 		app.MountStore(key, sdk.StoreTypeIAVL)
 	}
 }
 
+// Mount a store to the provided key in the BaseApp multistore
+func (app *BaseApp) MountStoreWithDB(key sdk.StoreKey, typ sdk.StoreType, db dbm.DB) {
+	app.cms.MountStoreWithDB(key, typ, db)
+}
+
 // Mount a store to the provided key in the BaseApp multistore
 func (app *BaseApp) MountStore(key sdk.StoreKey, typ sdk.StoreType) {
 	app.cms.MountStoreWithDB(key, typ, app.db)
@@ -241,11 +248,6 @@ func (app *BaseApp) InitChain(req abci.RequestInitChain) (res abci.ResponseInitC
 		// TODO Return something intelligent
 		panic(err)
 	}
-	err = app.Router().InitGenesis(app.deliverState.ctx, *genesisState)
-	if err != nil {
-		// TODO Return something intelligent
-		panic(err)
-	}
 
 	// NOTE: we don't commit, but BeginBlock for block 1
 	// starts from this deliverState

baseapp/baseapp_test.go

@@ -35,12 +35,15 @@ func TestMountStores(t *testing.T) {
 
 	// make some cap keys
 	capKey1 := sdk.NewKVStoreKey("key1")
+	db1 := dbm.NewMemDB()
 	capKey2 := sdk.NewKVStoreKey("key2")
+	db2 := dbm.NewMemDB()
 
 	// no stores are mounted
 	assert.Panics(t, func() { app.LoadLatestVersion(capKey1) })
 
-	app.MountStoresIAVL(capKey1, capKey2)
+	app.MountStoreWithDB(capKey1, sdk.StoreTypeIAVL, db1)
+	app.MountStoreWithDB(capKey2, sdk.StoreTypeIAVL, db2)
 
 	// stores are mounted
 	err := app.LoadLatestVersion(capKey1)
@@ -126,7 +129,6 @@ func TestTxDecoder(t *testing.T) {
 
 // Test that Info returns the latest committed state.
 func TestInfo(t *testing.T) {
-
 	app := newBaseApp(t.Name())
 
 	// ----- test an empty response -------
@@ -145,17 +147,19 @@ func TestInfo(t *testing.T) {
 }
 
 func TestInitChainer(t *testing.T) {
-	logger := defaultLogger()
-	db := dbm.NewMemDB()
 	name := t.Name()
+	db := dbm.NewMemDB()
+	logger := defaultLogger()
 	app := NewBaseApp(name, logger, db)
-
 	// make cap keys and mount the stores
 	// NOTE/TODO: mounting multiple stores is broken
 	// see https://github.com/cosmos/cosmos-sdk/issues/532
 	capKey := sdk.NewKVStoreKey("main")
-	// capKey2 := sdk.NewKVStoreKey("key2")
-	app.MountStoresIAVL(capKey)          // , capKey2)
+	db1 := dbm.NewMemDB()
+	capKey2 := sdk.NewKVStoreKey("key2")
+	db2 := dbm.NewMemDB()
+	app.MountStoreWithDB(capKey, sdk.StoreTypeIAVL, db1)
+	app.MountStoreWithDB(capKey2, sdk.StoreTypeIAVL, db2)
 	err := app.LoadLatestVersion(capKey) // needed to make stores non-nil
 	assert.Nil(t, err)
 
@@ -187,9 +191,8 @@ func TestInitChainer(t *testing.T) {
 
 	// reload app
 	app = NewBaseApp(name, logger, db)
-	capKey = sdk.NewKVStoreKey("main")
-	// capKey2 = sdk.NewKVStoreKey("key2") // TODO
-	app.MountStoresIAVL(capKey)         //, capKey2)
+	app.MountStoreWithDB(capKey, sdk.StoreTypeIAVL, db1)
+	app.MountStoreWithDB(capKey2, sdk.StoreTypeIAVL, db2)
 	err = app.LoadLatestVersion(capKey) // needed to make stores non-nil
 	assert.Nil(t, err)
 	app.SetInitChainer(initChainer)
@@ -246,7 +249,7 @@ func TestDeliverTx(t *testing.T) {
 
 		counter += 1
 		return sdk.Result{}
-	}, nil)
+	})
 
 	tx := testUpdatePowerTx{} // doesn't matter
 	header := abci.Header{AppHash: []byte("apphash")}
@@ -281,7 +284,7 @@ func TestQuery(t *testing.T) {
 		store := ctx.KVStore(capKey)
 		store.Set(key, value)
 		return sdk.Result{}
-	}, nil)
+	})
 
 	query := abci.RequestQuery{
 		Path: "/main/key",
@@ -346,7 +349,7 @@ func TestValidatorChange(t *testing.T) {
 	app.Router().AddRoute(msgType, func(ctx sdk.Context, msg sdk.Msg) sdk.Result {
 		// TODO
 		return sdk.Result{}
-	}, nil)
+	})
 
 	// Load latest state, which should be empty.
 	err := app.LoadLatestVersion(capKey)

baseapp/router.go

@@ -1,25 +1,21 @@
 package baseapp
 
 import (
-	"encoding/json"
-	"fmt"
 	"regexp"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
 // Router provides handlers for each transaction type.
 type Router interface {
-	AddRoute(r string, h sdk.Handler, i sdk.InitGenesis) (rtr Router)
+	AddRoute(r string, h sdk.Handler) (rtr Router)
 	Route(path string) (h sdk.Handler)
-	InitGenesis(ctx sdk.Context, data map[string]json.RawMessage) error
 }
 
 // map a transaction type to a handler and an initgenesis function
 type route struct {
 	r string
 	h sdk.Handler
-	i sdk.InitGenesis
 }
 
 type router struct {
@@ -38,11 +34,11 @@ func NewRouter() *router {
 var isAlpha = regexp.MustCompile(`^[a-zA-Z]+$`).MatchString
 
 // AddRoute - TODO add description
-func (rtr *router) AddRoute(r string, h sdk.Handler, i sdk.InitGenesis) Router {
+func (rtr *router) AddRoute(r string, h sdk.Handler) Router {
 	if !isAlpha(r) {
 		panic("route expressions can only contain alphanumeric characters")
 	}
-	rtr.routes = append(rtr.routes, route{r, h, i})
+	rtr.routes = append(rtr.routes, route{r, h})
 
 	return rtr
 }
@@ -57,20 +53,3 @@ func (rtr *router) Route(path string) (h sdk.Handler) {
 	}
 	return nil
 }
-
-// InitGenesis - call `InitGenesis`, where specified, for all routes
-// Return the first error if any, otherwise nil
-func (rtr *router) InitGenesis(ctx sdk.Context, data map[string]json.RawMessage) error {
-	for _, route := range rtr.routes {
-		if route.i != nil {
-			encoded, found := data[route.r]
-			if !found {
-				return sdk.ErrGenesisParse(fmt.Sprintf("Expected module genesis information for module %s but it was not present", route.r))
-			}
-			if err := route.i(ctx, encoded); err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}

client/keys/utils.go

@@ -2,6 +2,7 @@ package keys
 
 import (
 	"fmt"
+	"path/filepath"
 
 	"github.com/spf13/viper"
 
@@ -32,7 +33,7 @@ type KeyOutput struct {
 func GetKeyBase() (keys.Keybase, error) {
 	if keybase == nil {
 		rootDir := viper.GetString(cli.HomeFlag)
-		db, err := dbm.NewGoLevelDB(KeyDBName, rootDir)
+		db, err := dbm.NewGoLevelDB(KeyDBName, filepath.Join(rootDir, "keys"))
 		if err != nil {
 			return nil, err
 		}