Go Formatting update

CHANGELOG.md

@@ -5,6 +5,7 @@
 **Implemented Enhancements:**
 
 - Remove unused flags from command prompt for storing contract [\#647](https://github.com/CosmWasm/wasmd/issues/647)
+- Ran `make format` [\#649](https://github.com/CosmWasm/wasmd/issues/649)
 
 [Full Changelog](https://github.com/CosmWasm/wasmd/compare/v0.20.0...HEAD)
 

app/ante.go

@@ -1,13 +1,14 @@
 package app
 
 import (
- wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
  sdk "github.com/cosmos/cosmos-sdk/types"
  "github.com/cosmos/cosmos-sdk/x/auth/ante"
  "github.com/cosmos/cosmos-sdk/x/auth/signing"
  "github.com/cosmos/cosmos-sdk/x/auth/types"
  channelkeeper "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/keeper"
  ibcante "github.com/cosmos/cosmos-sdk/x/ibc/core/ante"
+
+ wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
 )
 
 // NewAnteHandler returns an AnteHandler that checks and increments sequence

app/app.go

@@ -18,8 +18,6 @@ import (
  tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
  dbm "github.com/tendermint/tm-db"
 
- "github.com/CosmWasm/wasmd/x/wasm"
- wasmclient "github.com/CosmWasm/wasmd/x/wasm/client"
  "github.com/cosmos/cosmos-sdk/baseapp"
  "github.com/cosmos/cosmos-sdk/client"
  "github.com/cosmos/cosmos-sdk/client/rpc"
@@ -88,6 +86,9 @@ import (
  upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper"
  upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 
+ "github.com/CosmWasm/wasmd/x/wasm"
+ wasmclient "github.com/CosmWasm/wasmd/x/wasm/client"
+
  // unnamed import of statik for swagger UI support
  _ "github.com/cosmos/cosmos-sdk/client/docs/statik"
 )

app/app_test.go

@@ -10,8 +10,9 @@ import (
  "github.com/tendermint/tendermint/libs/log"
  db "github.com/tendermint/tm-db"
 
- "github.com/CosmWasm/wasmd/x/wasm"
  abci "github.com/tendermint/tendermint/abci/types"
+
+ "github.com/CosmWasm/wasmd/x/wasm"
 )
 
 var emptyWasmOpts []wasm.Option = nil

app/sim_test.go

@@ -3,7 +3,10 @@ package app
 import (
  "encoding/json"
  "fmt"
- "github.com/CosmWasm/wasmd/x/wasm"
+ "os"
+ "path/filepath"
+ "testing"
+
  "github.com/cosmos/cosmos-sdk/baseapp"
  "github.com/cosmos/cosmos-sdk/simapp"
  sdk "github.com/cosmos/cosmos-sdk/types"
@@ -26,9 +29,8 @@ import (
  "github.com/tendermint/tendermint/libs/log"
  tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
  dbm "github.com/tendermint/tm-db"
- "os"
- "path/filepath"
- "testing"
+
+ "github.com/CosmWasm/wasmd/x/wasm"
 )
 
 // Get flags every time the simulator is run

app/test_access.go

@@ -3,13 +3,14 @@ package app
 import (
  "testing"
 
- "github.com/CosmWasm/wasmd/x/wasm"
  "github.com/cosmos/cosmos-sdk/codec"
  bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
  capabilitykeeper "github.com/cosmos/cosmos-sdk/x/capability/keeper"
  ibctransferkeeper "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/keeper"
  ibckeeper "github.com/cosmos/cosmos-sdk/x/ibc/core/keeper"
  stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
+
+ "github.com/CosmWasm/wasmd/x/wasm"
 )
 
 type TestSupport struct {

app/test_helpers.go

@@ -5,11 +5,12 @@ import (
  "encoding/hex"
  "encoding/json"
  "fmt"
- "github.com/CosmWasm/wasmd/x/wasm"
  "strconv"
  "testing"
  "time"
 
+ "github.com/CosmWasm/wasmd/x/wasm"
+
  "github.com/stretchr/testify/require"
  abci "github.com/tendermint/tendermint/abci/types"
  "github.com/tendermint/tendermint/libs/log"

benchmarks/app_test.go

@@ -140,13 +140,13 @@ func InitializeWasmApp(b testing.TB, db dbm.DB, numAccounts int) AppInfo {
  }
  initialBalances[i] = balance{
  Address: acct,
- Amount: 1000000000,
+ Amount:  1000000000,
  }
  }
  init := cw20InitMsg{
- Name: "Cash Money",
- Symbol: "CASH",
- Decimals: 2,
+ Name:  "Cash Money",
+ Symbol:  "CASH",
+ Decimals:  2,
  InitialBalances: initialBalances,
  }
  initBz, err := json.Marshal(init)

benchmarks/bench_test.go

@@ -70,27 +70,27 @@ func BenchmarkTxSending(b *testing.B) {
  numAccounts int
  }{
  "basic send - memdb": {
- db: buildMemDB,
- blockSize: 20,
- txBuilder: buildTxFromMsg(bankSendMsg),
+ db:  buildMemDB,
+ blockSize:  20,
+ txBuilder:  buildTxFromMsg(bankSendMsg),
  numAccounts: 50,
  },
  "cw20 transfer - memdb": {
- db: buildMemDB,
- blockSize: 20,
- txBuilder: buildTxFromMsg(cw20TransferMsg),
+ db:  buildMemDB,
+ blockSize:  20,
+ txBuilder:  buildTxFromMsg(cw20TransferMsg),
  numAccounts: 50,
  },
  "basic send - leveldb": {
- db: buildLevelDB,
- blockSize: 20,
- txBuilder: buildTxFromMsg(bankSendMsg),
+ db:  buildLevelDB,
+ blockSize:  20,
+ txBuilder:  buildTxFromMsg(bankSendMsg),
  numAccounts: 50,
  },
  "cw20 transfer - leveldb": {
- db: buildLevelDB,
- blockSize: 20,
- txBuilder: buildTxFromMsg(cw20TransferMsg),
+ db:  buildLevelDB,
+ blockSize:  20,
+ txBuilder:  buildTxFromMsg(cw20TransferMsg),
  numAccounts: 50,
  },
  "basic send - leveldb - 8k accounts": {

cmd/wasmd/genwasm.go

@@ -1,9 +1,10 @@
 package main
 
 import (
- wasmcli "github.com/CosmWasm/wasmd/x/wasm/client/cli"
  "github.com/cosmos/cosmos-sdk/client"
  "github.com/spf13/cobra"
+
+ wasmcli "github.com/CosmWasm/wasmd/x/wasm/client/cli"
 )
 
 func AddGenesisWasmMsgCmd(defaultNodeHome string) *cobra.Command {

cmd/wasmd/main.go

@@ -3,8 +3,9 @@ package main
 import (
  "os"
 
- "github.com/CosmWasm/wasmd/app"
  "github.com/cosmos/cosmos-sdk/server"
+
+ "github.com/CosmWasm/wasmd/app"
 )
 
 func main() {

cmd/wasmd/root.go

@@ -6,11 +6,10 @@ import (
  "os"
  "path/filepath"
 
- wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
  "github.com/prometheus/client_golang/prometheus"
 
- "github.com/CosmWasm/wasmd/x/wasm"
- clientcodec "github.com/CosmWasm/wasmd/x/wasm/client/codec"
+ wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
+
  authcmd "github.com/cosmos/cosmos-sdk/x/auth/client/cli"
  vestingcli "github.com/cosmos/cosmos-sdk/x/auth/vesting/client/cli"
  bankcmd "github.com/cosmos/cosmos-sdk/x/bank/client/cli"
@@ -20,7 +19,9 @@ import (
  "github.com/tendermint/tendermint/libs/log"
  dbm "github.com/tendermint/tm-db"
 
- "github.com/CosmWasm/wasmd/app"
+ "github.com/CosmWasm/wasmd/x/wasm"
+ clientcodec "github.com/CosmWasm/wasmd/x/wasm/client/codec"
+
  "github.com/cosmos/cosmos-sdk/baseapp"
  "github.com/cosmos/cosmos-sdk/client"
  "github.com/cosmos/cosmos-sdk/client/debug"
@@ -38,6 +39,8 @@ import (
  banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
  "github.com/cosmos/cosmos-sdk/x/crisis"
  genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli"
+
+ "github.com/CosmWasm/wasmd/app"
 )
 
 // NewRootCmd creates a new root command for wasmd. It is called once in the

x/wasm/client/cli/genesis_msg.go

@@ -8,9 +8,9 @@ import (
  "encoding/json"
  "errors"
  "fmt"
+
  "github.com/CosmWasm/wasmd/x/wasm/keeper"
 
- "github.com/CosmWasm/wasmd/x/wasm/types"
  "github.com/cosmos/cosmos-sdk/client"
  "github.com/cosmos/cosmos-sdk/client/flags"
  "github.com/cosmos/cosmos-sdk/crypto/keyring"
@@ -23,6 +23,8 @@ import (
  "github.com/spf13/cobra"
  "github.com/tendermint/tendermint/crypto"
  tmtypes "github.com/tendermint/tendermint/types"
+
+ "github.com/CosmWasm/wasmd/x/wasm/types"
 )
 
 // GenesisReader reads genesis data. Extension point for custom genesis state readers.

x/wasm/client/cli/genesis_msg_test.go

@@ -8,8 +8,6 @@ import (
  "path"
  "testing"
 
- "github.com/CosmWasm/wasmd/x/wasm/keeper"
- "github.com/CosmWasm/wasmd/x/wasm/types"
  "github.com/cosmos/cosmos-sdk/client"
  "github.com/cosmos/cosmos-sdk/client/flags"
  "github.com/cosmos/cosmos-sdk/crypto/hd"
@@ -28,6 +26,9 @@ import (
  "github.com/stretchr/testify/require"
  "github.com/tendermint/tendermint/libs/log"
  tmtypes "github.com/tendermint/tendermint/types"
+
+ "github.com/CosmWasm/wasmd/x/wasm/keeper"
+ "github.com/CosmWasm/wasmd/x/wasm/types"
 )
 
 var wasmIdent = []byte("\x00\x61\x73\x6D")

x/wasm/client/cli/gov_tx.go

@@ -3,14 +3,15 @@ package cli
 import (
  "fmt"
 
- "github.com/CosmWasm/wasmd/x/wasm/types"
  "github.com/cosmos/cosmos-sdk/client"
  "github.com/cosmos/cosmos-sdk/client/tx"
  sdk "github.com/cosmos/cosmos-sdk/types"
  "github.com/cosmos/cosmos-sdk/x/gov/client/cli"
  govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
  "github.com/pkg/errors"
  "github.com/spf13/cobra"
+
+ "github.com/CosmWasm/wasmd/x/wasm/types"
 )
 
 func ProposalStoreCodeCmd() *cobra.Command {

x/wasm/client/cli/new_tx.go

@@ -3,12 +3,13 @@ package cli
 import (
  "strconv"
 
- "github.com/CosmWasm/wasmd/x/wasm/types"
  "github.com/cosmos/cosmos-sdk/client"
  "github.com/cosmos/cosmos-sdk/client/flags"
  "github.com/cosmos/cosmos-sdk/client/tx"
  sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
  "github.com/spf13/cobra"
+
+ "github.com/CosmWasm/wasmd/x/wasm/types"
 )
 
 // MigrateContractCmd will migrate a contract to a new code version

x/wasm/client/cli/query.go

@@ -10,12 +10,13 @@ import (
  "io/ioutil"
  "strconv"
 
- "github.com/CosmWasm/wasmd/x/wasm/types"
  "github.com/cosmos/cosmos-sdk/client"
  "github.com/cosmos/cosmos-sdk/client/flags"
  sdk "github.com/cosmos/cosmos-sdk/types"
  "github.com/spf13/cobra"
  flag "github.com/spf13/pflag"
+
+ "github.com/CosmWasm/wasmd/x/wasm/types"
 )
 
 func GetQueryCmd() *cobra.Command {

x/wasm/client/cli/tx.go

@@ -6,15 +6,16 @@ import (
  "io/ioutil"
  "strconv"
 
- wasmUtils "github.com/CosmWasm/wasmd/x/wasm/client/utils"
- "github.com/CosmWasm/wasmd/x/wasm/types"
  "github.com/cosmos/cosmos-sdk/client"
  "github.com/cosmos/cosmos-sdk/client/flags"
  "github.com/cosmos/cosmos-sdk/client/tx"
  sdk "github.com/cosmos/cosmos-sdk/types"
  sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
  "github.com/spf13/cobra"
  flag "github.com/spf13/pflag"
+
+ wasmUtils "github.com/CosmWasm/wasmd/x/wasm/client/utils"
+ "github.com/CosmWasm/wasmd/x/wasm/types"
 )
 
 const (

x/wasm/client/codec/marshaller.go

@@ -3,6 +3,7 @@ package codec
 import (
  "bytes"
  "fmt"
+
  "github.com/cosmos/cosmos-sdk/codec"
  "github.com/cosmos/cosmos-sdk/codec/types"
  "github.com/gogo/protobuf/jsonpb"

x/wasm/client/proposal_handler.go

@@ -1,9 +1,10 @@
 package client
 
 import (
+ govclient "github.com/cosmos/cosmos-sdk/x/gov/client"
+
  "github.com/CosmWasm/wasmd/x/wasm/client/cli"
  "github.com/CosmWasm/wasmd/x/wasm/client/rest"
- govclient "github.com/cosmos/cosmos-sdk/x/gov/client"
 )
 
 // ProposalHandlers define the wasm cli proposal types and rest handler.

x/wasm/client/proposal_handler_test.go

@@ -9,12 +9,13 @@ import (
  "os"
  "testing"
 
- "github.com/CosmWasm/wasmd/x/wasm/keeper"
  "github.com/cosmos/cosmos-sdk/client"
  "github.com/cosmos/cosmos-sdk/client/flags"
  authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
  "github.com/gorilla/mux"
  "github.com/stretchr/testify/require"
+
+ "github.com/CosmWasm/wasmd/x/wasm/keeper"
 )
 
 func TestGovRestHandlers(t *testing.T) {

x/wasm/client/rest/gov.go

@@ -4,13 +4,14 @@ import (
  "encoding/json"
  "net/http"
 
- "github.com/CosmWasm/wasmd/x/wasm/types"
  "github.com/cosmos/cosmos-sdk/client"
  "github.com/cosmos/cosmos-sdk/client/tx"
  sdk "github.com/cosmos/cosmos-sdk/types"
  "github.com/cosmos/cosmos-sdk/types/rest"
  govrest "github.com/cosmos/cosmos-sdk/x/gov/client/rest"
  govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
+
+ "github.com/CosmWasm/wasmd/x/wasm/types"
 )
 
 type StoreCodeProposalJsonReq struct {

x/wasm/client/rest/new_tx.go

@@ -3,11 +3,12 @@ package rest
 import (
  "net/http"
 
- "github.com/CosmWasm/wasmd/x/wasm/types"
  "github.com/cosmos/cosmos-sdk/client"
  "github.com/cosmos/cosmos-sdk/client/tx"
  "github.com/cosmos/cosmos-sdk/types/rest"
  "github.com/gorilla/mux"
+
+ "github.com/CosmWasm/wasmd/x/wasm/types"
 )
 
 func registerNewTxRoutes(cliCtx client.Context, r *mux.Router) {