Skip to content

Commit

Permalink
remove versioning of epochs.
Browse files Browse the repository at this point in the history
  • Loading branch information
puneet2019 committed Feb 20, 2023
1 parent da48491 commit 7ece52d
Show file tree
Hide file tree
Showing 43 changed files with 51 additions and 51 deletions.
4 changes: 2 additions & 2 deletions app/keepers/keepers.go
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ import (
txfeestypes "github.com/osmosis-labs/osmosis/v14/x/txfees/types"
valsetpref "github.com/osmosis-labs/osmosis/v14/x/valset-pref"
valsetpreftypes "github.com/osmosis-labs/osmosis/v14/x/valset-pref/types"
epochskeeper "github.com/osmosis-labs/osmosis/x/epochs/v14/keeper"
epochstypes "github.com/osmosis-labs/osmosis/x/epochs/v14/types"
epochskeeper "github.com/osmosis-labs/osmosis/x/epochs/keeper"
epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types"
)

type AppKeepers struct {
Expand Down
2 changes: 1 addition & 1 deletion app/keepers/modules.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ import (
"github.com/osmosis-labs/osmosis/v14/x/twap/twapmodule"
"github.com/osmosis-labs/osmosis/v14/x/txfees"
valsetprefmodule "github.com/osmosis-labs/osmosis/v14/x/valset-pref/valpref-module"
"github.com/osmosis-labs/osmosis/x/epochs/v14"
"github.com/osmosis-labs/osmosis/x/epochs"
ibc_hooks "github.com/osmosis-labs/osmosis/x/ibc-hooks"
)

Expand Down
4 changes: 2 additions & 2 deletions app/modules.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ import (
txfeestypes "github.com/osmosis-labs/osmosis/v14/x/txfees/types"
valsetpreftypes "github.com/osmosis-labs/osmosis/v14/x/valset-pref/types"
valsetprefmodule "github.com/osmosis-labs/osmosis/v14/x/valset-pref/valpref-module"
"github.com/osmosis-labs/osmosis/x/epochs/v14"
epochstypes "github.com/osmosis-labs/osmosis/x/epochs/v14/types"
"github.com/osmosis-labs/osmosis/x/epochs"
epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types"
)

// moduleAccountPermissions defines module account permissions
Expand Down
2 changes: 1 addition & 1 deletion cmd/osmosisd/cmd/genesis.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
incentivestypes "github.com/osmosis-labs/osmosis/v14/x/incentives/types"
minttypes "github.com/osmosis-labs/osmosis/v14/x/mint/types"
poolincentivestypes "github.com/osmosis-labs/osmosis/v14/x/pool-incentives/types"
epochstypes "github.com/osmosis-labs/osmosis/x/epochs/v14/types"
epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types"
)

