From 95bd9e8efad2992589f772b4842543fe6f36d031 Mon Sep 17 00:00:00 2001 From: Ethan Frey Date: Wed, 13 May 2020 22:55:07 +0200 Subject: [PATCH] Update alias.go, format, clean imports --- app/integration/common_test.go | 2 +- cli_test/cli_test.go | 5 +-- x/wasm/alias.go | 39 ++++++++++++++++--- x/wasm/client/rest/query.go | 4 +- x/wasm/internal/keeper/genesis.go | 2 +- x/wasm/internal/keeper/handler_plugin.go | 2 +- x/wasm/internal/keeper/handler_plugin_test.go | 2 +- x/wasm/internal/keeper/keeper_test.go | 2 +- x/wasm/internal/keeper/mask_test.go | 2 +- x/wasm/internal/keeper/querier.go | 2 +- x/wasm/internal/keeper/querier_test.go | 2 +- x/wasm/module.go | 4 +- 12 files changed, 48 insertions(+), 20 deletions(-) diff --git a/app/integration/common_test.go b/app/integration/common_test.go index 915bfb89..edbf3897 100644 --- a/app/integration/common_test.go +++ b/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" diff --git a/cli_test/cli_test.go b/cli_test/cli_test.go index 0fdb46b5..12412107 100644 --- a/cli_test/cli_test.go +++ b/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) { diff --git a/x/wasm/alias.go b/x/wasm/alias.go index b0bdbbfe..b9bbbaa0 100644 --- a/x/wasm/alias.go +++ b/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/keeper +// ALIASGEN: github.com/cosmwasm/wasmd/x/wasm/internal/types +// 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 - NewWasmCoins = types.NewWasmCoins + NewCreatedAt = types.NewCreatedAt 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 ) diff --git a/x/wasm/client/rest/query.go b/x/wasm/client/rest/query.go index e33cf57e..85a9d799 100644 --- a/x/wasm/client/rest/query.go +++ b/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" diff --git a/x/wasm/internal/keeper/genesis.go b/x/wasm/internal/keeper/genesis.go index e7c3a9f6..4bd9c214 100644 --- a/x/wasm/internal/keeper/genesis.go +++ b/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" ) diff --git a/x/wasm/internal/keeper/handler_plugin.go b/x/wasm/internal/keeper/handler_plugin.go index 9c88a6fa..69541906 100644 --- a/x/wasm/internal/keeper/handler_plugin.go +++ b/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 { diff --git a/x/wasm/internal/keeper/handler_plugin_test.go b/x/wasm/internal/keeper/handler_plugin_test.go index ecd8e5ed..a016d353 100644 --- a/x/wasm/internal/keeper/handler_plugin_test.go +++ b/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" diff --git a/x/wasm/internal/keeper/keeper_test.go b/x/wasm/internal/keeper/keeper_test.go index 7bf086a5..e6ced43c 100644 --- a/x/wasm/internal/keeper/keeper_test.go +++ b/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" diff --git a/x/wasm/internal/keeper/mask_test.go b/x/wasm/internal/keeper/mask_test.go index 65579c94..43db1476 100644 --- a/x/wasm/internal/keeper/mask_test.go +++ b/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" diff --git a/x/wasm/internal/keeper/querier.go b/x/wasm/internal/keeper/querier.go index 3506386d..788a10a2 100644 --- a/x/wasm/internal/keeper/querier.go +++ b/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" diff --git a/x/wasm/internal/keeper/querier_test.go b/x/wasm/internal/keeper/querier_test.go index 2b34c767..e99ff0b9 100644 --- a/x/wasm/internal/keeper/querier_test.go +++ b/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" diff --git a/x/wasm/module.go b/x/wasm/module.go index dbf29657..e0215165 100644 --- a/x/wasm/module.go +++ b/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 (