Skip to content

Commit

Permalink
rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
@davidterpay
davidterpay committed Jan 10, 2023
1 parent b7bb26d commit f5050d2
Show file tree
Hide file tree
Showing 9 changed files with 45 additions and 45 deletions.
2 changes: 1 addition & 1 deletion app/posthandler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package app
import (
sdk "github.com/cosmos/cosmos-sdk/types"

protorevkeeper "github.com/osmosis-labs/osmosis/v13/x/protorev/keeper"
protorevkeeper "github.com/osmosis-labs/osmosis/v14/x/protorev/keeper"
)

func NewPostHandler(protoRevKeeper *protorevkeeper.Keeper) sdk.AnteHandler {
Expand Down
2 changes: 1 addition & 1 deletion x/protorev/client/cli/tx.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"

"github.com/osmosis-labs/osmosis/osmoutils/osmocli"
"github.com/osmosis-labs/osmosis/v13/x/protorev/types"
"github.com/osmosis-labs/osmosis/v14/x/protorev/types"

sdk "github.com/cosmos/cosmos-sdk/types"
)
Expand Down
2 changes: 1 addition & 1 deletion x/protorev/keeper/developer_fees.go
View file
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/v13/x/protorev/types"
"github.com/osmosis-labs/osmosis/v14/x/protorev/types"
)

// SendDeveloperFeesToDeveloperAccount sends the developer fees from the module account to the developer account
Expand Down
4 changes: 2 additions & 2 deletions x/protorev/keeper/developer_fees_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package keeper_test
import (
sdk "github.com/cosmos/cosmos-sdk/types"

"github.com/osmosis-labs/osmosis/v13/app/apptesting"
"github.com/osmosis-labs/osmosis/v13/x/protorev/types"
"github.com/osmosis-labs/osmosis/v14/app/apptesting"
"github.com/osmosis-labs/osmosis/v14/x/protorev/types"
)

// TestSendDeveloperFeesToDeveloperAccount tests the SendDeveloperFeesToDeveloperAccount function
Expand Down
2 changes: 1 addition & 1 deletion x/protorev/keeper/posthandler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

sdk "github.com/cosmos/cosmos-sdk/types"

poolmanagertypes "github.com/osmosis-labs/osmosis/v13/x/poolmanager/types"
poolmanagertypes "github.com/osmosis-labs/osmosis/v14/x/poolmanager/types"
)

type SwapToBackrun struct {
Expand Down
6 changes: 3 additions & 3 deletions x/protorev/keeper/posthandler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing"

poolmanagertypes "github.com/osmosis-labs/osmosis/v13/x/poolmanager/types"
"github.com/osmosis-labs/osmosis/v13/x/protorev/keeper"
"github.com/osmosis-labs/osmosis/v13/x/protorev/types"
poolmanagertypes "github.com/osmosis-labs/osmosis/v14/x/poolmanager/types"
"github.com/osmosis-labs/osmosis/v14/x/protorev/keeper"
"github.com/osmosis-labs/osmosis/v14/x/protorev/types"
)

func (suite *KeeperTestSuite) TestAnteHandle() {
Expand Down
6 changes: 3 additions & 3 deletions x/protorev/keeper/proposal_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package keeper_test

import (
"github.com/osmosis-labs/osmosis/v13/app/apptesting"
"github.com/osmosis-labs/osmosis/v13/x/protorev"
"github.com/osmosis-labs/osmosis/v13/x/protorev/types"
"github.com/osmosis-labs/osmosis/v14/app/apptesting"
"github.com/osmosis-labs/osmosis/v14/x/protorev"
"github.com/osmosis-labs/osmosis/v14/x/protorev/types"
)

// TestSetProtoRevAdminAccount tests that the admin account can be set through a proposal
Expand Down
4 changes: 2 additions & 2 deletions x/protorev/proposal_handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (

sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"

"github.com/osmosis-labs/osmosis/v13/x/protorev/keeper"
"github.com/osmosis-labs/osmosis/v13/x/protorev/types"
"github.com/osmosis-labs/osmosis/v14/x/protorev/keeper"
"github.com/osmosis-labs/osmosis/v14/x/protorev/types"
)

func NewProtoRevProposalHandler(k keeper.Keeper) govtypes.Handler {
Expand Down
62 changes: 31 additions & 31 deletions x/protorev/types/protorev.pb.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit f5050d2

Please sign in to comment.