R4R [Staging PR 1/3]: module generalization

baseapp/baseapp.go

@@ -5,6 +5,7 @@ import (
 	"io"
 	"reflect"
 	"runtime/debug"
+	"sort"
 	"strings"
 
 	"errors"
@@ -47,8 +48,8 @@ type BaseApp struct {
 	name        string               // application name from abci.Info
 	db          dbm.DB               // common DB backend
 	cms         sdk.CommitMultiStore // Main (uncached) state
-	router      Router               // handle any kind of message
-	queryRouter QueryRouter          // router for redirecting query calls
+	router      sdk.Router           // handle any kind of message
+	queryRouter sdk.QueryRouter      // router for redirecting query calls
 	txDecoder   sdk.TxDecoder        // unmarshal []byte into sdk.Tx
 
 	// set upon LoadVersion or LoadLatestVersion.
@@ -231,7 +232,7 @@ func (app *BaseApp) setMinGasPrices(gasPrices sdk.DecCoins) {
 }
 
 // Router returns the router of the BaseApp.
-func (app *BaseApp) Router() Router {
+func (app *BaseApp) Router() sdk.Router {
 	if app.sealed {
 		// We cannot return a router when the app is sealed because we can't have
 		// any routes modified which would cause unexpected routing behavior.
@@ -241,7 +242,7 @@ func (app *BaseApp) Router() Router {
 }
 
 // QueryRouter returns the QueryRouter of a BaseApp.
-func (app *BaseApp) QueryRouter() QueryRouter { return app.queryRouter }
+func (app *BaseApp) QueryRouter() sdk.QueryRouter { return app.queryRouter }
 
 // Seal seals a BaseApp. It prohibits any further modifications to a BaseApp.
 func (app *BaseApp) Seal() { app.sealed = true }
@@ -353,6 +354,22 @@ func (app *BaseApp) InitChain(req abci.RequestInitChain) (res abci.ResponseInitC
 
 	res = app.initChainer(app.deliverState.ctx, req)
 
+	// sanity check
+	if len(req.Validators) > 0 {
+		if len(req.Validators) != len(res.Validators) {
+			panic(fmt.Errorf(
+				"len(RequestInitChain.Validators) != len(validators) (%d != %d)",
+				len(req.Validators), len(res.Validators)))
+		}
+		sort.Sort(abci.ValidatorUpdates(req.Validators))
+		sort.Sort(abci.ValidatorUpdates(res.Validators))
+		for i, val := range res.Validators {
+			if !val.Equal(req.Validators[i]) {
+				panic(fmt.Errorf("validators[%d] != req.Validators[%d] ", i, i))
+			}
+		}
+	}
+
 	// NOTE: We don't commit, but BeginBlock for block 1 starts from this
 	// deliverState.
 	return

baseapp/queryrouter.go

@@ -6,16 +6,12 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
-// QueryRouter provides queryables for each query path.
-type QueryRouter interface {
-	AddRoute(r string, h sdk.Querier) (rtr QueryRouter)
-	Route(path string) (h sdk.Querier)
-}
-
 type queryRouter struct {
 	routes map[string]sdk.Querier
 }
 
+var _ sdk.QueryRouter = NewQueryRouter()
+
 // NewQueryRouter returns a reference to a new queryRouter.
 //
 // TODO: Either make the function private or make return type (queryRouter) public.
@@ -27,7 +23,7 @@ func NewQueryRouter() *queryRouter { // nolint: golint
 
 // AddRoute adds a query path to the router with a given Querier. It will panic
 // if a duplicate route is given. The route must be alphanumeric.
-func (qrt *queryRouter) AddRoute(path string, q sdk.Querier) QueryRouter {
+func (qrt *queryRouter) AddRoute(path string, q sdk.Querier) sdk.QueryRouter {
 	if !isAlphaNumeric(path) {
 		panic("route expressions can only contain alphanumeric characters")
 	}

baseapp/router.go

@@ -6,16 +6,12 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
-// Router provides handlers for each transaction type.
-type Router interface {
-	AddRoute(r string, h sdk.Handler) (rtr Router)
-	Route(path string) (h sdk.Handler)
-}
-
 type router struct {
 	routes map[string]sdk.Handler
 }
 
+var _ sdk.Router = NewRouter()
+
 // NewRouter returns a reference to a new router.
 //
 // TODO: Either make the function private or make return type (router) public.
@@ -27,7 +23,7 @@ func NewRouter() *router { // nolint: golint
 
 // AddRoute adds a route path to the router with a given handler. The route must
 // be alphanumeric.
-func (rtr *router) AddRoute(path string, h sdk.Handler) Router {
+func (rtr *router) AddRoute(path string, h sdk.Handler) sdk.Router {
 	if !isAlphaNumeric(path) {
 		panic("route expressions can only contain alphanumeric characters")
 	}

client/lcd/lcd_test.go

@@ -231,7 +231,7 @@ func TestCoinMultiSendGenerateOnly(t *testing.T) {
 	var stdTx auth.StdTx
 	require.Nil(t, cdc.UnmarshalJSON([]byte(body), &stdTx))
 	require.Equal(t, len(stdTx.Msgs), 1)
-	require.Equal(t, stdTx.GetMsgs()[0].Route(), "bank")
+	require.Equal(t, stdTx.GetMsgs()[0].Route(), bank.RouterKey)
 	require.Equal(t, stdTx.GetMsgs()[0].GetSigners(), []sdk.AccAddress{addr})
 	require.Equal(t, 0, len(stdTx.Signatures))
 	require.Equal(t, memo, stdTx.Memo)
@@ -267,7 +267,7 @@ func TestCoinSendGenerateSignAndBroadcast(t *testing.T) {
 	var tx auth.StdTx
 	require.Nil(t, cdc.UnmarshalJSON([]byte(body), &tx))
 	require.Equal(t, len(tx.Msgs), 1)
-	require.Equal(t, tx.Msgs[0].Route(), "bank")
+	require.Equal(t, tx.Msgs[0].Route(), bank.RouterKey)
 	require.Equal(t, tx.Msgs[0].GetSigners(), []sdk.AccAddress{addr})
 	require.Equal(t, 0, len(tx.Signatures))
 	require.Equal(t, memo, tx.Memo)
@@ -387,8 +387,8 @@ func TestPoolParamsQuery(t *testing.T) {
 	tokens := sdk.TokensFromTendermintPower(100)
 	freeTokens := sdk.TokensFromTendermintPower(50)
 	initialPool.NotBondedTokens = initialPool.NotBondedTokens.Add(tokens)
-	initialPool.BondedTokens = initialPool.BondedTokens.Add(tokens)           // Delegate tx on GaiaAppGenState
-	initialPool.NotBondedTokens = initialPool.NotBondedTokens.Add(freeTokens) // freeTokensPerAcc = 50 on GaiaAppGenState
+	initialPool.BondedTokens = initialPool.BondedTokens.Add(tokens) // Delegate tx on GaiaAppGenState
+	initialPool.NotBondedTokens = initialPool.NotBondedTokens.Add(freeTokens)
 
 	require.Equal(t, initialPool.BondedTokens, pool.BondedTokens)