// PrepareGenesisCmd returns prepare-genesis cobra Command.
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ require (
github.com/osmosis-labs/go-mutesting v0.0.0-20221208041716-b43bcd97b3b3
github.com/osmosis-labs/osmosis/osmomath v0.0.0-20230105183030-bccf5202f260
github.com/osmosis-labs/osmosis/osmoutils v0.0.0-20230202172735-45df290354da
github.com/osmosis-labs/osmosis/x/epochs/v14 v14.0.0-20230215135724-001f5e2f8cbf
github.com/osmosis-labs/osmosis/x/epochs v0.0.0
github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.0-20230201094300-e8bba2b45fd8
github.com/pkg/errors v0.9.1
github.com/rakyll/statik v0.1.7
Expand Down Expand Up @@ -317,10 +317,10 @@ replace (
github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.45.1-0.20230208101050-4937288c68d1
// use cosmos-compatible protobufs
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
github.com/osmosis-labs/osmosis/x/epochs => ./x/epochs

// Informal Tendermint fork
github.com/tendermint/tendermint => github.com/informalsystems/tendermint v0.34.24
// use grpc compatible with cosmos protobufs
google.golang.org/grpc => google.golang.org/grpc v1.33.2

)
2 changes: 0 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -866,8 +866,6 @@ github.com/osmosis-labs/osmosis/osmomath v0.0.0-20230105183030-bccf5202f260 h1:+
github.com/osmosis-labs/osmosis/osmomath v0.0.0-20230105183030-bccf5202f260/go.mod h1:KrzYoNtnWUH75rj1XAsSR4nymlHFU7jeVOx7/1KMe0k=
github.com/osmosis-labs/osmosis/osmoutils v0.0.0-20230202172735-45df290354da h1:LMGHxYmP+kWexaKttI1cI8T72JPDyljkD6lCr/1jqGg=
github.com/osmosis-labs/osmosis/osmoutils v0.0.0-20230202172735-45df290354da/go.mod h1:iD6Wq2g6bEIG51uohesQXUXCKadW3yqjCkIk1uPhCNE=
github.com/osmosis-labs/osmosis/x/epochs/v14 v14.0.0-20230215135724-001f5e2f8cbf h1:RtsBnd08sPGYiznxOj868UfAwcWx8H15pA/cKffdgkE=
github.com/osmosis-labs/osmosis/x/epochs/v14 v14.0.0-20230215135724-001f5e2f8cbf/go.mod h1:SIK8ZLa6LNNFGjSCIG86Pc0RU43ShKx/zsjH0f/o/dk=
github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.0-20230201094300-e8bba2b45fd8 h1:Ov+gyEBpU2hJkLIFAHCcQZwehCSCXFNYzqQY1zJqSXk=
github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.0-20230201094300-e8bba2b45fd8/go.mod h1:Kh2V4fLvLM4/EagRX53CYDJnILAz9NzCCETKXoH/sno=
github.com/osmosis-labs/wasmd v0.29.2-0.20221222131554-7c8ea36a6e30 h1:6uMi7HhPSwvKKU7j5NqljseFTEz4I7qHr+IPnnn42Ck=
Expand Down
4 changes: 3 additions & 1 deletion go.work.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1476,7 +1476,7 @@ github.com/openzipkin/zipkin-go v0.1.3/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTm
github.com/openzipkin/zipkin-go v0.2.5 h1:UwtQQx2pyPIgWYHRg+epgdx1/HnBQTgN3/oIYEJTQzU=
github.com/openzipkin/zipkin-go v0.2.5/go.mod h1:KpXfKdgRDnnhsxw4pNIH9Md5lyFqKUa4YDFlwRYAMyE=
github.com/ory/dockertest v3.3.5+incompatible/go.mod h1:1vX4m9wsvi00u5bseYwXaSnhNrne+V0E6LAcBILJdPs=
github.com/osmosis-labs/osmosis/x/epochs/v14 v14.0.0-20230215135724-001f5e2f8cbf/go.mod h1:SIK8ZLa6LNNFGjSCIG86Pc0RU43ShKx/zsjH0f/o/dk=
github.com/osmosis-labs/osmosis/osmoutils v0.0.3/go.mod h1:rO4YKI0ZQkS3o4UDhFuQFy+j4eM/as8GLvuBDNBStkQ=
github.com/otiai10/copy v1.7.0/go.mod h1:rmRl6QPdJj6EiUqXQ/4Nn2lLXoNQjFCQbbNrxgc/t3U=
github.com/otiai10/curr v1.0.0 h1:TJIWdbX0B+kpNagQrjgq8bCMrbhiuX73M2XwgtDMoOI=
github.com/otiai10/mint v1.3.1 h1:BCmzIS3n71sGfHB5NMNDB3lHYPz8fWSkCAErHed//qc=
Expand Down Expand Up @@ -1597,6 +1597,7 @@ github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvW
github.com/seccomp/libseccomp-golang v0.9.2-0.20210429002308-3879420cc921/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg=
github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646 h1:RpforrEYXWkmGwJHIGnLZ3tTWStkjVVstwzNGqxX2Ds=
github.com/securego/gosec v0.0.0-20200103095621-79fbf3af8d83/go.mod h1:vvbZ2Ae7AzSq3/kywjUDxSNq2SJ27RxCz2un0H3ePqE=
github.com/securego/gosec v0.0.0-20200401082031-e946c8c39989 h1:rq2/kILQnPtq5oL4+IAjgVOjh5e2yj2aaCYi7squEvI=
github.com/securego/gosec v0.0.0-20200401082031-e946c8c39989/go.mod h1:i9l/TNj+yDFh9SZXUTvspXTjbFXgZGP/UvhU1S65A4A=
github.com/securego/gosec/v2 v2.3.0/go.mod h1:UzeVyUXbxukhLeHKV3VVqo7HdoQR9MrRfFmZYotn8ME=
github.com/securego/gosec/v2 v2.13.1/go.mod h1:EO1sImBMBWFjOTFzMWfTRrZW6M15gm60ljzrmy/wtHo=
Expand Down Expand Up @@ -1711,6 +1712,7 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1
github.com/tomarrell/wrapcheck/v2 v2.7.0/go.mod h1:ao7l5p0aOlUNJKI0qVwB4Yjlqutd0IvAB9Rdwyilxvg=
github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce/go.mod h1:o8v6yHRoik09Xen7gje4m9ERNah1d1PPsVq1VEx9vE4=
github.com/tommy-muehle/go-mnd v1.1.1/go.mod h1:dSUh0FtTP8VhvkL1S+gUR1OKd9ZnSaozuI6r3m6wOig=
github.com/tommy-muehle/go-mnd v1.3.1-0.20200224220436-e6f9a994e8fa h1:RC4maTWLKKwb7p1cnoygsbKIgNlJqSYBeAFON3Ar8As=
github.com/tommy-muehle/go-mnd v1.3.1-0.20200224220436-e6f9a994e8fa/go.mod h1:dSUh0FtTP8VhvkL1S+gUR1OKd9ZnSaozuI6r3m6wOig=
github.com/tonistiigi/fsutil v0.0.0-20201103201449-0834f99b7b85/go.mod h1:a7cilN64dG941IOXfhJhlH0qB92hxJ9A1ewrdUmJ6xo=
github.com/tonistiigi/fsutil v0.0.0-20220115021204-b19f7f9cb274/go.mod h1:oPAfvw32vlUJSjyDcQ3Bu0nb2ON2B+G0dtVN/SZNJiA=
Expand Down
2 changes: 1 addition & 1 deletion proto/osmosis/epochs/genesis.proto
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto";
import "google/protobuf/duration.proto";
import "google/protobuf/timestamp.proto";

option go_package = "github.com/osmosis-labs/osmosis/x/epochs/v14/types";
option go_package = "github.com/osmosis-labs/osmosis/x/epochs/types";

// EpochInfo is a struct that describes the data going into
// a timer defined by the x/epochs module.
Expand Down
2 changes: 1 addition & 1 deletion proto/osmosis/epochs/query.proto
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import "google/api/annotations.proto";
import "cosmos/base/query/v1beta1/pagination.proto";
import "osmosis/epochs/genesis.proto";

option go_package = "github.com/osmosis-labs/osmosis/x/epochs/v14/types";
option go_package = "github.com/osmosis-labs/osmosis/x/epochs/types";

// Query defines the gRPC querier service.
service Query {
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/configurer/chain/queries.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
poolmanagertypes "github.com/osmosis-labs/osmosis/v14/x/poolmanager/types"
superfluidtypes "github.com/osmosis-labs/osmosis/v14/x/superfluid/types"
twapqueryproto "github.com/osmosis-labs/osmosis/v14/x/twap/client/queryproto"
epochstypes "github.com/osmosis-labs/osmosis/x/epochs/v14/types"
epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types"
)

func (n *NodeConfig) QueryGRPCGateway(path string, parameters ...string) ([]byte, error) {
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/initialization/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
poolmanagertypes "github.com/osmosis-labs/osmosis/v14/x/poolmanager/types"
twaptypes "github.com/osmosis-labs/osmosis/v14/x/twap/types"
txfeestypes "github.com/osmosis-labs/osmosis/v14/x/txfees/types"
epochtypes "github.com/osmosis-labs/osmosis/x/epochs/v14/types"
epochtypes "github.com/osmosis-labs/osmosis/x/epochs/types"

"github.com/osmosis-labs/osmosis/v14/tests/e2e/util"
)
Expand Down
2 changes: 1 addition & 1 deletion wasmbinding/query_plugin_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (

"github.com/osmosis-labs/osmosis/v14/app"
lockuptypes "github.com/osmosis-labs/osmosis/v14/x/lockup/types"
epochtypes "github.com/osmosis-labs/osmosis/x/epochs/v14/types"
epochtypes "github.com/osmosis-labs/osmosis/x/epochs/types"

"github.com/osmosis-labs/osmosis/v14/wasmbinding"
)
Expand Down
2 changes: 1 addition & 1 deletion wasmbinding/stargate_whitelist.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
tokenfactorytypes "github.com/osmosis-labs/osmosis/v14/x/tokenfactory/types"
twapquerytypes "github.com/osmosis-labs/osmosis/v14/x/twap/client/queryproto"
txfeestypes "github.com/osmosis-labs/osmosis/v14/x/txfees/types"
epochtypes "github.com/osmosis-labs/osmosis/x/epochs/v14/types"
epochtypes "github.com/osmosis-labs/osmosis/x/epochs/types"
)

