Merge remote-tracking branch 'origin/develop' into rigel/fee-distribution

cmd/gaia/app/app_test.go

@@ -31,7 +31,7 @@ func setGenesis(gapp *GaiaApp, accs ...*auth.BaseAccount) error {
 	}
 
 	// Initialize the chain
-	vals := []abci.Validator{}
+	vals := []abci.ValidatorUpdate{}
 	gapp.InitChain(abci.RequestInitChain{Validators: vals, AppStateBytes: stateBytes})
 	gapp.Commit()
 

cmd/gaia/app/benchmarks/txsize_test.go

@@ -31,5 +31,5 @@ func ExampleTxSendSize() {
 	fmt.Println(len(cdc.MustMarshalBinaryBare([]sdk.Msg{msg1})))
 	fmt.Println(len(cdc.MustMarshalBinaryBare(tx)))
 	// output: 80
-	// 173
+	// 167
 }

cmd/gaia/app/sim_test.go

@@ -90,7 +90,7 @@ func appStateFn(r *rand.Rand, accs []simulation.Account) json.RawMessage {
 
 func testAndRunTxs(app *GaiaApp) []simulation.WeightedOperation {
 	return []simulation.WeightedOperation{
-		{100, banksim.SimulateSingleInputMsgSend(app.accountMapper)},
+		{100, banksim.SingleInputSendMsg(app.accountMapper, app.bankKeeper)},
 		{5, govsim.SimulateSubmittingVotingAndSlashingForProposal(app.govKeeper, app.stakeKeeper)},
 		{100, govsim.SimulateMsgDeposit(app.govKeeper, app.stakeKeeper)},
 		{100, stakesim.SimulateMsgCreateValidator(app.accountMapper, app.stakeKeeper)},

cmd/gaia/cli_test/cli_test.go

@@ -7,8 +7,8 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
-	"testing"
 	"path"
+	"testing"
 
 	"github.com/stretchr/testify/require"
 

cmd/gaia/cmd/gaiacli/main.go

@@ -1,7 +1,11 @@
 package main
 
 import (
+	"os"
+	"path"
+
 	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
 
 	"github.com/tendermint/tendermint/libs/cli"
 
@@ -10,7 +14,9 @@ import (
 	"github.com/cosmos/cosmos-sdk/client/lcd"
 	"github.com/cosmos/cosmos-sdk/client/rpc"
 	"github.com/cosmos/cosmos-sdk/client/tx"
+	"github.com/cosmos/cosmos-sdk/cmd/gaia/app"
 	"github.com/cosmos/cosmos-sdk/version"
+
 	authcmd "github.com/cosmos/cosmos-sdk/x/auth/client/cli"
 	bankcmd "github.com/cosmos/cosmos-sdk/x/bank/client/cli"
 	distrcmd "github.com/cosmos/cosmos-sdk/x/distribution/client/cli"
@@ -18,11 +24,7 @@ import (
 	slashingcmd "github.com/cosmos/cosmos-sdk/x/slashing/client/cli"
 	stakecmd "github.com/cosmos/cosmos-sdk/x/stake/client/cli"
 
-	"os"
-	"path"
-
-	"github.com/cosmos/cosmos-sdk/cmd/gaia/app"
-	"github.com/spf13/viper"
+	_ "github.com/cosmos/cosmos-sdk/client/lcd/statik"
 )
 
 const (