Skip to content

Commit

Permalink
lint
Browse files Browse the repository at this point in the history
  • Loading branch information
sainoe committed Nov 15, 2023
1 parent f196cc9 commit 642ca29
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 10 deletions.
7 changes: 3 additions & 4 deletions x/ccv/provider/keeper/hooks.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (
v1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"

"github.com/cosmos/interchain-security/v3/x/ccv/provider/types"
providertypes "github.com/cosmos/interchain-security/v3/x/ccv/provider/types"
ccvtypes "github.com/cosmos/interchain-security/v3/x/ccv/types"
)
Expand Down Expand Up @@ -229,7 +228,7 @@ func (h Hooks) AfterProposalFailedMinDeposit(ctx sdk.Context, proposalID uint64)
func (h Hooks) GetConsumerAdditionLegacyPropFromProp(
ctx sdk.Context,
proposalID uint64,
) (types.ConsumerAdditionProposal, bool) {
) (providertypes.ConsumerAdditionProposal, bool) {
p, ok := h.k.govKeeper.GetProposal(ctx, proposalID)
if !ok {
panic(fmt.Errorf("failed to get proposal %d from store", proposalID))
Expand All @@ -249,10 +248,10 @@ func (h Hooks) GetConsumerAdditionLegacyPropFromProp(
}

// returns if legacy prop is of ConsumerAddition proposal type
prop, ok := content.(*types.ConsumerAdditionProposal)
prop, ok := content.(*providertypes.ConsumerAdditionProposal)
if ok {
return *prop, true
}
}
return types.ConsumerAdditionProposal{}, false
return providertypes.ConsumerAdditionProposal{}, false
}
9 changes: 4 additions & 5 deletions x/ccv/provider/keeper/hooks_test.go
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
package keeper_test

import (
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"

"testing"
"time"

"cosmossdk.io/math"
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"

"github.com/golang/mock/gomock"
"github.com/stretchr/testify/require"

"cosmossdk.io/math"

sdk "github.com/cosmos/cosmos-sdk/types"
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
v1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
"github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"

Expand Down
2 changes: 1 addition & 1 deletion x/ccv/types/expected_keepers.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ import (
auth "github.com/cosmos/cosmos-sdk/x/auth/types"
capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types"
evidencetypes "github.com/cosmos/cosmos-sdk/x/evidence/types"
v1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"

abci "github.com/cometbft/cometbft/abci/types"
v1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
)

// StakingKeeper defines the contract expected by provider-chain ccv module from a Staking Module that will keep track
Expand Down

0 comments on commit 642ca29

Please sign in to comment.