// stargateWhitelist keeps whitelist and its deterministic
Expand Down
4 changes: 2 additions & 2 deletions x/epochs/client/cli/cli_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"testing"

"github.com/osmosis-labs/osmosis/osmoutils/osmocli"
"github.com/osmosis-labs/osmosis/x/epochs/v14/client/cli"
"github.com/osmosis-labs/osmosis/x/epochs/v14/types"
"github.com/osmosis-labs/osmosis/x/epochs/client/cli"
"github.com/osmosis-labs/osmosis/x/epochs/types"
)

func TestGetCmdCurrentEpoch(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion x/epochs/client/cli/query.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"github.com/spf13/cobra"

"github.com/osmosis-labs/osmosis/osmoutils/osmocli"
"github.com/osmosis-labs/osmosis/x/epochs/v14/types"
"github.com/osmosis-labs/osmosis/x/epochs/types"
)

// GetQueryCmd returns the cli query commands for this module.
Expand Down
2 changes: 1 addition & 1 deletion x/epochs/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/osmosis-labs/osmosis/x/epochs/v14
module github.com/osmosis-labs/osmosis/x/epochs

go 1.19

Expand Down
2 changes: 1 addition & 1 deletion x/epochs/keeper/abci.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"time"

"github.com/osmosis-labs/osmosis/x/epochs/v14/types"
"github.com/osmosis-labs/osmosis/x/epochs/types"

