Merge branch 'develop' into cwgoes/misc-minor-fixes

examples/basecoin/app/app.go

@@ -15,11 +15,9 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/auth"
 	"github.com/cosmos/cosmos-sdk/x/bank"
 	"github.com/cosmos/cosmos-sdk/x/ibc"
-	"github.com/cosmos/cosmos-sdk/x/staking"
+	"github.com/cosmos/cosmos-sdk/x/simplestake"
 
 	"github.com/cosmos/cosmos-sdk/examples/basecoin/types"
-	"github.com/cosmos/cosmos-sdk/examples/basecoin/x/cool"
-	"github.com/cosmos/cosmos-sdk/examples/basecoin/x/sketchy"
 )
 
 const (
@@ -33,6 +31,7 @@ type BasecoinApp struct {
 
 	// keys to access the substores
 	capKeyMainStore    *sdk.KVStoreKey
+	capKeyAccountStore *sdk.KVStoreKey
 	capKeyIBCStore     *sdk.KVStoreKey
 	capKeyStakingStore *sdk.KVStoreKey
 
@@ -40,14 +39,15 @@ type BasecoinApp struct {
 	accountMapper sdk.AccountMapper
 }
 
-func NewBasecoinApp(logger log.Logger, db dbm.DB) *BasecoinApp {
+func NewBasecoinApp(logger log.Logger, dbs map[string]dbm.DB) *BasecoinApp {
 	// create your application object
 	var app = &BasecoinApp{
-		BaseApp:            bam.NewBaseApp(appName, logger, db),
+		BaseApp:            bam.NewBaseApp(appName, logger, dbs["main"]),
 		cdc:                MakeCodec(),
 		capKeyMainStore:    sdk.NewKVStoreKey("main"),
+		capKeyAccountStore: sdk.NewKVStoreKey("acc"),
 		capKeyIBCStore:     sdk.NewKVStoreKey("ibc"),
-		capKeyStakingStore: sdk.NewKVStoreKey("staking"),
+		capKeyStakingStore: sdk.NewKVStoreKey("stake"),
 	}
 
 	// define the accountMapper
@@ -58,20 +58,22 @@ func NewBasecoinApp(logger log.Logger, db dbm.DB) *BasecoinApp {
 
 	// add handlers
 	coinKeeper := bank.NewCoinKeeper(app.accountMapper)
-	coolKeeper := cool.NewKeeper(app.capKeyMainStore, coinKeeper)
 	ibcMapper := ibc.NewIBCMapper(app.cdc, app.capKeyIBCStore)
-	stakeKeeper := staking.NewKeeper(app.capKeyStakingStore, coinKeeper)
+	stakeKeeper := simplestake.NewKeeper(app.capKeyStakingStore, coinKeeper)
 	app.Router().
 		AddRoute("bank", bank.NewHandler(coinKeeper), nil).
-		AddRoute("cool", cool.NewHandler(coolKeeper), coolKeeper.InitGenesis).
-		AddRoute("sketchy", sketchy.NewHandler(), nil).
 		AddRoute("ibc", ibc.NewHandler(ibcMapper, coinKeeper), nil).
-		AddRoute("staking", staking.NewHandler(stakeKeeper), nil)
+		AddRoute("simplestake", simplestake.NewHandler(stakeKeeper), nil)
 
 	// initialize BaseApp
 	app.SetTxDecoder(app.txDecoder)
 	app.SetInitChainer(app.initChainer)
-	app.MountStoresIAVL(app.capKeyMainStore, app.capKeyIBCStore, app.capKeyStakingStore)
+	app.MountStoreWithDB(app.capKeyMainStore, sdk.StoreTypeIAVL, dbs["main"])
+	app.MountStoreWithDB(app.capKeyAccountStore, sdk.StoreTypeIAVL, dbs["acc"])
+	app.MountStoreWithDB(app.capKeyIBCStore, sdk.StoreTypeIAVL, dbs["ibc"])
+	app.MountStoreWithDB(app.capKeyStakingStore, sdk.StoreTypeIAVL, dbs["staking"])
+	// NOTE: Broken until #532 lands
+	//app.MountStoresIAVL(app.capKeyMainStore, app.capKeyIBCStore, app.capKeyStakingStore)
 	app.SetAnteHandler(auth.NewAnteHandler(app.accountMapper))
 	err := app.LoadLatestVersion(app.capKeyMainStore)
 	if err != nil {
@@ -96,12 +98,10 @@ func MakeCodec() *wire.Codec {
 		struct{ sdk.Msg }{},
 		oldwire.ConcreteType{bank.SendMsg{}, msgTypeSend},
 		oldwire.ConcreteType{bank.IssueMsg{}, msgTypeIssue},
-		oldwire.ConcreteType{cool.QuizMsg{}, msgTypeQuiz},
-		oldwire.ConcreteType{cool.SetTrendMsg{}, msgTypeSetTrend},
 		oldwire.ConcreteType{ibc.IBCTransferMsg{}, msgTypeIBCTransferMsg},
 		oldwire.ConcreteType{ibc.IBCReceiveMsg{}, msgTypeIBCReceiveMsg},
-		oldwire.ConcreteType{staking.BondMsg{}, msgTypeBondMsg},
-		oldwire.ConcreteType{staking.UnbondMsg{}, msgTypeUnbondMsg},
+		oldwire.ConcreteType{simplestake.BondMsg{}, msgTypeBondMsg},
+		oldwire.ConcreteType{simplestake.UnbondMsg{}, msgTypeUnbondMsg},
 	)
 
 	const accTypeApp = 0x1

examples/basecoin/app/app_test.go

@@ -10,7 +10,6 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/cosmos/cosmos-sdk/examples/basecoin/types"
-	"github.com/cosmos/cosmos-sdk/examples/basecoin/x/cool"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/auth"
 	"github.com/cosmos/cosmos-sdk/x/bank"
@@ -39,37 +38,22 @@ var (
 		Inputs:  []bank.Input{bank.NewInput(addr1, coins)},
 		Outputs: []bank.Output{bank.NewOutput(addr2, coins)},
 	}
-
-	quizMsg1 = cool.QuizMsg{
-		Sender:     addr1,
-		CoolAnswer: "icecold",
-	}
-
-	quizMsg2 = cool.QuizMsg{
-		Sender:     addr1,
-		CoolAnswer: "badvibesonly",
-	}
-
-	setTrendMsg1 = cool.SetTrendMsg{
-		Sender: addr1,
-		Cool:   "icecold",
-	}
-
-	setTrendMsg2 = cool.SetTrendMsg{
-		Sender: addr1,
-		Cool:   "badvibesonly",
-	}
-
-	setTrendMsg3 = cool.SetTrendMsg{
-		Sender: addr1,
-		Cool:   "warmandkind",
-	}
 )
 
-func newBasecoinApp() *BasecoinApp {
+func loggerAndDBs() (log.Logger, map[string]dbm.DB) {
 	logger := log.NewTMLogger(log.NewSyncWriter(os.Stdout)).With("module", "sdk/app")
-	db := dbm.NewMemDB()
-	return NewBasecoinApp(logger, db)
+	dbs := map[string]dbm.DB{
+		"main":    dbm.NewMemDB(),
+		"acc":     dbm.NewMemDB(),
+		"ibc":     dbm.NewMemDB(),
+		"staking": dbm.NewMemDB(),
+	}
+	return logger, dbs
+}
+
+func newBasecoinApp() *BasecoinApp {
+	logger, dbs := loggerAndDBs()
+	return NewBasecoinApp(logger, dbs)
 }
 
 //_______________________________________________________________________
@@ -81,8 +65,6 @@ func TestMsgs(t *testing.T) {
 		msg sdk.Msg
 	}{
 		{sendMsg},
-		{quizMsg1},
-		{setTrendMsg1},
 	}
 
 	sequences := []int64{0}
@@ -112,9 +94,8 @@ func TestMsgs(t *testing.T) {
 }
 
 func TestGenesis(t *testing.T) {
-	logger := log.NewTMLogger(log.NewSyncWriter(os.Stdout)).With("module", "sdk/app")
-	db := dbm.NewMemDB()
-	bapp := NewBasecoinApp(logger, db)
+	logger, dbs := loggerAndDBs()
+	bapp := NewBasecoinApp(logger, dbs)
 
 	// Construct some genesis bytes to reflect basecoin/types/AppAccount
 	pk := crypto.GenPrivKeyEd25519().PubKey()
@@ -131,9 +112,6 @@ func TestGenesis(t *testing.T) {
 		"accounts": []*types.GenesisAccount{
 			types.NewGenesisAccount(acc),
 		},
-		"cool": map[string]string{
-			"trend": "ice-cold",
-		},
 	}
 	stateBytes, err := json.MarshalIndent(genesisState, "", "\t")
 
@@ -145,13 +123,12 @@ func TestGenesis(t *testing.T) {
 	ctx := bapp.BaseApp.NewContext(true, abci.Header{})
 	res1 := bapp.accountMapper.GetAccount(ctx, baseAcc.Address)
 	assert.Equal(t, acc, res1)
-	/*
-		// reload app and ensure the account is still there
-		bapp = NewBasecoinApp(logger, db)
-		ctx = bapp.BaseApp.NewContext(true, abci.Header{})
-		res1 = bapp.accountMapper.GetAccount(ctx, baseAcc.Address)
-		assert.Equal(t, acc, res1)
-	*/
+
+	// reload app and ensure the account is still there
+	bapp = NewBasecoinApp(logger, dbs)
+	ctx = bapp.BaseApp.NewContext(true, abci.Header{})
+	res1 = bapp.accountMapper.GetAccount(ctx, baseAcc.Address)
+	assert.Equal(t, acc, res1)
 }
 
 func TestSendMsgWithAccounts(t *testing.T) {
@@ -172,9 +149,6 @@ func TestSendMsgWithAccounts(t *testing.T) {
 		"accounts": []*types.GenesisAccount{
 			types.NewGenesisAccount(acc1),
 		},
-		"cool": map[string]string{
-			"trend": "ice-cold",
-		},
 	}
 	stateBytes, err := json.MarshalIndent(genesisState, "", "\t")
 	require.Nil(t, err)
@@ -247,9 +221,6 @@ func TestQuizMsg(t *testing.T) {
 		"accounts": []*types.GenesisAccount{
 			types.NewGenesisAccount(acc1),
 		},
-		"cool": map[string]string{
-			"trend": "ice-cold",
-		},
 	}
 	stateBytes, err := json.MarshalIndent(genesisState, "", "\t")
 	require.Nil(t, err)
@@ -264,21 +235,6 @@ func TestQuizMsg(t *testing.T) {
 	res1 := bapp.accountMapper.GetAccount(ctxCheck, addr1)
 	assert.Equal(t, acc1, res1)
 
-	// Set the trend, submit a really cool quiz and check for reward
-	SignCheckDeliver(t, bapp, setTrendMsg1, 0, true)
-	SignCheckDeliver(t, bapp, quizMsg1, 1, true)
-	CheckBalance(t, bapp, "69icecold")
-	SignCheckDeliver(t, bapp, quizMsg2, 2, false) // result without reward
-	CheckBalance(t, bapp, "69icecold")
-	SignCheckDeliver(t, bapp, quizMsg1, 3, true)
-	CheckBalance(t, bapp, "138icecold")
-	SignCheckDeliver(t, bapp, setTrendMsg2, 4, true) // reset the trend
-	SignCheckDeliver(t, bapp, quizMsg1, 5, false)    // the same answer will nolonger do!
-	CheckBalance(t, bapp, "138icecold")
-	SignCheckDeliver(t, bapp, quizMsg2, 6, true) // earlier answer now relavent again
-	CheckBalance(t, bapp, "69badvibesonly,138icecold")
-	SignCheckDeliver(t, bapp, setTrendMsg3, 7, false) // expect to fail to set the trend to something which is not cool
-
 }
 
 func TestHandler(t *testing.T) {
@@ -297,9 +253,6 @@ func TestHandler(t *testing.T) {
 		"accounts": []*types.GenesisAccount{
 			types.NewGenesisAccount(acc1),
 		},
-		"cool": map[string]string{
-			"trend": "ice-cold",
-		},
 	}
 	stateBytes, err := json.MarshalIndent(genesisState, "", "\t")
 	require.Nil(t, err)

examples/basecoin/cmd/basecli/main.go

@@ -2,9 +2,10 @@ package main
 
 import (
 	"errors"
-	"github.com/spf13/cobra"
 	"os"
 
+	"github.com/spf13/cobra"
+
 	"github.com/tendermint/tmlibs/cli"
 
 	"github.com/cosmos/cosmos-sdk/client"
@@ -13,12 +14,11 @@ import (
 	"github.com/cosmos/cosmos-sdk/client/rpc"
 	"github.com/cosmos/cosmos-sdk/client/tx"
 
-	coolcmd "github.com/cosmos/cosmos-sdk/examples/basecoin/x/cool/commands"
 	"github.com/cosmos/cosmos-sdk/version"
 	authcmd "github.com/cosmos/cosmos-sdk/x/auth/commands"
 	bankcmd "github.com/cosmos/cosmos-sdk/x/bank/commands"
 	ibccmd "github.com/cosmos/cosmos-sdk/x/ibc/commands"
-	stakingcmd "github.com/cosmos/cosmos-sdk/x/staking/commands"
+	simplestakingcmd "github.com/cosmos/cosmos-sdk/x/simplestake/commands"
 
 	"github.com/cosmos/cosmos-sdk/examples/basecoin/app"
 	"github.com/cosmos/cosmos-sdk/examples/basecoin/types"
@@ -62,14 +62,6 @@ func main() {
 		client.PostCommands(
 			bankcmd.SendTxCmd(cdc),
 		)...)
-	basecliCmd.AddCommand(
-		client.PostCommands(
-			coolcmd.QuizTxCmd(cdc),
-		)...)
-	basecliCmd.AddCommand(
-		client.PostCommands(
-			coolcmd.SetTrendTxCmd(cdc),
-		)...)
 	basecliCmd.AddCommand(
 		client.PostCommands(
 			ibccmd.IBCTransferCmd(cdc),
@@ -77,11 +69,11 @@ func main() {
 	basecliCmd.AddCommand(
 		client.PostCommands(
 			ibccmd.IBCRelayCmd(cdc),
-			stakingcmd.BondTxCmd(cdc),
+			simplestakingcmd.BondTxCmd(cdc),
 		)...)
 	basecliCmd.AddCommand(
 		client.PostCommands(
-			stakingcmd.UnbondTxCmd(cdc),
+			simplestakingcmd.UnbondTxCmd(cdc),
 		)...)
 
 	// add proxy, version and key info

examples/basecoin/cmd/basecoind/main.go

@@ -49,11 +49,29 @@ func defaultOptions(args []string) (json.RawMessage, string, cmn.HexBytes, error
 }
 
 func generateApp(rootDir string, logger log.Logger) (abci.Application, error) {
-	db, err := dbm.NewGoLevelDB("basecoin", filepath.Join(rootDir, "data"))
+	dbMain, err := dbm.NewGoLevelDB("basecoin", filepath.Join(rootDir, "data"))
 	if err != nil {
 		return nil, err
 	}
-	bapp := app.NewBasecoinApp(logger, db)
+	dbAcc, err := dbm.NewGoLevelDB("basecoin-acc", filepath.Join(rootDir, "data"))
+	if err != nil {
+		return nil, err
+	}
+	dbIBC, err := dbm.NewGoLevelDB("basecoin-ibc", filepath.Join(rootDir, "data"))
+	if err != nil {
+		return nil, err
+	}
+	dbStaking, err := dbm.NewGoLevelDB("basecoin-staking", filepath.Join(rootDir, "data"))
+	if err != nil {
+		return nil, err
+	}
+	dbs := map[string]dbm.DB{
+		"main":    dbMain,
+		"acc":     dbAcc,
+		"ibc":     dbIBC,
+		"staking": dbStaking,
+	}
+	bapp := app.NewBasecoinApp(logger, dbs)
 	return bapp, nil
 }
 

examples/basecoin/x/cool/commands/tx.go

@@ -1,83 +0,0 @@
-package commands
-
-import (
-	"fmt"
-
-	"github.com/pkg/errors"
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
-
-	"github.com/cosmos/cosmos-sdk/client"
-	"github.com/cosmos/cosmos-sdk/client/builder"
-	"github.com/cosmos/cosmos-sdk/wire"
-
-	"github.com/cosmos/cosmos-sdk/examples/basecoin/x/cool"
-)
-
-// take the coolness quiz transaction
-func QuizTxCmd(cdc *wire.Codec) *cobra.Command {
-	return &cobra.Command{
-		Use:   "cool [answer]",
-		Short: "What's cooler than being cool?",
-		RunE: func(cmd *cobra.Command, args []string) error {
-			if len(args) != 1 || len(args[0]) == 0 {
-				return errors.New("You must provide an answer")
-			}
-
-			// get the from address from the name flag
-			from, err := builder.GetFromAddress()
-			if err != nil {
-				return err
-			}
-
-			// create the message
-			msg := cool.NewQuizMsg(from, args[0])
-
-			// get account name
-			name := viper.GetString(client.FlagName)
-
-			// build and sign the transaction, then broadcast to Tendermint
-			res, err := builder.SignBuildBroadcast(name, msg, cdc)
-			if err != nil {
-				return err
-			}
-
-			fmt.Printf("Committed at block %d. Hash: %s\n", res.Height, res.Hash.String())
-			return nil
-		},
-	}
-}
-
-// set a new cool trend transaction
-func SetTrendTxCmd(cdc *wire.Codec) *cobra.Command {
-	return &cobra.Command{
-		Use:   "setcool [answer]",
-		Short: "You're so cool, tell us what is cool!",
-		RunE: func(cmd *cobra.Command, args []string) error {
-			if len(args) != 1 || len(args[0]) == 0 {
-				return errors.New("You must provide an answer")
-			}
-
-			// get the from address from the name flag
-			from, err := builder.GetFromAddress()
-			if err != nil {
-				return err
-			}
-
-			// get account name
-			name := viper.GetString(client.FlagName)
-
-			// create the message
-			msg := cool.NewSetTrendMsg(from, args[0])
-
-			// build and sign the transaction, then broadcast to Tendermint
-			res, err := builder.SignBuildBroadcast(name, msg, cdc)
-			if err != nil {
-				return err
-			}
-
-			fmt.Printf("Committed at block %d. Hash: %s\n", res.Height, res.Hash.String())
-			return nil
-		},
-	}
-}

examples/basecoin/x/cool/errors.go

@@ -1,17 +0,0 @@
-package cool
-
-import (
-	"fmt"
-
-	sdk "github.com/cosmos/cosmos-sdk/types"
-)
-
-const (
-	// Cool module reserves error 400-499 lawl
-	CodeIncorrectCoolAnswer sdk.CodeType = 400
-)
-
-// ErrIncorrectCoolAnswer - Error returned upon an incorrect guess
-func ErrIncorrectCoolAnswer(answer string) sdk.Error {
-	return sdk.NewError(CodeIncorrectCoolAnswer, fmt.Sprintf("Incorrect cool answer: %v", answer))
-}

examples/basecoin/x/cool/handler.go

@@ -1,62 +0,0 @@
-package cool
-
-import (
-	"fmt"
-	"reflect"
-
-	sdk "github.com/cosmos/cosmos-sdk/types"
-)
-
-// This is just an example to demonstrate a functional custom module
-// with full feature set functionality.
-//
-//  /$$$$$$$  /$$$$$$   /$$$$$$  /$$
-// /$$_____/ /$$__  $$ /$$__  $$| $$
-//| $$      | $$  \ $$| $$  \ $$| $$
-//| $$      | $$  | $$| $$  | $$| $$
-//|  $$$$$$$|  $$$$$$/|  $$$$$$/| $$$$$$$
-// \_______/ \______/  \______/ |______/
-
-// NewHandler returns a handler for "cool" type messages.
-func NewHandler(k Keeper) sdk.Handler {
-	return func(ctx sdk.Context, msg sdk.Msg) sdk.Result {
-		switch msg := msg.(type) {
-		case SetTrendMsg:
-			return handleSetTrendMsg(ctx, k, msg)
-		case QuizMsg:
-			return handleQuizMsg(ctx, k, msg)
-		default:
-			errMsg := fmt.Sprintf("Unrecognized cool Msg type: %v", reflect.TypeOf(msg).Name())
-			return sdk.ErrUnknownRequest(errMsg).Result()
-		}
-	}
-}
-
-// Handle QuizMsg This is the engine of your module
-func handleSetTrendMsg(ctx sdk.Context, k Keeper, msg SetTrendMsg) sdk.Result {
-	k.setTrend(ctx, msg.Cool)
-	return sdk.Result{}
-}
-
-// Handle QuizMsg This is the engine of your module
-func handleQuizMsg(ctx sdk.Context, k Keeper, msg QuizMsg) sdk.Result {
-
-	correct := k.CheckTrend(ctx, msg.CoolAnswer)
-
-	if !correct {
-		return ErrIncorrectCoolAnswer(msg.CoolAnswer).Result()
-	}
-
-	if ctx.IsCheckTx() {
-		return sdk.Result{} // TODO
-	}
-
-	bonusCoins := sdk.Coins{{msg.CoolAnswer, 69}}
-
-	_, err := k.ck.AddCoins(ctx, msg.Sender, bonusCoins)
-	if err != nil {
-		return err.Result()
-	}
-
-	return sdk.Result{}
-}

examples/basecoin/x/cool/keeper.go

@@ -1,59 +0,0 @@
-package cool
-
-import (
-	"encoding/json"
-
-	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/x/bank"
-)
-
-// Cool genesis state, containing the genesis trend
-type GenesisState struct {
-	trend string
-}
-
-// Keeper - handlers sets/gets of custom variables for your module
-type Keeper struct {
-	ck bank.CoinKeeper
-
-	storeKey sdk.StoreKey // The (unexposed) key used to access the store from the Context.
-}
-
-// NewKeeper - Returns the Keeper
-func NewKeeper(key sdk.StoreKey, bankKeeper bank.CoinKeeper) Keeper {
-	return Keeper{bankKeeper, key}
-}
-
-// Key to knowing the trend on the streets!
-var trendKey = []byte("TrendKey")
-
-// GetTrend - returns the current cool trend
-func (k Keeper) GetTrend(ctx sdk.Context) string {
-	store := ctx.KVStore(k.storeKey)
-	bz := store.Get(trendKey)
-	return string(bz)
-}
-
-// Implements sdk.AccountMapper.
-func (k Keeper) setTrend(ctx sdk.Context, newTrend string) {
-	store := ctx.KVStore(k.storeKey)
-	store.Set(trendKey, []byte(newTrend))
-}
-
-// CheckTrend - Returns true or false based on whether guessedTrend is currently cool or not
-func (k Keeper) CheckTrend(ctx sdk.Context, guessedTrend string) bool {
-	if guessedTrend == k.GetTrend(ctx) {
-		return true
-	}
-	return false
-}
-
-// InitGenesis - store the genesis trend
-func (k Keeper) InitGenesis(ctx sdk.Context, data json.RawMessage) error {
-	var state GenesisState
-	if err := json.Unmarshal(data, &state); err != nil {
-		return err
-	}
-	k.setTrend(ctx, state.trend)
-	return nil
-}

examples/basecoin/x/cool/types.go

@@ -1,103 +0,0 @@
-package cool
-
-import (
-	"encoding/json"
-	"fmt"
-	"strings"
-
-	sdk "github.com/cosmos/cosmos-sdk/types"
-)
-
-// A really cool msg type, these fields are can be entirely arbitrary and
-// custom to your message
-type SetTrendMsg struct {
-	Sender sdk.Address
-	Cool   string
-}
-
-// New cool message
-func NewSetTrendMsg(sender sdk.Address, cool string) SetTrendMsg {
-	return SetTrendMsg{
-		Sender: sender,
-		Cool:   cool,
-	}
-}
-
-// enforce the msg type at compile time
-var _ sdk.Msg = SetTrendMsg{}
-
-// nolint
-func (msg SetTrendMsg) Type() string                            { return "cool" }
-func (msg SetTrendMsg) Get(key interface{}) (value interface{}) { return nil }
-func (msg SetTrendMsg) GetSigners() []sdk.Address               { return []sdk.Address{msg.Sender} }
-func (msg SetTrendMsg) String() string {
-	return fmt.Sprintf("SetTrendMsg{Sender: %v, Cool: %v}", msg.Sender, msg.Cool)
-}
-
-// Validate Basic is used to quickly disqualify obviously invalid messages quickly
-func (msg SetTrendMsg) ValidateBasic() sdk.Error {
-	if len(msg.Sender) == 0 {
-		return sdk.ErrUnknownAddress(msg.Sender.String()).Trace("")
-	}
-	if strings.Contains(msg.Cool, "hot") {
-		return sdk.ErrUnauthorized("").Trace("hot is not cool")
-	}
-	if strings.Contains(msg.Cool, "warm") {
-		return sdk.ErrUnauthorized("").Trace("warm is not very cool")
-	}
-	return nil
-}
-
-// Get the bytes for the message signer to sign on
-func (msg SetTrendMsg) GetSignBytes() []byte {
-	b, err := json.Marshal(msg)
-	if err != nil {
-		panic(err)
-	}
-	return b
-}
-
-//_______________________________________________________________________
-
-// A message type to quiz how cool you are. these fields are can be entirely
-// arbitrary and custom to your message
-type QuizMsg struct {
-	Sender     sdk.Address
-	CoolAnswer string
-}
-
-// New cool message
-func NewQuizMsg(sender sdk.Address, coolerthancool string) QuizMsg {
-	return QuizMsg{
-		Sender:     sender,
-		CoolAnswer: coolerthancool,
-	}
-}
-
-// enforce the msg type at compile time
-var _ sdk.Msg = QuizMsg{}
-
-// nolint
-func (msg QuizMsg) Type() string                            { return "cool" }
-func (msg QuizMsg) Get(key interface{}) (value interface{}) { return nil }
-func (msg QuizMsg) GetSigners() []sdk.Address               { return []sdk.Address{msg.Sender} }
-func (msg QuizMsg) String() string {
-	return fmt.Sprintf("QuizMsg{Sender: %v, CoolAnswer: %v}", msg.Sender, msg.CoolAnswer)
-}
-
-// Validate Basic is used to quickly disqualify obviously invalid messages quickly
-func (msg QuizMsg) ValidateBasic() sdk.Error {
-	if len(msg.Sender) == 0 {
-		return sdk.ErrUnknownAddress(msg.Sender.String()).Trace("")
-	}
-	return nil
-}
-
-// Get the bytes for the message signer to sign on
-func (msg QuizMsg) GetSignBytes() []byte {
-	b, err := json.Marshal(msg)
-	if err != nil {
-		panic(err)
-	}
-	return b
-}

examples/basecoin/x/sketchy/handler.go

@@ -1,24 +0,0 @@
-package sketchy
-
-import (
-	sdk "github.com/cosmos/cosmos-sdk/types"
-)
-
-/*
-This is just an example to demonstrate a "sketchy" third-party handler module,
-to demonstrate the "object capability" model for security.
-
-Since nothing is passed in via arguments to the NewHandler constructor,
-it cannot affect the handling of other transaction types.
-*/
-
-// Handle all "sketchy" type messages.
-func NewHandler() sdk.Handler {
-
-	return func(ctx sdk.Context, msg sdk.Msg) sdk.Result {
-		// There's nothing accessible from ctx or msg (even using reflection)
-		// that can mutate the state of the application.
-		return sdk.Result{}
-	}
-
-}