Merge branch 'develop' of https://github.com/cosmos/cosmos-sdk into aditya/cleanup

examples/democoin/x/cool/handler.go

@@ -47,10 +47,6 @@ func handleMsgQuiz(ctx sdk.Context, k Keeper, msg MsgQuiz) sdk.Result {
 		return ErrIncorrectCoolAnswer(k.codespace, msg.CoolAnswer).Result()
 	}
 
-	if ctx.IsCheckTx() {
-		return sdk.Result{} // TODO
-	}
-
 	bonusCoins := sdk.Coins{sdk.NewCoin(msg.CoolAnswer, 69)}
 
 	_, _, err := k.ck.AddCoins(ctx, msg.Sender, bonusCoins)

examples/democoin/x/pow/handler.go

@@ -26,14 +26,6 @@ func handleMsgMine(ctx sdk.Context, pk Keeper, msg MsgMine) sdk.Result {
 		return err.Result()
 	}
 
-	// commented for now, makes testing difficult
-	// TODO figure out a better test method that allows early CheckTx return
-	/*
-		if ctx.IsCheckTx() {
-			return sdk.Result{} // TODO
-		}
-	*/
-
 	err = pk.ApplyValid(ctx, msg.Sender, newDiff, newCount)
 	if err != nil {
 		return err.Result()