"github.com/cosmos/cosmos-sdk/telemetry"
sdk "github.com/cosmos/cosmos-sdk/types"
Expand Down
2 changes: 1 addition & 1 deletion x/epochs/keeper/abci_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"testing"
"time"

"github.com/osmosis-labs/osmosis/x/epochs/v14/types"
"github.com/osmosis-labs/osmosis/x/epochs/types"
"github.com/stretchr/testify/require"

"golang.org/x/exp/maps"
Expand Down
2 changes: 1 addition & 1 deletion x/epochs/keeper/epoch.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/gogo/protobuf/proto"

"github.com/osmosis-labs/osmosis/x/epochs/v14/types"
"github.com/osmosis-labs/osmosis/x/epochs/types"

sdk "github.com/cosmos/cosmos-sdk/types"
)
Expand Down
2 changes: 1 addition & 1 deletion x/epochs/keeper/epoch_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package keeper_test
import (
"time"

"github.com/osmosis-labs/osmosis/x/epochs/v14/types"
"github.com/osmosis-labs/osmosis/x/epochs/types"
)

func (suite *KeeperTestSuite) TestAddEpochInfo() {
Expand Down
2 changes: 1 addition & 1 deletion x/epochs/keeper/genesis.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package keeper
import (
sdk "github.com/cosmos/cosmos-sdk/types"

"github.com/osmosis-labs/osmosis/x/epochs/v14/types"
"github.com/osmosis-labs/osmosis/x/epochs/types"
)

// InitGenesis sets epoch info from genesis
Expand Down
2 changes: 1 addition & 1 deletion x/epochs/keeper/genesis_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"testing"
"time"

"github.com/osmosis-labs/osmosis/x/epochs/v14/types"
"github.com/osmosis-labs/osmosis/x/epochs/types"
"github.com/stretchr/testify/require"
)

