Skip to content

Commit

Permalink
fix lsnative imports (missed)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ajeet97
ajeet97 committed Apr 18, 2023
1 parent 9c4b142 commit 83a82c0
Show file tree
Hide file tree
Showing 9 changed files with 24 additions and 17 deletions.
3 changes: 2 additions & 1 deletion x/lsnative/distribution/keeper/migrations.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ package keeper

import (
sdk "github.com/cosmos/cosmos-sdk/types"
v043 "github.com/cosmos/cosmos-sdk/x/distribution/migrations/v043"

v043 "github.com/persistenceOne/persistence-sdk/v2/x/lsnative/distribution/migrations/v043"
)

// Migrator is a struct for handling in-place store migrations.
Expand Down
7 changes: 4 additions & 3 deletions x/lsnative/genutil/client/cli/migrate.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@ import (
"github.com/cosmos/cosmos-sdk/client/flags"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/version"
v043 "github.com/cosmos/cosmos-sdk/x/genutil/migrations/v043"
v046 "github.com/cosmos/cosmos-sdk/x/genutil/migrations/v046"
"github.com/cosmos/cosmos-sdk/x/genutil/types"

v043 "github.com/persistenceOne/persistence-sdk/v2/x/lsnative/genutil/migrations/v043"
v046 "github.com/persistenceOne/persistence-sdk/v2/x/lsnative/genutil/migrations/v046"
"github.com/persistenceOne/persistence-sdk/v2/x/lsnative/genutil/types"
)

const flagGenesisTime = "genesis-time"
Expand Down
3 changes: 2 additions & 1 deletion x/lsnative/genutil/migrations/v043/migrate.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ import (
v042bank "github.com/cosmos/cosmos-sdk/x/bank/migrations/v042"
v043bank "github.com/cosmos/cosmos-sdk/x/bank/migrations/v043"
bank "github.com/cosmos/cosmos-sdk/x/bank/types"
"github.com/cosmos/cosmos-sdk/x/genutil/types"
v042gov "github.com/cosmos/cosmos-sdk/x/gov/migrations/v042"
v043gov "github.com/cosmos/cosmos-sdk/x/gov/migrations/v043"
gov "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"

"github.com/persistenceOne/persistence-sdk/v2/x/lsnative/genutil/types"
)

// Migrate migrates exported state from v0.40 to a v0.43 genesis state.
Expand Down
2 changes: 1 addition & 1 deletion x/lsnative/genutil/migrations/v046/migrate.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ package v046

import (
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/x/genutil/types"
v043gov "github.com/cosmos/cosmos-sdk/x/gov/migrations/v043"
v046gov "github.com/cosmos/cosmos-sdk/x/gov/migrations/v046"
govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"

"github.com/persistenceOne/persistence-sdk/v2/x/lsnative/genutil/types"
v043staking "github.com/persistenceOne/persistence-sdk/v2/x/lsnative/staking/migrations/v043"
v046staking "github.com/persistenceOne/persistence-sdk/v2/x/lsnative/staking/migrations/v046"
stakingtypes "github.com/persistenceOne/persistence-sdk/v2/x/lsnative/staking/types"
Expand Down
3 changes: 2 additions & 1 deletion x/lsnative/slashing/keeper/migrations.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ package keeper

import (
sdk "github.com/cosmos/cosmos-sdk/types"
v043 "github.com/cosmos/cosmos-sdk/x/slashing/migrations/v043"

v043 "github.com/persistenceOne/persistence-sdk/v2/x/lsnative/slashing/migrations/v043"
)

// Migrator is a struct for handling in-place store migrations.
Expand Down
2 changes: 1 addition & 1 deletion x/lsnative/staking/keeper/migrations.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package keeper

import (
sdk "github.com/cosmos/cosmos-sdk/types"
v043 "github.com/cosmos/cosmos-sdk/x/staking/migrations/v043"

v043 "github.com/persistenceOne/persistence-sdk/v2/x/lsnative/staking/migrations/v043"
v046 "github.com/persistenceOne/persistence-sdk/v2/x/lsnative/staking/migrations/v046"
)

Expand Down
3 changes: 2 additions & 1 deletion x/lsnative/staking/migrations/v042/types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/kv"
v042auth "github.com/cosmos/cosmos-sdk/x/auth/migrations/v042"
"github.com/cosmos/cosmos-sdk/x/staking/types"

"github.com/persistenceOne/persistence-sdk/v2/x/lsnative/staking/types"
)

// Staking params default values
Expand Down
7 changes: 4 additions & 3 deletions x/lsnative/staking/migrations/v043/store.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/address"
v042auth "github.com/cosmos/cosmos-sdk/x/auth/migrations/v042"
v043distribution "github.com/cosmos/cosmos-sdk/x/distribution/migrations/v043"
v040staking "github.com/cosmos/cosmos-sdk/x/staking/migrations/v042"
"github.com/cosmos/cosmos-sdk/x/staking/types"

v043distribution "github.com/persistenceOne/persistence-sdk/v2/x/lsnative/distribution/migrations/v043"
v040staking "github.com/persistenceOne/persistence-sdk/v2/x/lsnative/staking/migrations/v042"
"github.com/persistenceOne/persistence-sdk/v2/x/lsnative/staking/types"
)

// migratePrefixAddressAddressAddress is a helper function that migrates all keys of format:
Expand Down
11 changes: 6 additions & 5 deletions x/lsnative/staking/migrations/v043/store_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@ import (
"github.com/cosmos/cosmos-sdk/testutil"
"github.com/cosmos/cosmos-sdk/testutil/testdata"
sdk "github.com/cosmos/cosmos-sdk/types"
v042staking "github.com/cosmos/cosmos-sdk/x/staking/migrations/v042"
v043staking "github.com/cosmos/cosmos-sdk/x/staking/migrations/v043"
"github.com/cosmos/cosmos-sdk/x/staking/teststaking"
"github.com/cosmos/cosmos-sdk/x/staking/types"

v042staking "github.com/persistenceOne/persistence-sdk/v2/x/lsnative/staking/migrations/v042"
v043staking "github.com/persistenceOne/persistence-sdk/v2/x/lsnative/staking/migrations/v043"
"github.com/persistenceOne/persistence-sdk/v2/x/lsnative/staking/teststaking"
"github.com/persistenceOne/persistence-sdk/v2/x/lsnative/staking/types"
)

func TestStoreMigration(t *testing.T) {
Expand Down Expand Up @@ -67,7 +68,7 @@ func TestStoreMigration(t *testing.T) {
{
"DelegationKey",
v042staking.GetDelegationKey(addr4, valAddr1),
types.GetDelegationKey(addr4, valAddr1),
types.GetLiquidDelegationKey(addr4, valAddr1),
},
{
"UnbondingDelegationKey",
Expand Down

0 comments on commit 83a82c0

Please sign in to comment.