fix linting

cosmos · Jun 14, 2024 · 8ebdc82 · 8ebdc82
1 parent 99bc320
commit 8ebdc82
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 18 deletions.
diff --git a/server/v2/cometbft/go.mod b/server/v2/cometbft/go.mod
@@ -10,6 +10,7 @@ replace (
 	cosmossdk.io/server/v2 => ../
 	cosmossdk.io/server/v2/appmanager => ../appmanager
 	cosmossdk.io/store/v2 => ../../../store/v2
+	cosmossdk.io/store => ../../../store
 	cosmossdk.io/x/accounts => ../../../x/accounts
 	cosmossdk.io/x/auth => ../../../x/auth
 	cosmossdk.io/x/bank => ../../../x/bank

diff --git a/server/v2/streaming/context.go b/server/v2/streaming/context.go
@@ -1,6 +1,6 @@
 package streaming
 
-import "cosmossdk.io/log"
+import "cosmossdk.io/core/log"
 
 // Context is an interface used by an App to pass context information
 // needed to process store streaming requests.

diff --git a/server/v2/streaming/streaming_test.go b/server/v2/streaming/streaming_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	"cosmossdk.io/log"
+	"cosmossdk.io/core/log"
 )
 
 type PluginTestSuite struct {

diff --git a/simapp/mint_fn.go b/simapp/mint_fn.go
@@ -17,7 +17,7 @@ import (
 
 type MintBankKeeper interface {
 	MintCoins(ctx context.Context, moduleName string, coins sdk.Coins) error
-	SendCoinsFromModuleToModule(ctx context.Context, senderModule string, recipientModule string, amt sdk.Coins) error
+	SendCoinsFromModuleToModule(ctx context.Context, senderModule, recipientModule string, amt sdk.Coins) error
 }
 
 // ProvideExampleMintFn returns the function used in x/mint's endblocker to mint new tokens.

diff --git a/simapp/v2/app_di.go b/simapp/v2/app_di.go
@@ -244,5 +244,5 @@ func (app *SimApp) TxConfig() client.TxConfig {
 }
 
 func (app *SimApp) GetConsensusAuthority() string {
-	return string(app.ConsensusParamsKeeper.GetAuthority())
+	return app.ConsensusParamsKeeper.GetAuthority()
 }
diff --git a/x/auth/ante/expected_keepers.go b/x/auth/ante/expected_keepers.go
@@ -30,4 +30,5 @@ type FeegrantKeeper interface {
 
 type ConsensusKeeper interface {
 	Params(context.Context, *consensustypes.QueryParamsRequest) (*consensustypes.QueryParamsResponse, error)
+	GetCometInfo(ctx context.Context, _ *consensustypes.QueryGetCometInfoRequest) (*consensustypes.QueryGetCometInfoResponse, error)
 }
diff --git a/x/auth/ante/testutil/expected_keepers_mocks.go b/x/auth/ante/testutil/expected_keepers_mocks.go
diff --git a/x/auth/tx/gogotx.go b/x/auth/tx/gogotx.go
@@ -280,20 +280,6 @@ func intoAnyV1(v2s []*anypb.Any) []*codectypes.Any {
 	return v1s
 }
 
-// decodeMsgsV1 will decode the given messages into
-func decodeMsgsV1(cdc codec.BinaryCodec, anyPBs []*anypb.Any) ([]proto.Message, error) {
-	v1s := make([]proto.Message, len(anyPBs))
-
-	for i, anyPB := range anyPBs {
-		v1, err := decodeFromAny(cdc, anyPB)
-		if err != nil {
-			return nil, err
-		}
-		v1s[i] = v1
-	}
-	return v1s, nil
-}
-
 func decodeFromAny(cdc codec.BinaryCodec, anyPB *anypb.Any) (proto.Message, error) {
 	messageName := anyPB.TypeUrl
 	if i := strings.LastIndexByte(anyPB.TypeUrl, '/'); i >= 0 {

diff --git a/x/staking/testutil/expected_keepers_mocks.go b/x/staking/testutil/expected_keepers_mocks.go
diff --git a/x/staking/types/expected_keepers.go b/x/staking/types/expected_keepers.go
@@ -118,4 +118,5 @@ func (StakingHooksWrapper) IsOnePerModuleType() {}
 
 type ConsensusKeeper interface {
 	Params(context.Context, *consensustypes.QueryParamsRequest) (*consensustypes.QueryParamsResponse, error)
+	GetCometInfo(ctx context.Context, _ *consensustypes.QueryGetCometInfoRequest) (*consensustypes.QueryGetCometInfoResponse, error)
 }