Merge PR #2219: Update to Tendermint 0.24 (except NextValSet offsets)

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/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

@@ -18,9 +18,9 @@ import (
 	stakecmd "github.com/cosmos/cosmos-sdk/x/stake/client/cli"
 
 	"github.com/cosmos/cosmos-sdk/cmd/gaia/app"
-	"path"
-	"os"
 	"github.com/spf13/viper"
+	"os"
+	"path"
 )
 
 const (
@@ -152,7 +152,7 @@ func initConfig(cmd *cobra.Command) error {
 	}
 
 	if err := viper.BindPFlag(cli.EncodingFlag, cmd.PersistentFlags().Lookup(cli.EncodingFlag)); err != nil {
-	    return err
+		return err
 	}
 	return viper.BindPFlag(cli.OutputFlag, cmd.PersistentFlags().Lookup(cli.OutputFlag))
 }