From 24dc4fd0b0196f400b2d7d759240a565d5bd798c Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Sat, 13 Jan 2024 21:30:31 +0100 Subject: [PATCH] `make lint-fix` --- simapp/app_config.go | 3 ++- x/auth/depinject.go | 1 + x/circuit/depinject.go | 1 + x/consensus/depinject.go | 1 + x/counter/depinject.go | 1 + x/crisis/depinject.go | 4 +++- x/distribution/depinject.go | 1 + x/evidence/depinject.go | 1 + x/feegrant/module/depinject.go | 1 + x/genutil/depinject.go | 1 + x/gov/depinject.go | 6 ++++-- x/group/module/depinject.go | 1 + x/mint/depinject.go | 1 + x/nft/module/depinject.go | 1 + x/params/depinject.go | 1 + x/protocolpool/depinject.go | 1 + x/slashing/depinject.go | 1 + x/staking/depinject.go | 4 +++- x/upgrade/depinject.go | 4 +++- 19 files changed, 29 insertions(+), 6 deletions(-) diff --git a/simapp/app_config.go b/simapp/app_config.go index 79f73dcf1e73..d0ac7d7fbc16 100644 --- a/simapp/app_config.go +++ b/simapp/app_config.go @@ -248,5 +248,6 @@ var ( Name: pooltypes.ModuleName, Config: appconfig.WrapAny(&poolmodulev1.Module{}), }, - }}) + }, + }) ) diff --git a/x/auth/depinject.go b/x/auth/depinject.go index 0f1837281888..dcd624f99d10 100644 --- a/x/auth/depinject.go +++ b/x/auth/depinject.go @@ -10,6 +10,7 @@ import ( "cosmossdk.io/x/auth/keeper" "cosmossdk.io/x/auth/simulation" "cosmossdk.io/x/auth/types" + "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/circuit/depinject.go b/x/circuit/depinject.go index 6bb20c27457b..fdca2207413c 100644 --- a/x/circuit/depinject.go +++ b/x/circuit/depinject.go @@ -9,6 +9,7 @@ import ( "cosmossdk.io/depinject/appconfig" authtypes "cosmossdk.io/x/auth/types" "cosmossdk.io/x/circuit/keeper" + "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/runtime" diff --git a/x/consensus/depinject.go b/x/consensus/depinject.go index f53ce425fdce..9f613acf3649 100644 --- a/x/consensus/depinject.go +++ b/x/consensus/depinject.go @@ -8,6 +8,7 @@ import ( "cosmossdk.io/depinject" "cosmossdk.io/depinject/appconfig" authtypes "cosmossdk.io/x/auth/types" + "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/runtime" diff --git a/x/counter/depinject.go b/x/counter/depinject.go index 51d6ecff17dc..a1297170602b 100644 --- a/x/counter/depinject.go +++ b/x/counter/depinject.go @@ -7,6 +7,7 @@ import ( storetypes "cosmossdk.io/core/store" "cosmossdk.io/depinject" "cosmossdk.io/depinject/appconfig" + "github.com/cosmos/cosmos-sdk/x/counter/keeper" ) diff --git a/x/crisis/depinject.go b/x/crisis/depinject.go index e81a89418807..4bbbd3417daa 100644 --- a/x/crisis/depinject.go +++ b/x/crisis/depinject.go @@ -1,6 +1,8 @@ package crisis import ( + "github.com/spf13/cast" + modulev1 "cosmossdk.io/api/cosmos/crisis/module/v1" "cosmossdk.io/core/address" "cosmossdk.io/core/appmodule" @@ -8,12 +10,12 @@ import ( "cosmossdk.io/depinject" "cosmossdk.io/depinject/appconfig" authtypes "cosmossdk.io/x/auth/types" + "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/server" servertypes "github.com/cosmos/cosmos-sdk/server/types" "github.com/cosmos/cosmos-sdk/x/crisis/keeper" "github.com/cosmos/cosmos-sdk/x/crisis/types" - "github.com/spf13/cast" ) var _ depinject.OnePerModuleType = AppModule{} diff --git a/x/distribution/depinject.go b/x/distribution/depinject.go index 07383b2cb59a..78b0fea3a2e4 100644 --- a/x/distribution/depinject.go +++ b/x/distribution/depinject.go @@ -10,6 +10,7 @@ import ( "cosmossdk.io/x/distribution/keeper" "cosmossdk.io/x/distribution/types" staking "cosmossdk.io/x/staking/types" + "github.com/cosmos/cosmos-sdk/codec" ) diff --git a/x/evidence/depinject.go b/x/evidence/depinject.go index e1de03c10924..2fba5fa7a13f 100644 --- a/x/evidence/depinject.go +++ b/x/evidence/depinject.go @@ -9,6 +9,7 @@ import ( "cosmossdk.io/depinject/appconfig" "cosmossdk.io/x/evidence/keeper" "cosmossdk.io/x/evidence/types" + "github.com/cosmos/cosmos-sdk/codec" ) diff --git a/x/feegrant/module/depinject.go b/x/feegrant/module/depinject.go index f611ef8d3805..af86f6d7e491 100644 --- a/x/feegrant/module/depinject.go +++ b/x/feegrant/module/depinject.go @@ -9,6 +9,7 @@ import ( "cosmossdk.io/x/feegrant" "cosmossdk.io/x/feegrant/keeper" "cosmossdk.io/x/feegrant/simulation" + "github.com/cosmos/cosmos-sdk/codec" cdctypes "github.com/cosmos/cosmos-sdk/codec/types" "github.com/cosmos/cosmos-sdk/types/module" diff --git a/x/genutil/depinject.go b/x/genutil/depinject.go index 4cbe7f64c7fe..77320ca6b0c4 100644 --- a/x/genutil/depinject.go +++ b/x/genutil/depinject.go @@ -6,6 +6,7 @@ import ( "cosmossdk.io/core/genesis" "cosmossdk.io/depinject" "cosmossdk.io/depinject/appconfig" + "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/x/genutil/types" ) diff --git a/x/gov/depinject.go b/x/gov/depinject.go index 3fb8bd4883c1..40f2c9f30be5 100644 --- a/x/gov/depinject.go +++ b/x/gov/depinject.go @@ -5,6 +5,9 @@ import ( "sort" "strings" + "golang.org/x/exp/maps" + "golang.org/x/exp/slices" + modulev1 "cosmossdk.io/api/cosmos/gov/module/v1" "cosmossdk.io/core/appmodule" store "cosmossdk.io/core/store" @@ -14,10 +17,9 @@ import ( "cosmossdk.io/x/gov/keeper" govtypes "cosmossdk.io/x/gov/types" "cosmossdk.io/x/gov/types/v1beta1" + "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/codec" - "golang.org/x/exp/maps" - "golang.org/x/exp/slices" ) var _ depinject.OnePerModuleType = AppModule{} diff --git a/x/group/module/depinject.go b/x/group/module/depinject.go index 46fa776029cc..f006df24f345 100644 --- a/x/group/module/depinject.go +++ b/x/group/module/depinject.go @@ -8,6 +8,7 @@ import ( store "cosmossdk.io/store/types" "cosmossdk.io/x/group" "cosmossdk.io/x/group/keeper" + "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/codec" cdctypes "github.com/cosmos/cosmos-sdk/codec/types" diff --git a/x/mint/depinject.go b/x/mint/depinject.go index 178003079158..d2c5112a4242 100644 --- a/x/mint/depinject.go +++ b/x/mint/depinject.go @@ -9,6 +9,7 @@ import ( authtypes "cosmossdk.io/x/auth/types" "cosmossdk.io/x/mint/keeper" "cosmossdk.io/x/mint/types" + "github.com/cosmos/cosmos-sdk/codec" ) diff --git a/x/nft/module/depinject.go b/x/nft/module/depinject.go index c9cc4bc58950..468a64beb726 100644 --- a/x/nft/module/depinject.go +++ b/x/nft/module/depinject.go @@ -8,6 +8,7 @@ import ( "cosmossdk.io/depinject/appconfig" "cosmossdk.io/x/nft" "cosmossdk.io/x/nft/keeper" + "github.com/cosmos/cosmos-sdk/codec" cdctypes "github.com/cosmos/cosmos-sdk/codec/types" ) diff --git a/x/params/depinject.go b/x/params/depinject.go index 1f62038a3d22..ad94b5c1d410 100644 --- a/x/params/depinject.go +++ b/x/params/depinject.go @@ -10,6 +10,7 @@ import ( "cosmossdk.io/x/params/keeper" "cosmossdk.io/x/params/types" "cosmossdk.io/x/params/types/proposal" + "github.com/cosmos/cosmos-sdk/codec" ) diff --git a/x/protocolpool/depinject.go b/x/protocolpool/depinject.go index da182061ee90..a49ebc0f5952 100644 --- a/x/protocolpool/depinject.go +++ b/x/protocolpool/depinject.go @@ -10,6 +10,7 @@ import ( "cosmossdk.io/x/protocolpool/keeper" "cosmossdk.io/x/protocolpool/simulation" "cosmossdk.io/x/protocolpool/types" + "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" diff --git a/x/slashing/depinject.go b/x/slashing/depinject.go index ff8e35f56529..3da03a787b26 100644 --- a/x/slashing/depinject.go +++ b/x/slashing/depinject.go @@ -12,6 +12,7 @@ import ( "cosmossdk.io/x/slashing/keeper" "cosmossdk.io/x/slashing/types" staking "cosmossdk.io/x/staking/types" + "github.com/cosmos/cosmos-sdk/codec" cdctypes "github.com/cosmos/cosmos-sdk/codec/types" ) diff --git a/x/staking/depinject.go b/x/staking/depinject.go index 5e102208911e..cce30c34783f 100644 --- a/x/staking/depinject.go +++ b/x/staking/depinject.go @@ -4,6 +4,8 @@ import ( "fmt" "sort" + "golang.org/x/exp/maps" + modulev1 "cosmossdk.io/api/cosmos/staking/module/v1" "cosmossdk.io/core/appmodule" "cosmossdk.io/core/store" @@ -13,11 +15,11 @@ import ( "cosmossdk.io/x/staking/keeper" "cosmossdk.io/x/staking/simulation" "cosmossdk.io/x/staking/types" + "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/runtime" "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "golang.org/x/exp/maps" ) var _ depinject.OnePerModuleType = AppModule{} diff --git a/x/upgrade/depinject.go b/x/upgrade/depinject.go index 9a33a96a30d0..07ed051ceaaf 100644 --- a/x/upgrade/depinject.go +++ b/x/upgrade/depinject.go @@ -1,6 +1,8 @@ package upgrade import ( + "github.com/spf13/cast" + modulev1 "cosmossdk.io/api/cosmos/upgrade/module/v1" "cosmossdk.io/core/address" "cosmossdk.io/core/appmodule" @@ -10,13 +12,13 @@ import ( authtypes "cosmossdk.io/x/auth/types" "cosmossdk.io/x/upgrade/keeper" "cosmossdk.io/x/upgrade/types" + "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/server" servertypes "github.com/cosmos/cosmos-sdk/server/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/spf13/cast" ) var _ depinject.OnePerModuleType = AppModule{}