Expand Down
2 changes: 1 addition & 1 deletion x/epochs/keeper/grpc_query.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"

"github.com/osmosis-labs/osmosis/x/epochs/v14/types"
"github.com/osmosis-labs/osmosis/x/epochs/types"
)

var _ types.QueryServer = Querier{}
Expand Down
2 changes: 1 addition & 1 deletion x/epochs/keeper/grpc_query_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package keeper_test
import (
gocontext "context"

"github.com/osmosis-labs/osmosis/x/epochs/v14/types"
"github.com/osmosis-labs/osmosis/x/epochs/types"
)

func (suite *KeeperTestSuite) TestQueryEpochInfos() {
Expand Down
2 changes: 1 addition & 1 deletion x/epochs/keeper/keeper.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/tendermint/tendermint/libs/log"

"github.com/osmosis-labs/osmosis/x/epochs/v14/types"
"github.com/osmosis-labs/osmosis/x/epochs/types"

sdk "github.com/cosmos/cosmos-sdk/types"
)
Expand Down
4 changes: 2 additions & 2 deletions x/epochs/keeper/keeper_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import (
"github.com/cosmos/cosmos-sdk/testutil"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
epochskeeper "github.com/osmosis-labs/osmosis/x/epochs/v14/keeper"
epochskeeper "github.com/osmosis-labs/osmosis/x/epochs/keeper"
"testing"
"time"

"github.com/stretchr/testify/suite"

"github.com/osmosis-labs/osmosis/x/epochs/v14/types"
"github.com/osmosis-labs/osmosis/x/epochs/types"
)

type KeeperTestSuite struct {
Expand Down
6 changes: 3 additions & 3 deletions x/epochs/module.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"

"github.com/osmosis-labs/osmosis/x/epochs/v14/client/cli"
"github.com/osmosis-labs/osmosis/x/epochs/v14/keeper"
"github.com/osmosis-labs/osmosis/x/epochs/v14/types"
"github.com/osmosis-labs/osmosis/x/epochs/client/cli"
"github.com/osmosis-labs/osmosis/x/epochs/keeper"
"github.com/osmosis-labs/osmosis/x/epochs/types"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion x/epochs/types/hooks_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/cosmos/cosmos-sdk/types/errors"
"github.com/stretchr/testify/suite"

"github.com/osmosis-labs/osmosis/x/epochs/v14/types"
"github.com/osmosis-labs/osmosis/x/epochs/types"
)

