chore: Upgrade module path for v2 (#383)

This commit is contained in:
Eric Warehime
2024-01-24 09:06:20 -08:00
committed by GitHub
parent 234e2ff719
commit acff9d0edf
104 changed files with 363 additions and 258 deletions
+1 -1
View File
@@ -6,7 +6,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/x/auction/types"
"github.com/skip-mev/block-sdk/v2/x/auction/types"
)
// nextHeightExecModes is the subset of execution modes that need special treatment. In
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"github.com/cosmos/cosmos-sdk/client/flags"
"github.com/spf13/cobra"
"github.com/skip-mev/block-sdk/x/auction/types"
"github.com/skip-mev/block-sdk/v2/x/auction/types"
)
// GetQueryCmd returns the cli query commands for the auction module.
+1 -1
View File
@@ -12,7 +12,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/spf13/cobra"
"github.com/skip-mev/block-sdk/x/auction/types"
"github.com/skip-mev/block-sdk/v2/x/auction/types"
)
// NewTxCmd returns a root CLI command handler for all x/auction transaction
+1 -1
View File
@@ -5,7 +5,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/x/auction/types"
"github.com/skip-mev/block-sdk/v2/x/auction/types"
)
// ValidateBidInfo validates that the bid can be included in the auction.
+4 -4
View File
@@ -10,10 +10,10 @@ import (
mock "github.com/stretchr/testify/mock"
testutils "github.com/skip-mev/block-sdk/testutils"
"github.com/skip-mev/block-sdk/x/auction/keeper"
"github.com/skip-mev/block-sdk/x/auction/types"
"github.com/skip-mev/block-sdk/x/auction/types/mocks"
testutils "github.com/skip-mev/block-sdk/v2/testutils"
"github.com/skip-mev/block-sdk/v2/x/auction/keeper"
"github.com/skip-mev/block-sdk/v2/x/auction/types"
"github.com/skip-mev/block-sdk/v2/x/auction/types/mocks"
)
func (s *KeeperTestSuite) TestValidateAuctionBid() {
+1 -1
View File
@@ -3,7 +3,7 @@ package keeper
import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/x/auction/types"
"github.com/skip-mev/block-sdk/v2/x/auction/types"
)
// InitGenesis initializes the auction module's state from a given genesis state.
+1 -1
View File
@@ -5,7 +5,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/x/auction/types"
"github.com/skip-mev/block-sdk/v2/x/auction/types"
)
var _ types.QueryServer = QueryServer{}
+1 -1
View File
@@ -3,7 +3,7 @@ package keeper_test
import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/x/auction/types"
"github.com/skip-mev/block-sdk/v2/x/auction/types"
)
func (s *KeeperTestSuite) TestQueryParams() {
+2 -2
View File
@@ -10,8 +10,8 @@ import (
"github.com/cosmos/cosmos-sdk/codec"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/x/auction/rewards"
"github.com/skip-mev/block-sdk/x/auction/types"
"github.com/skip-mev/block-sdk/v2/x/auction/rewards"
"github.com/skip-mev/block-sdk/v2/x/auction/types"
)
type Keeper struct {
+4 -4
View File
@@ -7,10 +7,10 @@ import (
"github.com/cosmos/cosmos-sdk/testutil"
sdk "github.com/cosmos/cosmos-sdk/types"
testutils "github.com/skip-mev/block-sdk/testutils"
"github.com/skip-mev/block-sdk/x/auction/keeper"
"github.com/skip-mev/block-sdk/x/auction/types"
"github.com/skip-mev/block-sdk/x/auction/types/mocks"
testutils "github.com/skip-mev/block-sdk/v2/testutils"
"github.com/skip-mev/block-sdk/v2/x/auction/keeper"
"github.com/skip-mev/block-sdk/v2/x/auction/types"
"github.com/skip-mev/block-sdk/v2/x/auction/types/mocks"
"github.com/stretchr/testify/suite"
)
+1 -1
View File
@@ -9,7 +9,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/x/auction/types"
"github.com/skip-mev/block-sdk/v2/x/auction/types"
)
var _ types.MsgServer = MsgServer{}
+2 -2
View File
@@ -7,8 +7,8 @@ import (
"cosmossdk.io/math"
sdk "github.com/cosmos/cosmos-sdk/types"
testutils "github.com/skip-mev/block-sdk/testutils"
"github.com/skip-mev/block-sdk/x/auction/types"
testutils "github.com/skip-mev/block-sdk/v2/testutils"
"github.com/skip-mev/block-sdk/v2/x/auction/types"
)
func (s *KeeperTestSuite) TestMsgUpdateParams() {
+4 -4
View File
@@ -19,10 +19,10 @@ import (
"github.com/grpc-ecosystem/grpc-gateway/runtime"
"github.com/spf13/cobra"
modulev1 "github.com/skip-mev/block-sdk/api/sdk/auction/module/v1"
"github.com/skip-mev/block-sdk/x/auction/client/cli"
"github.com/skip-mev/block-sdk/x/auction/keeper"
"github.com/skip-mev/block-sdk/x/auction/types"
modulev1 "github.com/skip-mev/block-sdk/v2/api/sdk/auction/module/v1"
"github.com/skip-mev/block-sdk/v2/x/auction/client/cli"
"github.com/skip-mev/block-sdk/v2/x/auction/keeper"
"github.com/skip-mev/block-sdk/v2/x/auction/types"
)
var (
+1 -1
View File
@@ -5,7 +5,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/x/auction/types"
"github.com/skip-mev/block-sdk/v2/x/auction/types"
)
var _ types.RewardsAddressProvider = (*FixedAddressRewardsAddressProvider)(nil)
+1 -1
View File
@@ -3,7 +3,7 @@ package rewards
import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/x/auction/types"
"github.com/skip-mev/block-sdk/v2/x/auction/types"
)
var _ types.RewardsAddressProvider = (*ProposerRewardsAddressProvider)(nil)
+5 -1
View File
@@ -1,4 +1,4 @@
// Code generated by mockery v2.30.1. DO NOT EDIT.
// Code generated by mockery v2.40.1. DO NOT EDIT.
package mocks
@@ -16,6 +16,10 @@ type AccountKeeper struct {
func (_m *AccountKeeper) GetModuleAddress(moduleName string) types.AccAddress {
ret := _m.Called(moduleName)
if len(ret) == 0 {
panic("no return value specified for GetModuleAddress")
}
var r0 types.AccAddress
if rf, ok := ret.Get(0).(func(string) types.AccAddress); ok {
r0 = rf(moduleName)
+9 -1
View File
@@ -1,4 +1,4 @@
// Code generated by mockery v2.30.1. DO NOT EDIT.
// Code generated by mockery v2.40.1. DO NOT EDIT.
package mocks
@@ -18,6 +18,10 @@ type BankKeeper struct {
func (_m *BankKeeper) GetBalance(ctx context.Context, addr types.AccAddress, denom string) types.Coin {
ret := _m.Called(ctx, addr, denom)
if len(ret) == 0 {
panic("no return value specified for GetBalance")
}
var r0 types.Coin
if rf, ok := ret.Get(0).(func(context.Context, types.AccAddress, string) types.Coin); ok {
r0 = rf(ctx, addr, denom)
@@ -32,6 +36,10 @@ func (_m *BankKeeper) GetBalance(ctx context.Context, addr types.AccAddress, den
func (_m *BankKeeper) SendCoins(ctx context.Context, fromAddr types.AccAddress, toAddr types.AccAddress, amt types.Coins) error {
ret := _m.Called(ctx, fromAddr, toAddr, amt)
if len(ret) == 0 {
panic("no return value specified for SendCoins")
}
var r0 error
if rf, ok := ret.Get(0).(func(context.Context, types.AccAddress, types.AccAddress, types.Coins) error); ok {
r0 = rf(ctx, fromAddr, toAddr, amt)
+5 -1
View File
@@ -1,4 +1,4 @@
// Code generated by mockery v2.30.1. DO NOT EDIT.
// Code generated by mockery v2.40.1. DO NOT EDIT.
package mocks
@@ -18,6 +18,10 @@ type DistributionKeeper struct {
func (_m *DistributionKeeper) GetPreviousProposerConsAddr(ctx context.Context) (types.ConsAddress, error) {
ret := _m.Called(ctx)
if len(ret) == 0 {
panic("no return value specified for GetPreviousProposerConsAddr")
}
var r0 types.ConsAddress
var r1 error
if rf, ok := ret.Get(0).(func(context.Context) (types.ConsAddress, error)); ok {
@@ -1,4 +1,4 @@
// Code generated by mockery v2.30.1. DO NOT EDIT.
// Code generated by mockery v2.40.1. DO NOT EDIT.
package mocks
@@ -16,6 +16,10 @@ type RewardsAddressProvider struct {
func (_m *RewardsAddressProvider) GetRewardsAddress(context types.Context) (types.AccAddress, error) {
ret := _m.Called(context)
if len(ret) == 0 {
panic("no return value specified for GetRewardsAddress")
}
var r0 types.AccAddress
var r1 error
if rf, ok := ret.Get(0).(func(types.Context) (types.AccAddress, error)); ok {
+5 -1
View File
@@ -1,4 +1,4 @@
// Code generated by mockery v2.30.1. DO NOT EDIT.
// Code generated by mockery v2.40.1. DO NOT EDIT.
package mocks
@@ -20,6 +20,10 @@ type StakingKeeper struct {
func (_m *StakingKeeper) GetValidatorByConsAddr(_a0 context.Context, _a1 types.ConsAddress) (stakingtypes.Validator, error) {
ret := _m.Called(_a0, _a1)
if len(ret) == 0 {
panic("no return value specified for GetValidatorByConsAddr")
}
var r0 stakingtypes.Validator
var r1 error
if rf, ok := ret.Get(0).(func(context.Context, types.ConsAddress) (stakingtypes.Validator, error)); ok {
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"cosmossdk.io/math"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/x/auction/types"
"github.com/skip-mev/block-sdk/v2/x/auction/types"
)
// TestMsgAuctionBid tests the ValidateBasic method of MsgAuctionBid
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"github.com/cosmos/cosmos-sdk/client"
"github.com/spf13/cobra"
"github.com/skip-mev/block-sdk/x/blocksdk/types"
"github.com/skip-mev/block-sdk/v2/x/blocksdk/types"
)
// GetQueryCmd returns the cli query commands for the blocksdk module.
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"github.com/cosmos/cosmos-sdk/client"
"github.com/spf13/cobra"
"github.com/skip-mev/block-sdk/x/blocksdk/types"
"github.com/skip-mev/block-sdk/v2/x/blocksdk/types"
)
// NewTxCmd returns a root CLI command handler for all x/blocksdk transaction
+1 -1
View File
@@ -3,7 +3,7 @@ package keeper
import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/x/blocksdk/types"
"github.com/skip-mev/block-sdk/v2/x/blocksdk/types"
)
// InitGenesis initializes the blocksdk module's state from a given genesis state.
+1 -1
View File
@@ -5,7 +5,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/x/blocksdk/types"
"github.com/skip-mev/block-sdk/v2/x/blocksdk/types"
)
var _ types.QueryServer = QueryServer{}
+1 -1
View File
@@ -3,7 +3,7 @@ package keeper_test
import (
"cosmossdk.io/math"
"github.com/skip-mev/block-sdk/x/blocksdk/types"
"github.com/skip-mev/block-sdk/v2/x/blocksdk/types"
)
func (s *KeeperTestSuite) TestQueryLane() {
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"github.com/cosmos/cosmos-sdk/codec"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/x/blocksdk/types"
"github.com/skip-mev/block-sdk/v2/x/blocksdk/types"
)
type Keeper struct {
+3 -3
View File
@@ -11,9 +11,9 @@ import (
"github.com/stretchr/testify/suite"
testutils "github.com/skip-mev/block-sdk/testutils"
"github.com/skip-mev/block-sdk/x/blocksdk/keeper"
"github.com/skip-mev/block-sdk/x/blocksdk/types"
testutils "github.com/skip-mev/block-sdk/v2/testutils"
"github.com/skip-mev/block-sdk/v2/x/blocksdk/keeper"
"github.com/skip-mev/block-sdk/v2/x/blocksdk/types"
)
type KeeperTestSuite struct {
+1 -1
View File
@@ -6,7 +6,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/x/blocksdk/types"
"github.com/skip-mev/block-sdk/v2/x/blocksdk/types"
)
var _ types.MsgServer = MsgServer{}
+2 -2
View File
@@ -6,9 +6,9 @@ import (
"cosmossdk.io/math"
testutils "github.com/skip-mev/block-sdk/testutils"
testutils "github.com/skip-mev/block-sdk/v2/testutils"
"github.com/skip-mev/block-sdk/x/blocksdk/types"
"github.com/skip-mev/block-sdk/v2/x/blocksdk/types"
)
func (s *KeeperTestSuite) TestMsgUpdateLane() {
+4 -4
View File
@@ -20,10 +20,10 @@ import (
"github.com/grpc-ecosystem/grpc-gateway/runtime"
"github.com/spf13/cobra"
modulev1 "github.com/skip-mev/block-sdk/api/sdk/blocksdk/module/v1"
"github.com/skip-mev/block-sdk/x/blocksdk/client/cli"
"github.com/skip-mev/block-sdk/x/blocksdk/keeper"
"github.com/skip-mev/block-sdk/x/blocksdk/types"
modulev1 "github.com/skip-mev/block-sdk/v2/api/sdk/blocksdk/module/v1"
"github.com/skip-mev/block-sdk/v2/x/blocksdk/client/cli"
"github.com/skip-mev/block-sdk/v2/x/blocksdk/keeper"
"github.com/skip-mev/block-sdk/v2/x/blocksdk/types"
)
var (
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"cosmossdk.io/math"
"github.com/skip-mev/block-sdk/x/blocksdk/types"
"github.com/skip-mev/block-sdk/v2/x/blocksdk/types"
)
func TestLane_ValidateBasic(t *testing.T) {
+2 -2
View File
@@ -7,9 +7,9 @@ import (
"cosmossdk.io/math"
"github.com/skip-mev/block-sdk/testutils"
"github.com/skip-mev/block-sdk/v2/testutils"
"github.com/skip-mev/block-sdk/x/blocksdk/types"
"github.com/skip-mev/block-sdk/v2/x/blocksdk/types"
)
func TestMsgUpdateLane_ValidateBasic(t *testing.T) {