Update alias.go, format, clean imports

app/integration/common_test.go

@@ -9,11 +9,11 @@ import (
 	"os"
 	"testing"
 
+	wasmd "github.com/CosmWasm/wasmd/app"
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/auth"
 	authexported "github.com/cosmos/cosmos-sdk/x/auth/exported"
-	wasmd "github.com/CosmWasm/wasmd/app"
 	"github.com/stretchr/testify/require"
 
 	abci "github.com/tendermint/tendermint/abci/types"

cli_test/cli_test.go

@@ -18,14 +18,13 @@ import (
 	tmtypes "github.com/tendermint/tendermint/types"
 
 	"github.com/cosmos/cosmos-sdk/client/flags"
-
-	"github.com/cosmwasm/wasmd/app"
-
 	"github.com/cosmos/cosmos-sdk/tests"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/auth"
 	"github.com/cosmos/cosmos-sdk/x/gov"
 	"github.com/cosmos/cosmos-sdk/x/mint"
+
+	"github.com/CosmWasm/wasmd/app"
 )
 
 func TestGaiaCLIKeysAddMultisig(t *testing.T) {

x/wasm/alias.go

@@ -1,8 +1,8 @@
 // nolint
 // autogenerated code using github.com/rigelrozanski/multitool
 // aliases generated for the following subdirectories:
-// ALIASGEN: github.com/CosmWasm/wasmd/x/wasm/internal/types
+// ALIASGEN: github.com/cosmwasm/wasmd/x/wasm/internal/types
-// ALIASGEN: github.com/CosmWasm/wasmd/x/wasm/internal/keeper
+// ALIASGEN: github.com/cosmwasm/wasmd/x/wasm/internal/keeper
 package wasm
 
 import (
@@ -17,13 +17,18 @@ const (
 	QuerierRoute                  = types.QuerierRoute
 	RouterKey                     = types.RouterKey
 	MaxWasmSize                   = types.MaxWasmSize
+	MaxLabelSize                  = types.MaxLabelSize
+	BuildTagRegexp                = types.BuildTagRegexp
+	MaxBuildTagSize               = types.MaxBuildTagSize
+	CustomEventType               = types.CustomEventType
+	AttributeKeyContractAddr      = types.AttributeKeyContractAddr
 	GasMultiplier                 = keeper.GasMultiplier
 	MaxGas                        = keeper.MaxGas
+	QueryListContractByCode       = keeper.QueryListContractByCode
 	QueryGetContract              = keeper.QueryGetContract
 	QueryGetContractState         = keeper.QueryGetContractState
 	QueryGetCode                  = keeper.QueryGetCode
 	QueryListCode                 = keeper.QueryListCode
-	QueryListContractByCode       = keeper.QueryListContractByCode
 	QueryMethodContractStateSmart = keeper.QueryMethodContractStateSmart
 	QueryMethodContractStateAll   = keeper.QueryMethodContractStateAll
 	QueryMethodContractStateRaw   = keeper.QueryMethodContractStateRaw
@@ -37,17 +42,30 @@ var (
 	GetContractAddressKey     = types.GetContractAddressKey
 	GetContractStorePrefixKey = types.GetContractStorePrefixKey
 	NewCodeInfo               = types.NewCodeInfo
-	NewParams                 = types.NewEnv
+	NewCreatedAt              = types.NewCreatedAt
-	NewWasmCoins              = types.NewWasmCoins
 	NewContractInfo           = types.NewContractInfo
+	NewEnv                    = types.NewEnv
+	NewWasmCoins              = types.NewWasmCoins
 	CosmosResult              = types.CosmosResult
 	DefaultWasmConfig         = types.DefaultWasmConfig
 	InitGenesis               = keeper.InitGenesis
 	ExportGenesis             = keeper.ExportGenesis
+	NewMessageHandler         = keeper.NewMessageHandler
+	DefaultEncoders           = keeper.DefaultEncoders
+	EncodeBankMsg             = keeper.EncodeBankMsg
+	NoCustomMsg               = keeper.NoCustomMsg
+	EncodeStakingMsg          = keeper.EncodeStakingMsg
+	EncodeWasmMsg             = keeper.EncodeWasmMsg
 	NewKeeper                 = keeper.NewKeeper
 	NewQuerier                = keeper.NewQuerier
+	DefaultQueryPlugins       = keeper.DefaultQueryPlugins
+	BankQuerier               = keeper.BankQuerier
+	NoCustomQuerier           = keeper.NoCustomQuerier
+	StakingQuerier            = keeper.StakingQuerier
+	WasmQuerier               = keeper.WasmQuerier
 	MakeTestCodec             = keeper.MakeTestCodec
 	CreateTestInput           = keeper.CreateTestInput
+	TestHandler               = keeper.TestHandler
 
 	// variable aliases
 	ModuleCdc            = types.ModuleCdc
@@ -60,6 +78,7 @@ var (
 	ErrInvalidGenesis    = types.ErrInvalidGenesis
 	ErrNotFound          = types.ErrNotFound
 	ErrQueryFailed       = types.ErrQueryFailed
+	ErrInvalidMsg        = types.ErrInvalidMsg
 	KeyLastCodeID        = types.KeyLastCodeID
 	KeyLastInstanceID    = types.KeyLastInstanceID
 	CodeKeyPrefix        = types.CodeKeyPrefix
@@ -77,9 +96,19 @@ type (
 	Model                   = types.Model
 	CodeInfo                = types.CodeInfo
 	ContractInfo            = types.ContractInfo
+	CreatedAt               = types.CreatedAt
 	WasmConfig              = types.WasmConfig
+	MessageHandler          = keeper.MessageHandler
+	BankEncoder             = keeper.BankEncoder
+	CustomEncoder           = keeper.CustomEncoder
+	StakingEncoder          = keeper.StakingEncoder
+	WasmEncoder             = keeper.WasmEncoder
+	MessageEncoders         = keeper.MessageEncoders
 	Keeper                  = keeper.Keeper
 	ContractInfoWithAddress = keeper.ContractInfoWithAddress
 	GetCodeResponse         = keeper.GetCodeResponse
 	ListCodeResponse        = keeper.ListCodeResponse
+	QueryHandler            = keeper.QueryHandler
+	CustomQuerier           = keeper.CustomQuerier
+	QueryPlugins            = keeper.QueryPlugins
 )

x/wasm/client/rest/query.go

@@ -8,10 +8,10 @@ import (
 	"net/http"
 	"strconv"
 
-	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/types/rest"
 	"github.com/CosmWasm/wasmd/x/wasm/internal/keeper"
 	"github.com/CosmWasm/wasmd/x/wasm/internal/types"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/rest"
 
 	"github.com/cosmos/cosmos-sdk/client/context"
 	"github.com/gorilla/mux"

x/wasm/internal/keeper/genesis.go

@@ -3,8 +3,8 @@ package keeper
 import (
 	"bytes"
 
-	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/CosmWasm/wasmd/x/wasm/internal/types"
+	sdk "github.com/cosmos/cosmos-sdk/types"
 	// authexported "github.com/cosmos/cosmos-sdk/x/auth/exported"
 	// "github.com/CosmWasm/wasmd/x/wasm/internal/types"
 )

x/wasm/internal/keeper/handler_plugin.go

@@ -5,12 +5,12 @@ import (
 	"fmt"
 
 	wasmTypes "github.com/CosmWasm/go-cosmwasm/types"
+	"github.com/CosmWasm/wasmd/x/wasm/internal/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	"github.com/cosmos/cosmos-sdk/x/bank"
 	"github.com/cosmos/cosmos-sdk/x/distribution"
 	"github.com/cosmos/cosmos-sdk/x/staking"
-	"github.com/CosmWasm/wasmd/x/wasm/internal/types"
 )
 
 type MessageHandler struct {

x/wasm/internal/keeper/handler_plugin_test.go

@@ -3,9 +3,9 @@ package keeper
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/CosmWasm/wasmd/x/wasm/internal/types"
 	"github.com/cosmos/cosmos-sdk/x/distribution"
 	"github.com/cosmos/cosmos-sdk/x/staking"
-	"github.com/CosmWasm/wasmd/x/wasm/internal/types"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"testing"

x/wasm/internal/keeper/keeper_test.go

@@ -8,10 +8,10 @@ import (
 	"testing"
 	"time"
 
+	"github.com/CosmWasm/wasmd/x/wasm/internal/types"
 	stypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/auth"
-	"github.com/CosmWasm/wasmd/x/wasm/internal/types"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	abci "github.com/tendermint/tendermint/abci/types"

x/wasm/internal/keeper/mask_test.go

@@ -2,8 +2,8 @@ package keeper
 
 import (
 	"encoding/json"
-	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	"github.com/CosmWasm/wasmd/x/wasm/internal/types"
+	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	"io/ioutil"
 	"os"
 	"strings"

x/wasm/internal/keeper/querier.go

@@ -5,9 +5,9 @@ import (
 	"sort"
 	"strconv"
 
+	"github.com/CosmWasm/wasmd/x/wasm/internal/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
-	"github.com/CosmWasm/wasmd/x/wasm/internal/types"
 
 	abci "github.com/tendermint/tendermint/abci/types"
 	tmbytes "github.com/tendermint/tendermint/libs/bytes"

x/wasm/internal/keeper/querier_test.go

@@ -7,9 +7,9 @@ import (
 	"os"
 	"testing"
 
+	"github.com/CosmWasm/wasmd/x/wasm/internal/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkErrors "github.com/cosmos/cosmos-sdk/types/errors"
-	"github.com/CosmWasm/wasmd/x/wasm/internal/types"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	abci "github.com/tendermint/tendermint/abci/types"

x/wasm/module.go

@@ -8,12 +8,12 @@ import (
 
 	abci "github.com/tendermint/tendermint/abci/types"
 
+	"github.com/CosmWasm/wasmd/x/wasm/client/cli"
+	"github.com/CosmWasm/wasmd/x/wasm/client/rest"
 	"github.com/cosmos/cosmos-sdk/client/context"
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
-	"github.com/CosmWasm/wasmd/x/wasm/client/cli"
-	"github.com/CosmWasm/wasmd/x/wasm/client/rest"
 )
 
 var (