type KeeperTestSuite struct {
Expand Down
2 changes: 1 addition & 1 deletion x/incentives/keeper/gauge.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (

"github.com/osmosis-labs/osmosis/v14/x/incentives/types"
lockuptypes "github.com/osmosis-labs/osmosis/v14/x/lockup/types"
epochtypes "github.com/osmosis-labs/osmosis/x/epochs/v14/types"
epochtypes "github.com/osmosis-labs/osmosis/x/epochs/types"

sdk "github.com/cosmos/cosmos-sdk/types"
)
Expand Down
2 changes: 1 addition & 1 deletion x/incentives/keeper/hooks.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package keeper
import (
"github.com/osmosis-labs/osmosis/v14/x/incentives/types"
lockuptypes "github.com/osmosis-labs/osmosis/v14/x/lockup/types"
epochstypes "github.com/osmosis-labs/osmosis/x/epochs/v14/types"
epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types"

sdk "github.com/cosmos/cosmos-sdk/types"
)
Expand Down
2 changes: 1 addition & 1 deletion x/incentives/types/expected_keepers.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
time "time"

lockuptypes "github.com/osmosis-labs/osmosis/v14/x/lockup/types"
epochstypes "github.com/osmosis-labs/osmosis/x/epochs/v14/types"
epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types"

sdk "github.com/cosmos/cosmos-sdk/types"
)
Expand Down
2 changes: 1 addition & 1 deletion x/incentives/types/params.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package types

import (
epochtypes "github.com/osmosis-labs/osmosis/x/epochs/v14/types"
epochtypes "github.com/osmosis-labs/osmosis/x/epochs/types"

paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
)
Expand Down
2 changes: 1 addition & 1 deletion x/mint/keeper/hooks.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"

"github.com/osmosis-labs/osmosis/v14/x/mint/types"
epochstypes "github.com/osmosis-labs/osmosis/x/epochs/v14/types"
epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types"

"github.com/cosmos/cosmos-sdk/telemetry"
sdk "github.com/cosmos/cosmos-sdk/types"
Expand Down
2 changes: 1 addition & 1 deletion x/mint/types/expected_keepers.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package types // noalias

import (
epochstypes "github.com/osmosis-labs/osmosis/x/epochs/v14/types"
epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types"

sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/auth/types"
Expand Down
2 changes: 1 addition & 1 deletion x/mint/types/params.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

yaml "gopkg.in/yaml.v2"

epochtypes "github.com/osmosis-labs/osmosis/x/epochs/v14/types"
epochtypes "github.com/osmosis-labs/osmosis/x/epochs/types"

sdk "github.com/cosmos/cosmos-sdk/types"
paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
Expand Down
2 changes: 1 addition & 1 deletion x/protorev/keeper/epoch_hook.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package keeper
import (
sdk "github.com/cosmos/cosmos-sdk/types"

epochstypes "github.com/osmosis-labs/osmosis/x/epochs/v14/types"
epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types"
)

type EpochHooks struct {
Expand Down
2 changes: 1 addition & 1 deletion x/protorev/types/expected_keepers.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

gammtypes "github.com/osmosis-labs/osmosis/v14/x/gamm/types"
poolmanagertypes "github.com/osmosis-labs/osmosis/v14/x/poolmanager/types"
epochtypes "github.com/osmosis-labs/osmosis/x/epochs/v14/types"
epochtypes "github.com/osmosis-labs/osmosis/x/epochs/types"
)

// AccountKeeper defines the account contract that must be fulfilled when
Expand Down
2 changes: 1 addition & 1 deletion x/superfluid/keeper/hooks.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"time"

"github.com/osmosis-labs/osmosis/v14/x/superfluid/keeper/internal/events"
epochstypes "github.com/osmosis-labs/osmosis/x/epochs/v14/types"
epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types"

sdk "github.com/cosmos/cosmos-sdk/types"
)
Expand Down
2 changes: 1 addition & 1 deletion x/superfluid/keeper/keeper_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
minttypes "github.com/osmosis-labs/osmosis/v14/x/mint/types"
"github.com/osmosis-labs/osmosis/v14/x/superfluid/keeper"
"github.com/osmosis-labs/osmosis/v14/x/superfluid/types"
epochtypes "github.com/osmosis-labs/osmosis/x/epochs/v14/types"
epochtypes "github.com/osmosis-labs/osmosis/x/epochs/types"
)

type KeeperTestSuite struct {
Expand Down
Loading

0 comments on commit 7ece52d

Please sign in to comment.