From acff9d0edf3b4a710dcc67f27ab3168a1b1cdfda Mon Sep 17 00:00:00 2001 From: Eric Warehime Date: Wed, 24 Jan 2024 09:06:20 -0800 Subject: [PATCH] chore: Upgrade module path for v2 (#383) --- abci/abci.go | 6 +- abci/abci_test.go | 12 ++-- abci/checktx/check_tx_test.go | 14 ++--- abci/checktx/mempool_parity_check_tx.go | 2 +- abci/checktx/mev_check_tx.go | 6 +- abci/utils.go | 6 +- abci/utils_test.go | 16 ++--- .../signer_extraction_adapter_test.go | 4 +- block/base/abci.go | 6 +- block/base/config.go | 2 +- block/base/lane.go | 2 +- block/base/mempool.go | 4 +- block/base/mempool_test.go | 4 +- block/base/options.go | 2 +- block/base/priority_nonce.go | 2 +- block/base/proposals.go | 2 +- block/base/tx_info.go | 2 +- block/base/tx_priority_test.go | 5 +- block/base/types.go | 2 +- block/lane.go | 4 +- block/lane_test.go | 4 +- block/mempool.go | 2 +- block/mempool_test.go | 20 +++---- block/mocks/lane.go | 60 +++++++++++++++++-- block/mocks/lane_fetcher.go | 2 +- block/mocks/lane_mempool.go | 30 +++++++++- block/proposals/proposals.go | 2 +- block/proposals/proposals_test.go | 16 ++--- block/proposals/update.go | 2 +- block/service/service.go | 4 +- block/service/service_test.go | 16 ++--- block/types.go | 2 +- block/utils/utils.go | 2 +- go.mod | 2 +- lanes/base/abci_test.go | 16 ++--- lanes/base/base_test.go | 4 +- lanes/base/lane.go | 2 +- lanes/base/mempool_test.go | 6 +- lanes/base/tx_info_test.go | 2 +- lanes/free/lane.go | 2 +- lanes/mev/abci.go | 4 +- lanes/mev/abci_test.go | 10 ++-- lanes/mev/factory.go | 6 +- lanes/mev/factory_test.go | 2 +- lanes/mev/lane.go | 2 +- lanes/mev/mempool.go | 2 +- lanes/mev/mev_test.go | 4 +- lanes/mev/testutils/testutil.go | 8 +-- lanes/mev/utils.go | 2 +- lanes/mev/utils_test.go | 6 +- lanes/terminator/lane.go | 6 +- tests/app/ante.go | 6 +- tests/app/app.go | 14 ++--- tests/app/config.go | 12 ++-- tests/app/lanes.go | 10 ++-- tests/app/testappd/cmd/root.go | 2 +- tests/app/testappd/cmd/testnet.go | 2 +- tests/app/testappd/main.go | 4 +- tests/e2e/block_sdk_e2e_test.go | 12 ++-- tests/e2e/block_sdk_suite.go | 4 +- tests/e2e/chain_setup.go | 4 +- tests/e2e/go.mod | 8 +-- tests/e2e/go.sum | 4 +- tests/integration/integration_test.go | 6 +- tests/integration/network/auction_test.go | 2 +- tests/integration/network/mempool_test.go | 4 +- tests/integration/network/network_test.go | 6 +- testutils/keeper/keeper.go | 14 ++--- testutils/mempool/mempool.go | 16 ++--- testutils/networksuite/networksuite.go | 12 ++-- testutils/utils.go | 2 +- x/auction/ante/utils.go | 2 +- x/auction/client/cli/query.go | 2 +- x/auction/client/cli/tx.go | 2 +- x/auction/keeper/auction.go | 2 +- x/auction/keeper/auction_test.go | 8 +-- x/auction/keeper/genesis.go | 2 +- x/auction/keeper/grpc_query.go | 2 +- x/auction/keeper/grpc_query_test.go | 2 +- x/auction/keeper/keeper.go | 4 +- x/auction/keeper/keeper_test.go | 8 +-- x/auction/keeper/msg_server.go | 2 +- x/auction/keeper/msg_server_test.go | 4 +- x/auction/module.go | 8 +-- x/auction/rewards/fixed_provider.go | 2 +- x/auction/rewards/proposer_provider.go | 2 +- x/auction/types/mocks/account_keeper.go | 6 +- x/auction/types/mocks/bank_keeper.go | 10 +++- x/auction/types/mocks/distribution_keeper.go | 6 +- .../types/mocks/rewards_address_provider.go | 6 +- x/auction/types/mocks/staking_keeper.go | 6 +- x/auction/types/msgs_test.go | 2 +- x/blocksdk/client/cli/query.go | 2 +- x/blocksdk/client/cli/tx.go | 2 +- x/blocksdk/keeper/genesis.go | 2 +- x/blocksdk/keeper/grpc_query.go | 2 +- x/blocksdk/keeper/grpc_query_test.go | 2 +- x/blocksdk/keeper/keeper.go | 2 +- x/blocksdk/keeper/keeper_test.go | 6 +- x/blocksdk/keeper/msg_server.go | 2 +- x/blocksdk/keeper/msg_server_test.go | 4 +- x/blocksdk/module.go | 8 +-- x/blocksdk/types/lane_test.go | 2 +- x/blocksdk/types/msgs_test.go | 4 +- 104 files changed, 363 insertions(+), 258 deletions(-) diff --git a/abci/abci.go b/abci/abci.go index 4ea64a6..129a1da 100644 --- a/abci/abci.go +++ b/abci/abci.go @@ -7,9 +7,9 @@ import ( abci "github.com/cometbft/cometbft/abci/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/skip-mev/block-sdk/block" - "github.com/skip-mev/block-sdk/block/proposals" - "github.com/skip-mev/block-sdk/block/utils" + "github.com/skip-mev/block-sdk/v2/block" + "github.com/skip-mev/block-sdk/v2/block/proposals" + "github.com/skip-mev/block-sdk/v2/block/utils" ) type ( diff --git a/abci/abci_test.go b/abci/abci_test.go index 6ea0c80..a85cbee 100644 --- a/abci/abci_test.go +++ b/abci/abci_test.go @@ -13,12 +13,12 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" - "github.com/skip-mev/block-sdk/abci" - "github.com/skip-mev/block-sdk/block" - "github.com/skip-mev/block-sdk/block/mocks" - "github.com/skip-mev/block-sdk/lanes/free" - testutils "github.com/skip-mev/block-sdk/testutils" - blocksdkmoduletypes "github.com/skip-mev/block-sdk/x/blocksdk/types" + "github.com/skip-mev/block-sdk/v2/abci" + "github.com/skip-mev/block-sdk/v2/block" + "github.com/skip-mev/block-sdk/v2/block/mocks" + "github.com/skip-mev/block-sdk/v2/lanes/free" + testutils "github.com/skip-mev/block-sdk/v2/testutils" + blocksdkmoduletypes "github.com/skip-mev/block-sdk/v2/x/blocksdk/types" ) type MockLaneFetcher struct { diff --git a/abci/checktx/check_tx_test.go b/abci/checktx/check_tx_test.go index f463e3c..edec082 100644 --- a/abci/checktx/check_tx_test.go +++ b/abci/checktx/check_tx_test.go @@ -15,13 +15,13 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" - "github.com/skip-mev/block-sdk/abci/checktx" - "github.com/skip-mev/block-sdk/block" - "github.com/skip-mev/block-sdk/lanes/mev" - mevlanetestutils "github.com/skip-mev/block-sdk/lanes/mev/testutils" - "github.com/skip-mev/block-sdk/testutils" - auctiontypes "github.com/skip-mev/block-sdk/x/auction/types" - blocksdktypes "github.com/skip-mev/block-sdk/x/blocksdk/types" + "github.com/skip-mev/block-sdk/v2/abci/checktx" + "github.com/skip-mev/block-sdk/v2/block" + "github.com/skip-mev/block-sdk/v2/lanes/mev" + mevlanetestutils "github.com/skip-mev/block-sdk/v2/lanes/mev/testutils" + "github.com/skip-mev/block-sdk/v2/testutils" + auctiontypes "github.com/skip-mev/block-sdk/v2/x/auction/types" + blocksdktypes "github.com/skip-mev/block-sdk/v2/x/blocksdk/types" ) type CheckTxTestSuite struct { diff --git a/abci/checktx/mempool_parity_check_tx.go b/abci/checktx/mempool_parity_check_tx.go index 5cfdaaa..dbf4a22 100644 --- a/abci/checktx/mempool_parity_check_tx.go +++ b/abci/checktx/mempool_parity_check_tx.go @@ -9,7 +9,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/skip-mev/block-sdk/block" + "github.com/skip-mev/block-sdk/v2/block" ) // MempoolParityCheckTx is a CheckTx function that evicts txs that are not in the app-side mempool diff --git a/abci/checktx/mev_check_tx.go b/abci/checktx/mev_check_tx.go index 56a9703..fa02496 100644 --- a/abci/checktx/mev_check_tx.go +++ b/abci/checktx/mev_check_tx.go @@ -12,9 +12,9 @@ import ( "cosmossdk.io/log" storetypes "cosmossdk.io/store/types" - "github.com/skip-mev/block-sdk/block" - mevlane "github.com/skip-mev/block-sdk/lanes/mev" - "github.com/skip-mev/block-sdk/x/auction/types" + "github.com/skip-mev/block-sdk/v2/block" + mevlane "github.com/skip-mev/block-sdk/v2/lanes/mev" + "github.com/skip-mev/block-sdk/v2/x/auction/types" ) // MevCheckTxHandler is a wrapper around baseapp's CheckTx method that allows us to diff --git a/abci/utils.go b/abci/utils.go index 73ad76e..ae2cf8a 100644 --- a/abci/utils.go +++ b/abci/utils.go @@ -3,9 +3,9 @@ package abci import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/skip-mev/block-sdk/block" - "github.com/skip-mev/block-sdk/block/proposals" - "github.com/skip-mev/block-sdk/lanes/terminator" + "github.com/skip-mev/block-sdk/v2/block" + "github.com/skip-mev/block-sdk/v2/block/proposals" + "github.com/skip-mev/block-sdk/v2/lanes/terminator" ) // ChainPrepareLanes chains together the proposal preparation logic from each lane into a diff --git a/abci/utils_test.go b/abci/utils_test.go index 3099b03..378b36f 100644 --- a/abci/utils_test.go +++ b/abci/utils_test.go @@ -5,7 +5,7 @@ import ( "encoding/hex" "fmt" - blocksdkmoduletypes "github.com/skip-mev/block-sdk/x/blocksdk/types" + blocksdkmoduletypes "github.com/skip-mev/block-sdk/v2/x/blocksdk/types" "cosmossdk.io/log" "cosmossdk.io/math" @@ -13,13 +13,13 @@ import ( tmprototypes "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/skip-mev/block-sdk/abci" - signeradaptors "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter" - "github.com/skip-mev/block-sdk/block" - "github.com/skip-mev/block-sdk/block/base" - defaultlane "github.com/skip-mev/block-sdk/lanes/base" - "github.com/skip-mev/block-sdk/lanes/free" - "github.com/skip-mev/block-sdk/lanes/mev" + "github.com/skip-mev/block-sdk/v2/abci" + signeradaptors "github.com/skip-mev/block-sdk/v2/adapters/signer_extraction_adapter" + "github.com/skip-mev/block-sdk/v2/block" + "github.com/skip-mev/block-sdk/v2/block/base" + defaultlane "github.com/skip-mev/block-sdk/v2/lanes/base" + "github.com/skip-mev/block-sdk/v2/lanes/free" + "github.com/skip-mev/block-sdk/v2/lanes/mev" ) func (s *ProposalsTestSuite) setUpAnteHandler(expectedExecution map[sdk.Tx]bool) sdk.AnteHandler { diff --git a/adapters/signer_extraction_adapter/signer_extraction_adapter_test.go b/adapters/signer_extraction_adapter/signer_extraction_adapter_test.go index 6426aef..ff4aa09 100644 --- a/adapters/signer_extraction_adapter/signer_extraction_adapter_test.go +++ b/adapters/signer_extraction_adapter/signer_extraction_adapter_test.go @@ -10,8 +10,8 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/stretchr/testify/suite" - signer_extraction "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter" - testutils "github.com/skip-mev/block-sdk/testutils" + signer_extraction "github.com/skip-mev/block-sdk/v2/adapters/signer_extraction_adapter" + testutils "github.com/skip-mev/block-sdk/v2/testutils" ) type SignerExtractionAdapterTestSuite struct { diff --git a/block/base/abci.go b/block/base/abci.go index 1da77d0..5c6ca0c 100644 --- a/block/base/abci.go +++ b/block/base/abci.go @@ -3,9 +3,9 @@ package base import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/skip-mev/block-sdk/block" - "github.com/skip-mev/block-sdk/block/proposals" - "github.com/skip-mev/block-sdk/block/utils" + "github.com/skip-mev/block-sdk/v2/block" + "github.com/skip-mev/block-sdk/v2/block/proposals" + "github.com/skip-mev/block-sdk/v2/block/utils" ) // PrepareLane will prepare a partial proposal for the lane. It will select transactions from the diff --git a/block/base/config.go b/block/base/config.go index 2b0485a..5905b32 100644 --- a/block/base/config.go +++ b/block/base/config.go @@ -7,7 +7,7 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - signer_extraction "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter" + signer_extraction "github.com/skip-mev/block-sdk/v2/adapters/signer_extraction_adapter" ) // LaneConfig defines the basic configurations needed for a lane. diff --git a/block/base/lane.go b/block/base/lane.go index 695fd52..39d9d1a 100644 --- a/block/base/lane.go +++ b/block/base/lane.go @@ -7,7 +7,7 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/skip-mev/block-sdk/block" + "github.com/skip-mev/block-sdk/v2/block" ) var _ block.Lane = (*BaseLane)(nil) diff --git a/block/base/mempool.go b/block/base/mempool.go index 331fda5..57bca8d 100644 --- a/block/base/mempool.go +++ b/block/base/mempool.go @@ -8,8 +8,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkmempool "github.com/cosmos/cosmos-sdk/types/mempool" - signer_extraction "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter" - "github.com/skip-mev/block-sdk/block/utils" + signer_extraction "github.com/skip-mev/block-sdk/v2/adapters/signer_extraction_adapter" + "github.com/skip-mev/block-sdk/v2/block/utils" ) type ( diff --git a/block/base/mempool_test.go b/block/base/mempool_test.go index 8c38eca..5a8eeb3 100644 --- a/block/base/mempool_test.go +++ b/block/base/mempool_test.go @@ -9,8 +9,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - signerextraction "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter" - "github.com/skip-mev/block-sdk/testutils" + signerextraction "github.com/skip-mev/block-sdk/v2/adapters/signer_extraction_adapter" + "github.com/skip-mev/block-sdk/v2/testutils" ) type txGen struct { diff --git a/block/base/options.go b/block/base/options.go index 0d36f17..cd2fe0b 100644 --- a/block/base/options.go +++ b/block/base/options.go @@ -3,7 +3,7 @@ package base import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/skip-mev/block-sdk/block" + "github.com/skip-mev/block-sdk/v2/block" ) // LaneOption defines a function that can be used to set options on a lane. diff --git a/block/base/priority_nonce.go b/block/base/priority_nonce.go index f5afc6d..6881104 100644 --- a/block/base/priority_nonce.go +++ b/block/base/priority_nonce.go @@ -22,7 +22,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkmempool "github.com/cosmos/cosmos-sdk/types/mempool" - signer_extraction "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter" + signer_extraction "github.com/skip-mev/block-sdk/v2/adapters/signer_extraction_adapter" ) var ( diff --git a/block/base/proposals.go b/block/base/proposals.go index e25427b..ed0f2f6 100644 --- a/block/base/proposals.go +++ b/block/base/proposals.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/skip-mev/block-sdk/block/proposals" + "github.com/skip-mev/block-sdk/v2/block/proposals" ) // DefaultProposalHandler returns a default implementation of the PrepareLaneHandler and diff --git a/block/base/tx_info.go b/block/base/tx_info.go index a6c9ed9..8949e65 100644 --- a/block/base/tx_info.go +++ b/block/base/tx_info.go @@ -8,7 +8,7 @@ import ( comettypes "github.com/cometbft/cometbft/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/skip-mev/block-sdk/block/utils" + "github.com/skip-mev/block-sdk/v2/block/utils" ) // GetTxInfo returns various information about the transaction that diff --git a/block/base/tx_priority_test.go b/block/base/tx_priority_test.go index 69d6438..e85520a 100644 --- a/block/base/tx_priority_test.go +++ b/block/base/tx_priority_test.go @@ -7,9 +7,10 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/skip-mev/block-sdk/block/base" - "github.com/skip-mev/block-sdk/testutils" "github.com/stretchr/testify/require" + + "github.com/skip-mev/block-sdk/v2/block/base" + "github.com/skip-mev/block-sdk/v2/testutils" ) func TestNopTxPriority(t *testing.T) { diff --git a/block/base/types.go b/block/base/types.go index a5bb950..d878581 100644 --- a/block/base/types.go +++ b/block/base/types.go @@ -3,7 +3,7 @@ package base import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/skip-mev/block-sdk/block/proposals" + "github.com/skip-mev/block-sdk/v2/block/proposals" ) type ( diff --git a/block/lane.go b/block/lane.go index 1cfe859..dd7f4bf 100644 --- a/block/lane.go +++ b/block/lane.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkmempool "github.com/cosmos/cosmos-sdk/types/mempool" - "github.com/skip-mev/block-sdk/block/proposals" - "github.com/skip-mev/block-sdk/block/utils" + "github.com/skip-mev/block-sdk/v2/block/proposals" + "github.com/skip-mev/block-sdk/v2/block/utils" ) // LaneMempool defines the interface a lane's mempool should implement. The basic API diff --git a/block/lane_test.go b/block/lane_test.go index 0813edb..4e15142 100644 --- a/block/lane_test.go +++ b/block/lane_test.go @@ -3,8 +3,8 @@ package block_test import ( "fmt" - "github.com/skip-mev/block-sdk/block" - "github.com/skip-mev/block-sdk/block/mocks" + "github.com/skip-mev/block-sdk/v2/block" + "github.com/skip-mev/block-sdk/v2/block/mocks" ) func (suite *BlockBusterTestSuite) TestFindLane() { diff --git a/block/mempool.go b/block/mempool.go index 50e7b77..d6f9f42 100644 --- a/block/mempool.go +++ b/block/mempool.go @@ -9,7 +9,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkmempool "github.com/cosmos/cosmos-sdk/types/mempool" - blocksdkmoduletypes "github.com/skip-mev/block-sdk/x/blocksdk/types" + blocksdkmoduletypes "github.com/skip-mev/block-sdk/v2/x/blocksdk/types" ) var _ Mempool = (*LanedMempool)(nil) diff --git a/block/mempool_test.go b/block/mempool_test.go index f842719..f28fafa 100644 --- a/block/mempool_test.go +++ b/block/mempool_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" - blocksdkmoduletypes "github.com/skip-mev/block-sdk/x/blocksdk/types" + blocksdkmoduletypes "github.com/skip-mev/block-sdk/v2/x/blocksdk/types" - "github.com/skip-mev/block-sdk/block/mocks" + "github.com/skip-mev/block-sdk/v2/block/mocks" "cosmossdk.io/log" "cosmossdk.io/math" @@ -16,14 +16,14 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" - signer_extraction "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter" - "github.com/skip-mev/block-sdk/block" - "github.com/skip-mev/block-sdk/block/base" - defaultlane "github.com/skip-mev/block-sdk/lanes/base" - "github.com/skip-mev/block-sdk/lanes/free" - "github.com/skip-mev/block-sdk/lanes/mev" - testutils "github.com/skip-mev/block-sdk/testutils" - auctiontypes "github.com/skip-mev/block-sdk/x/auction/types" + signer_extraction "github.com/skip-mev/block-sdk/v2/adapters/signer_extraction_adapter" + "github.com/skip-mev/block-sdk/v2/block" + "github.com/skip-mev/block-sdk/v2/block/base" + defaultlane "github.com/skip-mev/block-sdk/v2/lanes/base" + "github.com/skip-mev/block-sdk/v2/lanes/free" + "github.com/skip-mev/block-sdk/v2/lanes/mev" + testutils "github.com/skip-mev/block-sdk/v2/testutils" + auctiontypes "github.com/skip-mev/block-sdk/v2/x/auction/types" ) type BlockBusterTestSuite struct { diff --git a/block/mocks/lane.go b/block/mocks/lane.go index 70a243c..8d1f187 100644 --- a/block/mocks/lane.go +++ b/block/mocks/lane.go @@ -1,11 +1,11 @@ -// Code generated by mockery v2.30.1. DO NOT EDIT. +// Code generated by mockery v2.40.1. DO NOT EDIT. package mocks import ( context "context" - block "github.com/skip-mev/block-sdk/block" + block "github.com/skip-mev/block-sdk/v2/block" math "cosmossdk.io/math" @@ -13,11 +13,11 @@ import ( mock "github.com/stretchr/testify/mock" - proposals "github.com/skip-mev/block-sdk/block/proposals" + proposals "github.com/skip-mev/block-sdk/v2/block/proposals" types "github.com/cosmos/cosmos-sdk/types" - utils "github.com/skip-mev/block-sdk/block/utils" + utils "github.com/skip-mev/block-sdk/v2/block/utils" ) // Lane is an autogenerated mock type for the Lane type @@ -29,6 +29,10 @@ type Lane struct { func (_m *Lane) Compare(ctx types.Context, this types.Tx, other types.Tx) (int, error) { ret := _m.Called(ctx, this, other) + if len(ret) == 0 { + panic("no return value specified for Compare") + } + var r0 int var r1 error if rf, ok := ret.Get(0).(func(types.Context, types.Tx, types.Tx) (int, error)); ok { @@ -53,6 +57,10 @@ func (_m *Lane) Compare(ctx types.Context, this types.Tx, other types.Tx) (int, func (_m *Lane) Contains(tx types.Tx) bool { ret := _m.Called(tx) + if len(ret) == 0 { + panic("no return value specified for Contains") + } + var r0 bool if rf, ok := ret.Get(0).(func(types.Tx) bool); ok { r0 = rf(tx) @@ -67,6 +75,10 @@ func (_m *Lane) Contains(tx types.Tx) bool { func (_m *Lane) CountTx() int { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for CountTx") + } + var r0 int if rf, ok := ret.Get(0).(func() int); ok { r0 = rf() @@ -81,6 +93,10 @@ func (_m *Lane) CountTx() int { func (_m *Lane) GetMaxBlockSpace() math.LegacyDec { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for GetMaxBlockSpace") + } + var r0 math.LegacyDec if rf, ok := ret.Get(0).(func() math.LegacyDec); ok { r0 = rf() @@ -95,6 +111,10 @@ func (_m *Lane) GetMaxBlockSpace() math.LegacyDec { func (_m *Lane) GetTxInfo(ctx types.Context, tx types.Tx) (utils.TxWithInfo, error) { ret := _m.Called(ctx, tx) + if len(ret) == 0 { + panic("no return value specified for GetTxInfo") + } + var r0 utils.TxWithInfo var r1 error if rf, ok := ret.Get(0).(func(types.Context, types.Tx) (utils.TxWithInfo, error)); ok { @@ -119,6 +139,10 @@ func (_m *Lane) GetTxInfo(ctx types.Context, tx types.Tx) (utils.TxWithInfo, err func (_m *Lane) Insert(_a0 context.Context, _a1 types.Tx) error { ret := _m.Called(_a0, _a1) + if len(ret) == 0 { + panic("no return value specified for Insert") + } + var r0 error if rf, ok := ret.Get(0).(func(context.Context, types.Tx) error); ok { r0 = rf(_a0, _a1) @@ -133,6 +157,10 @@ func (_m *Lane) Insert(_a0 context.Context, _a1 types.Tx) error { func (_m *Lane) Match(ctx types.Context, tx types.Tx) bool { ret := _m.Called(ctx, tx) + if len(ret) == 0 { + panic("no return value specified for Match") + } + var r0 bool if rf, ok := ret.Get(0).(func(types.Context, types.Tx) bool); ok { r0 = rf(ctx, tx) @@ -147,6 +175,10 @@ func (_m *Lane) Match(ctx types.Context, tx types.Tx) bool { func (_m *Lane) Name() string { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for Name") + } + var r0 string if rf, ok := ret.Get(0).(func() string); ok { r0 = rf() @@ -161,6 +193,10 @@ func (_m *Lane) Name() string { func (_m *Lane) PrepareLane(ctx types.Context, proposal proposals.Proposal, next block.PrepareLanesHandler) (proposals.Proposal, error) { ret := _m.Called(ctx, proposal, next) + if len(ret) == 0 { + panic("no return value specified for PrepareLane") + } + var r0 proposals.Proposal var r1 error if rf, ok := ret.Get(0).(func(types.Context, proposals.Proposal, block.PrepareLanesHandler) (proposals.Proposal, error)); ok { @@ -185,6 +221,10 @@ func (_m *Lane) PrepareLane(ctx types.Context, proposal proposals.Proposal, next func (_m *Lane) Priority(ctx types.Context, tx types.Tx) interface{} { ret := _m.Called(ctx, tx) + if len(ret) == 0 { + panic("no return value specified for Priority") + } + var r0 interface{} if rf, ok := ret.Get(0).(func(types.Context, types.Tx) interface{}); ok { r0 = rf(ctx, tx) @@ -201,6 +241,10 @@ func (_m *Lane) Priority(ctx types.Context, tx types.Tx) interface{} { func (_m *Lane) ProcessLane(ctx types.Context, proposal proposals.Proposal, txs []types.Tx, next block.ProcessLanesHandler) (proposals.Proposal, error) { ret := _m.Called(ctx, proposal, txs, next) + if len(ret) == 0 { + panic("no return value specified for ProcessLane") + } + var r0 proposals.Proposal var r1 error if rf, ok := ret.Get(0).(func(types.Context, proposals.Proposal, []types.Tx, block.ProcessLanesHandler) (proposals.Proposal, error)); ok { @@ -225,6 +269,10 @@ func (_m *Lane) ProcessLane(ctx types.Context, proposal proposals.Proposal, txs func (_m *Lane) Remove(_a0 types.Tx) error { ret := _m.Called(_a0) + if len(ret) == 0 { + panic("no return value specified for Remove") + } + var r0 error if rf, ok := ret.Get(0).(func(types.Tx) error); ok { r0 = rf(_a0) @@ -239,6 +287,10 @@ func (_m *Lane) Remove(_a0 types.Tx) error { func (_m *Lane) Select(_a0 context.Context, _a1 [][]byte) mempool.Iterator { ret := _m.Called(_a0, _a1) + if len(ret) == 0 { + panic("no return value specified for Select") + } + var r0 mempool.Iterator if rf, ok := ret.Get(0).(func(context.Context, [][]byte) mempool.Iterator); ok { r0 = rf(_a0, _a1) diff --git a/block/mocks/lane_fetcher.go b/block/mocks/lane_fetcher.go index d7c9372..6c95fd7 100644 --- a/block/mocks/lane_fetcher.go +++ b/block/mocks/lane_fetcher.go @@ -3,7 +3,7 @@ package mocks import ( sdk "github.com/cosmos/cosmos-sdk/types" - blocksdkmoduletypes "github.com/skip-mev/block-sdk/x/blocksdk/types" + blocksdkmoduletypes "github.com/skip-mev/block-sdk/v2/x/blocksdk/types" ) type MockLaneFetcher struct { diff --git a/block/mocks/lane_mempool.go b/block/mocks/lane_mempool.go index 530cf0f..63797e3 100644 --- a/block/mocks/lane_mempool.go +++ b/block/mocks/lane_mempool.go @@ -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 LaneMempool struct { func (_m *LaneMempool) Compare(ctx types.Context, this types.Tx, other types.Tx) (int, error) { ret := _m.Called(ctx, this, other) + if len(ret) == 0 { + panic("no return value specified for Compare") + } + var r0 int var r1 error if rf, ok := ret.Get(0).(func(types.Context, types.Tx, types.Tx) (int, error)); ok { @@ -44,6 +48,10 @@ func (_m *LaneMempool) Compare(ctx types.Context, this types.Tx, other types.Tx) func (_m *LaneMempool) Contains(tx types.Tx) bool { ret := _m.Called(tx) + if len(ret) == 0 { + panic("no return value specified for Contains") + } + var r0 bool if rf, ok := ret.Get(0).(func(types.Tx) bool); ok { r0 = rf(tx) @@ -58,6 +66,10 @@ func (_m *LaneMempool) Contains(tx types.Tx) bool { func (_m *LaneMempool) CountTx() int { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for CountTx") + } + var r0 int if rf, ok := ret.Get(0).(func() int); ok { r0 = rf() @@ -72,6 +84,10 @@ func (_m *LaneMempool) CountTx() int { func (_m *LaneMempool) Insert(_a0 context.Context, _a1 types.Tx) error { ret := _m.Called(_a0, _a1) + if len(ret) == 0 { + panic("no return value specified for Insert") + } + var r0 error if rf, ok := ret.Get(0).(func(context.Context, types.Tx) error); ok { r0 = rf(_a0, _a1) @@ -86,6 +102,10 @@ func (_m *LaneMempool) Insert(_a0 context.Context, _a1 types.Tx) error { func (_m *LaneMempool) Priority(ctx types.Context, tx types.Tx) interface{} { ret := _m.Called(ctx, tx) + if len(ret) == 0 { + panic("no return value specified for Priority") + } + var r0 interface{} if rf, ok := ret.Get(0).(func(types.Context, types.Tx) interface{}); ok { r0 = rf(ctx, tx) @@ -102,6 +122,10 @@ func (_m *LaneMempool) Priority(ctx types.Context, tx types.Tx) interface{} { func (_m *LaneMempool) Remove(_a0 types.Tx) error { ret := _m.Called(_a0) + if len(ret) == 0 { + panic("no return value specified for Remove") + } + var r0 error if rf, ok := ret.Get(0).(func(types.Tx) error); ok { r0 = rf(_a0) @@ -116,6 +140,10 @@ func (_m *LaneMempool) Remove(_a0 types.Tx) error { func (_m *LaneMempool) Select(_a0 context.Context, _a1 [][]byte) mempool.Iterator { ret := _m.Called(_a0, _a1) + if len(ret) == 0 { + panic("no return value specified for Select") + } + var r0 mempool.Iterator if rf, ok := ret.Get(0).(func(context.Context, [][]byte) mempool.Iterator); ok { r0 = rf(_a0, _a1) diff --git a/block/proposals/proposals.go b/block/proposals/proposals.go index 24b9304..1dbe8f4 100644 --- a/block/proposals/proposals.go +++ b/block/proposals/proposals.go @@ -5,7 +5,7 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/skip-mev/block-sdk/block/proposals/types" + "github.com/skip-mev/block-sdk/v2/block/proposals/types" ) type ( diff --git a/block/proposals/proposals_test.go b/block/proposals/proposals_test.go index 507b543..c675ab5 100644 --- a/block/proposals/proposals_test.go +++ b/block/proposals/proposals_test.go @@ -9,14 +9,14 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - signerextraction "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter" - "github.com/skip-mev/block-sdk/block/base" - "github.com/skip-mev/block-sdk/block/mocks" - "github.com/skip-mev/block-sdk/block/proposals" - "github.com/skip-mev/block-sdk/block/proposals/types" - "github.com/skip-mev/block-sdk/block/utils" - defaultlane "github.com/skip-mev/block-sdk/lanes/base" - "github.com/skip-mev/block-sdk/testutils" + signerextraction "github.com/skip-mev/block-sdk/v2/adapters/signer_extraction_adapter" + "github.com/skip-mev/block-sdk/v2/block/base" + "github.com/skip-mev/block-sdk/v2/block/mocks" + "github.com/skip-mev/block-sdk/v2/block/proposals" + "github.com/skip-mev/block-sdk/v2/block/proposals/types" + "github.com/skip-mev/block-sdk/v2/block/utils" + defaultlane "github.com/skip-mev/block-sdk/v2/lanes/base" + "github.com/skip-mev/block-sdk/v2/testutils" ) func TestUpdateProposal(t *testing.T) { diff --git a/block/proposals/update.go b/block/proposals/update.go index dfaf185..812f641 100644 --- a/block/proposals/update.go +++ b/block/proposals/update.go @@ -5,7 +5,7 @@ import ( "cosmossdk.io/math" - "github.com/skip-mev/block-sdk/block/utils" + "github.com/skip-mev/block-sdk/v2/block/utils" ) // Lane defines the contract interface for a lane. diff --git a/block/service/service.go b/block/service/service.go index 20f277f..2152c44 100644 --- a/block/service/service.go +++ b/block/service/service.go @@ -6,8 +6,8 @@ import ( gogogrpc "github.com/cosmos/gogoproto/grpc" "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/skip-mev/block-sdk/block" - "github.com/skip-mev/block-sdk/block/service/types" + "github.com/skip-mev/block-sdk/v2/block" + "github.com/skip-mev/block-sdk/v2/block/service/types" ) var _ types.ServiceServer = (*QueryService)(nil) diff --git a/block/service/service_test.go b/block/service/service_test.go index bfc54a7..e1d19b3 100644 --- a/block/service/service_test.go +++ b/block/service/service_test.go @@ -10,14 +10,14 @@ import ( "github.com/stretchr/testify/require" - "github.com/skip-mev/block-sdk/block" - "github.com/skip-mev/block-sdk/block/service" - "github.com/skip-mev/block-sdk/block/service/types" - "github.com/skip-mev/block-sdk/lanes/base" - "github.com/skip-mev/block-sdk/lanes/free" - "github.com/skip-mev/block-sdk/lanes/mev" - "github.com/skip-mev/block-sdk/testutils" - "github.com/skip-mev/block-sdk/testutils/mempool" + "github.com/skip-mev/block-sdk/v2/block" + "github.com/skip-mev/block-sdk/v2/block/service" + "github.com/skip-mev/block-sdk/v2/block/service/types" + "github.com/skip-mev/block-sdk/v2/lanes/base" + "github.com/skip-mev/block-sdk/v2/lanes/free" + "github.com/skip-mev/block-sdk/v2/lanes/mev" + "github.com/skip-mev/block-sdk/v2/testutils" + "github.com/skip-mev/block-sdk/v2/testutils/mempool" ) func TestGetTxDistribution(t *testing.T) { diff --git a/block/types.go b/block/types.go index e00f8df..183c7fe 100644 --- a/block/types.go +++ b/block/types.go @@ -3,7 +3,7 @@ package block import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/skip-mev/block-sdk/block/proposals" + "github.com/skip-mev/block-sdk/v2/block/proposals" ) type ( diff --git a/block/utils/utils.go b/block/utils/utils.go index 82fad10..aaa747a 100644 --- a/block/utils/utils.go +++ b/block/utils/utils.go @@ -9,7 +9,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkmempool "github.com/cosmos/cosmos-sdk/types/mempool" - signerextraction "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter" + signerextraction "github.com/skip-mev/block-sdk/v2/adapters/signer_extraction_adapter" ) // TxWithInfo contains the information required for a transaction to be diff --git a/go.mod b/go.mod index 15561be..33a5776 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/skip-mev/block-sdk +module github.com/skip-mev/block-sdk/v2 go 1.21.5 diff --git a/lanes/base/abci_test.go b/lanes/base/abci_test.go index 39679eb..d94ae1a 100644 --- a/lanes/base/abci_test.go +++ b/lanes/base/abci_test.go @@ -11,14 +11,14 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - signer_extraction "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter" - "github.com/skip-mev/block-sdk/block" - "github.com/skip-mev/block-sdk/block/base" - "github.com/skip-mev/block-sdk/block/mocks" - "github.com/skip-mev/block-sdk/block/proposals" - "github.com/skip-mev/block-sdk/block/utils" - defaultlane "github.com/skip-mev/block-sdk/lanes/base" - testutils "github.com/skip-mev/block-sdk/testutils" + signer_extraction "github.com/skip-mev/block-sdk/v2/adapters/signer_extraction_adapter" + "github.com/skip-mev/block-sdk/v2/block" + "github.com/skip-mev/block-sdk/v2/block/base" + "github.com/skip-mev/block-sdk/v2/block/mocks" + "github.com/skip-mev/block-sdk/v2/block/proposals" + "github.com/skip-mev/block-sdk/v2/block/utils" + defaultlane "github.com/skip-mev/block-sdk/v2/lanes/base" + testutils "github.com/skip-mev/block-sdk/v2/testutils" ) func (s *BaseTestSuite) TestPrepareLane() { diff --git a/lanes/base/base_test.go b/lanes/base/base_test.go index cf6c2ef..1c91547 100644 --- a/lanes/base/base_test.go +++ b/lanes/base/base_test.go @@ -9,8 +9,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" - 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" ) type BaseTestSuite struct { diff --git a/lanes/base/lane.go b/lanes/base/lane.go index e573945..85fbc4a 100644 --- a/lanes/base/lane.go +++ b/lanes/base/lane.go @@ -1,7 +1,7 @@ package base import ( - "github.com/skip-mev/block-sdk/block/base" + "github.com/skip-mev/block-sdk/v2/block/base" ) const ( diff --git a/lanes/base/mempool_test.go b/lanes/base/mempool_test.go index 8fd4abe..8521c1a 100644 --- a/lanes/base/mempool_test.go +++ b/lanes/base/mempool_test.go @@ -4,9 +4,9 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - signer_extraction "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter" - "github.com/skip-mev/block-sdk/block/base" - testutils "github.com/skip-mev/block-sdk/testutils" + signer_extraction "github.com/skip-mev/block-sdk/v2/adapters/signer_extraction_adapter" + "github.com/skip-mev/block-sdk/v2/block/base" + testutils "github.com/skip-mev/block-sdk/v2/testutils" ) func (s *BaseTestSuite) TestCompareTxPriority() { diff --git a/lanes/base/tx_info_test.go b/lanes/base/tx_info_test.go index 77d86a0..78b992c 100644 --- a/lanes/base/tx_info_test.go +++ b/lanes/base/tx_info_test.go @@ -6,7 +6,7 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/skip-mev/block-sdk/testutils" + "github.com/skip-mev/block-sdk/v2/testutils" ) func (s *BaseTestSuite) TestGetTxInfo() { diff --git a/lanes/free/lane.go b/lanes/free/lane.go index 132b2af..99e031d 100644 --- a/lanes/free/lane.go +++ b/lanes/free/lane.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/skip-mev/block-sdk/block/base" + "github.com/skip-mev/block-sdk/v2/block/base" ) const ( diff --git a/lanes/mev/abci.go b/lanes/mev/abci.go index 7b00e3b..ecab72f 100644 --- a/lanes/mev/abci.go +++ b/lanes/mev/abci.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/skip-mev/block-sdk/block/base" - "github.com/skip-mev/block-sdk/block/proposals" + "github.com/skip-mev/block-sdk/v2/block/base" + "github.com/skip-mev/block-sdk/v2/block/proposals" ) // Implements the MEV lane's PrepareLaneHandler and ProcessLaneHandler. diff --git a/lanes/mev/abci_test.go b/lanes/mev/abci_test.go index 95680b9..2db057e 100644 --- a/lanes/mev/abci_test.go +++ b/lanes/mev/abci_test.go @@ -5,11 +5,11 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/skip-mev/block-sdk/block" - "github.com/skip-mev/block-sdk/block/proposals" - "github.com/skip-mev/block-sdk/block/utils" - "github.com/skip-mev/block-sdk/lanes/mev" - testutils "github.com/skip-mev/block-sdk/testutils" + "github.com/skip-mev/block-sdk/v2/block" + "github.com/skip-mev/block-sdk/v2/block/proposals" + "github.com/skip-mev/block-sdk/v2/block/utils" + "github.com/skip-mev/block-sdk/v2/lanes/mev" + testutils "github.com/skip-mev/block-sdk/v2/testutils" ) func (s *MEVTestSuite) TestPrepareLane() { diff --git a/lanes/mev/factory.go b/lanes/mev/factory.go index 6e58099..637d331 100644 --- a/lanes/mev/factory.go +++ b/lanes/mev/factory.go @@ -5,9 +5,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - signer_extraction "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter" - "github.com/skip-mev/block-sdk/block/base" - "github.com/skip-mev/block-sdk/x/auction/types" + signer_extraction "github.com/skip-mev/block-sdk/v2/adapters/signer_extraction_adapter" + "github.com/skip-mev/block-sdk/v2/block/base" + "github.com/skip-mev/block-sdk/v2/x/auction/types" ) type ( diff --git a/lanes/mev/factory_test.go b/lanes/mev/factory_test.go index 24f78f2..5ced2b7 100644 --- a/lanes/mev/factory_test.go +++ b/lanes/mev/factory_test.go @@ -6,7 +6,7 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - testutils "github.com/skip-mev/block-sdk/testutils" + testutils "github.com/skip-mev/block-sdk/v2/testutils" ) func (s *MEVTestSuite) TestIsAuctionTx() { diff --git a/lanes/mev/lane.go b/lanes/mev/lane.go index 485cbb9..a7cffc6 100644 --- a/lanes/mev/lane.go +++ b/lanes/mev/lane.go @@ -1,7 +1,7 @@ package mev import ( - "github.com/skip-mev/block-sdk/block/base" + "github.com/skip-mev/block-sdk/v2/block/base" ) const ( diff --git a/lanes/mev/mempool.go b/lanes/mev/mempool.go index a7e8cdc..18e3ae3 100644 --- a/lanes/mev/mempool.go +++ b/lanes/mev/mempool.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/skip-mev/block-sdk/block/base" + "github.com/skip-mev/block-sdk/v2/block/base" ) // TxPriority returns a TxPriority over mev lane transactions only. It diff --git a/lanes/mev/mev_test.go b/lanes/mev/mev_test.go index a04487e..b397617 100644 --- a/lanes/mev/mev_test.go +++ b/lanes/mev/mev_test.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" - "github.com/skip-mev/block-sdk/block/utils" - "github.com/skip-mev/block-sdk/lanes/mev/testutils" + "github.com/skip-mev/block-sdk/v2/block/utils" + "github.com/skip-mev/block-sdk/v2/lanes/mev/testutils" ) type MEVTestSuite struct { diff --git a/lanes/mev/testutils/testutil.go b/lanes/mev/testutils/testutil.go index 5b72fe7..ffa4eb0 100644 --- a/lanes/mev/testutils/testutil.go +++ b/lanes/mev/testutils/testutil.go @@ -14,10 +14,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" - signer_extraction "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter" - "github.com/skip-mev/block-sdk/block/base" - "github.com/skip-mev/block-sdk/lanes/mev" - testutils "github.com/skip-mev/block-sdk/testutils" + signer_extraction "github.com/skip-mev/block-sdk/v2/adapters/signer_extraction_adapter" + "github.com/skip-mev/block-sdk/v2/block/base" + "github.com/skip-mev/block-sdk/v2/lanes/mev" + testutils "github.com/skip-mev/block-sdk/v2/testutils" ) type MEVLaneTestSuiteBase struct { diff --git a/lanes/mev/utils.go b/lanes/mev/utils.go index 7802ddd..a2ea811 100644 --- a/lanes/mev/utils.go +++ b/lanes/mev/utils.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - auctiontypes "github.com/skip-mev/block-sdk/x/auction/types" + auctiontypes "github.com/skip-mev/block-sdk/v2/x/auction/types" ) // GetMsgAuctionBidFromTx attempts to retrieve a MsgAuctionBid from an sdk.Tx if diff --git a/lanes/mev/utils_test.go b/lanes/mev/utils_test.go index 9f97512..3c130ea 100644 --- a/lanes/mev/utils_test.go +++ b/lanes/mev/utils_test.go @@ -6,9 +6,9 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/stretchr/testify/require" - "github.com/skip-mev/block-sdk/lanes/mev" - testutils "github.com/skip-mev/block-sdk/testutils" - auctiontypes "github.com/skip-mev/block-sdk/x/auction/types" + "github.com/skip-mev/block-sdk/v2/lanes/mev" + testutils "github.com/skip-mev/block-sdk/v2/testutils" + auctiontypes "github.com/skip-mev/block-sdk/v2/x/auction/types" ) func TestGetMsgAuctionBidFromTx_Valid(t *testing.T) { diff --git a/lanes/terminator/lane.go b/lanes/terminator/lane.go index f6a2d7a..50cdb79 100644 --- a/lanes/terminator/lane.go +++ b/lanes/terminator/lane.go @@ -9,9 +9,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkmempool "github.com/cosmos/cosmos-sdk/types/mempool" - "github.com/skip-mev/block-sdk/block" - "github.com/skip-mev/block-sdk/block/proposals" - "github.com/skip-mev/block-sdk/block/utils" + "github.com/skip-mev/block-sdk/v2/block" + "github.com/skip-mev/block-sdk/v2/block/proposals" + "github.com/skip-mev/block-sdk/v2/block/utils" ) const ( diff --git a/tests/app/ante.go b/tests/app/ante.go index 6a8f59b..2a747bc 100644 --- a/tests/app/ante.go +++ b/tests/app/ante.go @@ -4,9 +4,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth/ante" - "github.com/skip-mev/block-sdk/block" - auctionante "github.com/skip-mev/block-sdk/x/auction/ante" - auctionkeeper "github.com/skip-mev/block-sdk/x/auction/keeper" + "github.com/skip-mev/block-sdk/v2/block" + auctionante "github.com/skip-mev/block-sdk/v2/x/auction/ante" + auctionkeeper "github.com/skip-mev/block-sdk/v2/x/auction/keeper" ) type BSDKHandlerOptions struct { diff --git a/tests/app/app.go b/tests/app/app.go index 8e91a68..f6a6586 100644 --- a/tests/app/app.go +++ b/tests/app/app.go @@ -41,13 +41,13 @@ import ( slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" - "github.com/skip-mev/block-sdk/abci" - "github.com/skip-mev/block-sdk/abci/checktx" - "github.com/skip-mev/block-sdk/block" - "github.com/skip-mev/block-sdk/block/base" - service "github.com/skip-mev/block-sdk/block/service" - auctionkeeper "github.com/skip-mev/block-sdk/x/auction/keeper" - blocksdkkeeper "github.com/skip-mev/block-sdk/x/blocksdk/keeper" + "github.com/skip-mev/block-sdk/v2/abci" + "github.com/skip-mev/block-sdk/v2/abci/checktx" + "github.com/skip-mev/block-sdk/v2/block" + "github.com/skip-mev/block-sdk/v2/block/base" + service "github.com/skip-mev/block-sdk/v2/block/service" + auctionkeeper "github.com/skip-mev/block-sdk/v2/x/auction/keeper" + blocksdkkeeper "github.com/skip-mev/block-sdk/v2/x/blocksdk/keeper" ) const ( diff --git a/tests/app/config.go b/tests/app/config.go index 8731b45..5ed0410 100644 --- a/tests/app/config.go +++ b/tests/app/config.go @@ -66,12 +66,12 @@ import ( _ "github.com/cosmos/cosmos-sdk/x/slashing" // import for side-effects _ "github.com/cosmos/cosmos-sdk/x/staking" // import for side-effects - auctionmodulev1 "github.com/skip-mev/block-sdk/api/sdk/auction/module/v1" - blocksdkmodulev1 "github.com/skip-mev/block-sdk/api/sdk/blocksdk/module/v1" - _ "github.com/skip-mev/block-sdk/x/auction" // import for side-effects - auctiontypes "github.com/skip-mev/block-sdk/x/auction/types" - _ "github.com/skip-mev/block-sdk/x/blocksdk" // import for side-effects - blocksdktypes "github.com/skip-mev/block-sdk/x/blocksdk/types" + auctionmodulev1 "github.com/skip-mev/block-sdk/v2/api/sdk/auction/module/v1" + blocksdkmodulev1 "github.com/skip-mev/block-sdk/v2/api/sdk/blocksdk/module/v1" + _ "github.com/skip-mev/block-sdk/v2/x/auction" // import for side-effects + auctiontypes "github.com/skip-mev/block-sdk/v2/x/auction/types" + _ "github.com/skip-mev/block-sdk/v2/x/blocksdk" // import for side-effects + blocksdktypes "github.com/skip-mev/block-sdk/v2/x/blocksdk/types" ) var ( diff --git a/tests/app/lanes.go b/tests/app/lanes.go index ef2549e..5d0564d 100644 --- a/tests/app/lanes.go +++ b/tests/app/lanes.go @@ -3,11 +3,11 @@ package app import ( "cosmossdk.io/math" - signerextraction "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter" - "github.com/skip-mev/block-sdk/block/base" - defaultlane "github.com/skip-mev/block-sdk/lanes/base" - freelane "github.com/skip-mev/block-sdk/lanes/free" - mevlane "github.com/skip-mev/block-sdk/lanes/mev" + signerextraction "github.com/skip-mev/block-sdk/v2/adapters/signer_extraction_adapter" + "github.com/skip-mev/block-sdk/v2/block/base" + defaultlane "github.com/skip-mev/block-sdk/v2/lanes/base" + freelane "github.com/skip-mev/block-sdk/v2/lanes/free" + mevlane "github.com/skip-mev/block-sdk/v2/lanes/mev" ) // CreateLanes walks through the process of creating the lanes for the block sdk. In this function diff --git a/tests/app/testappd/cmd/root.go b/tests/app/testappd/cmd/root.go index a0700b3..02fe5d7 100644 --- a/tests/app/testappd/cmd/root.go +++ b/tests/app/testappd/cmd/root.go @@ -15,7 +15,7 @@ import ( "cosmossdk.io/log" confixcmd "cosmossdk.io/tools/confix/cmd" - "github.com/skip-mev/block-sdk/tests/app" + "github.com/skip-mev/block-sdk/v2/tests/app" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/config" diff --git a/tests/app/testappd/cmd/testnet.go b/tests/app/testappd/cmd/testnet.go index 3be575b..7d78082 100644 --- a/tests/app/testappd/cmd/testnet.go +++ b/tests/app/testappd/cmd/testnet.go @@ -16,7 +16,7 @@ import ( "cosmossdk.io/math" "cosmossdk.io/math/unsafe" - "github.com/skip-mev/block-sdk/tests/app" + "github.com/skip-mev/block-sdk/v2/tests/app" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" diff --git a/tests/app/testappd/main.go b/tests/app/testappd/main.go index 7af8e77..de0ba9d 100644 --- a/tests/app/testappd/main.go +++ b/tests/app/testappd/main.go @@ -6,8 +6,8 @@ import ( "cosmossdk.io/log" svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" - "github.com/skip-mev/block-sdk/tests/app" - "github.com/skip-mev/block-sdk/tests/app/testappd/cmd" + "github.com/skip-mev/block-sdk/v2/tests/app" + "github.com/skip-mev/block-sdk/v2/tests/app/testappd/cmd" ) func main() { diff --git a/tests/e2e/block_sdk_e2e_test.go b/tests/e2e/block_sdk_e2e_test.go index a8d4f59..06c8d0c 100644 --- a/tests/e2e/block_sdk_e2e_test.go +++ b/tests/e2e/block_sdk_e2e_test.go @@ -13,12 +13,12 @@ import ( ictestutil "github.com/strangelove-ventures/interchaintest/v8/testutil" "github.com/stretchr/testify/suite" - "github.com/skip-mev/block-sdk/lanes/base" - "github.com/skip-mev/block-sdk/lanes/free" - "github.com/skip-mev/block-sdk/lanes/mev" - "github.com/skip-mev/block-sdk/tests/e2e" - auctiontypes "github.com/skip-mev/block-sdk/x/auction/types" - blocksdkmoduletypes "github.com/skip-mev/block-sdk/x/blocksdk/types" + "github.com/skip-mev/block-sdk/v2/lanes/base" + "github.com/skip-mev/block-sdk/v2/lanes/free" + "github.com/skip-mev/block-sdk/v2/lanes/mev" + "github.com/skip-mev/block-sdk/v2/tests/e2e" + auctiontypes "github.com/skip-mev/block-sdk/v2/x/auction/types" + blocksdkmoduletypes "github.com/skip-mev/block-sdk/v2/x/blocksdk/types" ) var ( diff --git a/tests/e2e/block_sdk_suite.go b/tests/e2e/block_sdk_suite.go index c585634..a125031 100644 --- a/tests/e2e/block_sdk_suite.go +++ b/tests/e2e/block_sdk_suite.go @@ -18,8 +18,8 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/skip-mev/block-sdk/lanes/base" - "github.com/skip-mev/block-sdk/lanes/free" + "github.com/skip-mev/block-sdk/v2/lanes/base" + "github.com/skip-mev/block-sdk/v2/lanes/free" ) const ( diff --git a/tests/e2e/chain_setup.go b/tests/e2e/chain_setup.go index 48fa890..77cabb0 100644 --- a/tests/e2e/chain_setup.go +++ b/tests/e2e/chain_setup.go @@ -37,8 +37,8 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - servicetypes "github.com/skip-mev/block-sdk/block/service/types" - auctiontypes "github.com/skip-mev/block-sdk/x/auction/types" + servicetypes "github.com/skip-mev/block-sdk/v2/block/service/types" + auctiontypes "github.com/skip-mev/block-sdk/v2/x/auction/types" ) type KeyringOverride struct { diff --git a/tests/e2e/go.mod b/tests/e2e/go.mod index 4d0af3f..5286acb 100644 --- a/tests/e2e/go.mod +++ b/tests/e2e/go.mod @@ -1,4 +1,4 @@ -module github.com/skip-mev/block-sdk/tests/e2e +module github.com/skip-mev/block-sdk/v2/tests/e2e go 1.21.5 @@ -6,14 +6,14 @@ replace ( github.com/ChainSafe/go-schnorrkel => github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d github.com/ChainSafe/go-schnorrkel/1 => github.com/ChainSafe/go-schnorrkel v1.0.0 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 - github.com/skip-mev/block-sdk => ../../ + github.com/skip-mev/block-sdk/v2 => ../../ ) require ( cosmossdk.io/math v1.2.0 github.com/cometbft/cometbft v0.38.2 github.com/cosmos/cosmos-sdk v0.50.2 - github.com/skip-mev/block-sdk v1.0.0 // reference local + github.com/skip-mev/block-sdk/v2 v2.1.0 // reference local github.com/strangelove-ventures/interchaintest/v8 v8.0.0 github.com/stretchr/testify v1.8.4 go.uber.org/zap v1.26.0 @@ -235,7 +235,7 @@ require ( google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect - google.golang.org/protobuf v1.31.0 // indirect + google.golang.org/protobuf v1.32.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/tests/e2e/go.sum b/tests/e2e/go.sum index 682f01e..5b729a3 100644 --- a/tests/e2e/go.sum +++ b/tests/e2e/go.sum @@ -1759,8 +1759,8 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= +google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/tests/integration/integration_test.go b/tests/integration/integration_test.go index 05f3e71..85ed292 100644 --- a/tests/integration/integration_test.go +++ b/tests/integration/integration_test.go @@ -8,9 +8,9 @@ import ( "github.com/skip-mev/chaintestutil/encoding" "github.com/stretchr/testify/suite" - testkeeper "github.com/skip-mev/block-sdk/testutils/keeper" - auctiontypes "github.com/skip-mev/block-sdk/x/auction/types" - blocksdktypes "github.com/skip-mev/block-sdk/x/blocksdk/types" + testkeeper "github.com/skip-mev/block-sdk/v2/testutils/keeper" + auctiontypes "github.com/skip-mev/block-sdk/v2/x/auction/types" + blocksdktypes "github.com/skip-mev/block-sdk/v2/x/blocksdk/types" ) type IntegrationTestSuite struct { diff --git a/tests/integration/network/auction_test.go b/tests/integration/network/auction_test.go index 40c05b9..0a6ec37 100644 --- a/tests/integration/network/auction_test.go +++ b/tests/integration/network/auction_test.go @@ -12,7 +12,7 @@ import ( "github.com/skip-mev/chaintestutil/network" "github.com/stretchr/testify/require" - auctiontypes "github.com/skip-mev/block-sdk/x/auction/types" + auctiontypes "github.com/skip-mev/block-sdk/v2/x/auction/types" ) func (s *NetworkTestSuite) TestAuctionWithValidBids() { diff --git a/tests/integration/network/mempool_test.go b/tests/integration/network/mempool_test.go index 1a34559..f1966bb 100644 --- a/tests/integration/network/mempool_test.go +++ b/tests/integration/network/mempool_test.go @@ -20,8 +20,8 @@ import ( "github.com/skip-mev/chaintestutil/account" "github.com/skip-mev/chaintestutil/network" - blockservicetypes "github.com/skip-mev/block-sdk/block/service/types" - auctiontypes "github.com/skip-mev/block-sdk/x/auction/types" + blockservicetypes "github.com/skip-mev/block-sdk/v2/block/service/types" + auctiontypes "github.com/skip-mev/block-sdk/v2/x/auction/types" ) const ( diff --git a/tests/integration/network/network_test.go b/tests/integration/network/network_test.go index ce2ffa8..f0ac86b 100644 --- a/tests/integration/network/network_test.go +++ b/tests/integration/network/network_test.go @@ -19,9 +19,9 @@ import ( "github.com/stretchr/testify/suite" "google.golang.org/grpc/status" - "github.com/skip-mev/block-sdk/testutils/networksuite" - auctiontypes "github.com/skip-mev/block-sdk/x/auction/types" - blocksdktypes "github.com/skip-mev/block-sdk/x/blocksdk/types" + "github.com/skip-mev/block-sdk/v2/testutils/networksuite" + auctiontypes "github.com/skip-mev/block-sdk/v2/x/auction/types" + blocksdktypes "github.com/skip-mev/block-sdk/v2/x/blocksdk/types" ) // NetworkTestSuite is a test suite for network integration tests. diff --git a/testutils/keeper/keeper.go b/testutils/keeper/keeper.go index 72d243d..5206a65 100644 --- a/testutils/keeper/keeper.go +++ b/testutils/keeper/keeper.go @@ -19,13 +19,13 @@ import ( testkeeper "github.com/skip-mev/chaintestutil/keeper" "github.com/stretchr/testify/require" - "github.com/skip-mev/block-sdk/lanes/base" - "github.com/skip-mev/block-sdk/lanes/free" - "github.com/skip-mev/block-sdk/lanes/mev" - auctionkeeper "github.com/skip-mev/block-sdk/x/auction/keeper" - auctiontypes "github.com/skip-mev/block-sdk/x/auction/types" - blocksdkkeeper "github.com/skip-mev/block-sdk/x/blocksdk/keeper" - blocksdktypes "github.com/skip-mev/block-sdk/x/blocksdk/types" + "github.com/skip-mev/block-sdk/v2/lanes/base" + "github.com/skip-mev/block-sdk/v2/lanes/free" + "github.com/skip-mev/block-sdk/v2/lanes/mev" + auctionkeeper "github.com/skip-mev/block-sdk/v2/x/auction/keeper" + auctiontypes "github.com/skip-mev/block-sdk/v2/x/auction/types" + blocksdkkeeper "github.com/skip-mev/block-sdk/v2/x/blocksdk/keeper" + blocksdktypes "github.com/skip-mev/block-sdk/v2/x/blocksdk/types" ) // TestKeepers holds all keepers used during keeper tests for all modules diff --git a/testutils/mempool/mempool.go b/testutils/mempool/mempool.go index 41980cf..9e85d35 100644 --- a/testutils/mempool/mempool.go +++ b/testutils/mempool/mempool.go @@ -4,15 +4,15 @@ import ( "cosmossdk.io/log" "cosmossdk.io/math" - "github.com/skip-mev/block-sdk/block/mocks" + "github.com/skip-mev/block-sdk/v2/block/mocks" - signerextraction "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter" - "github.com/skip-mev/block-sdk/block" - "github.com/skip-mev/block-sdk/block/base" - defaultlane "github.com/skip-mev/block-sdk/lanes/base" - "github.com/skip-mev/block-sdk/lanes/free" - "github.com/skip-mev/block-sdk/lanes/mev" - "github.com/skip-mev/block-sdk/testutils" + signerextraction "github.com/skip-mev/block-sdk/v2/adapters/signer_extraction_adapter" + "github.com/skip-mev/block-sdk/v2/block" + "github.com/skip-mev/block-sdk/v2/block/base" + defaultlane "github.com/skip-mev/block-sdk/v2/lanes/base" + "github.com/skip-mev/block-sdk/v2/lanes/free" + "github.com/skip-mev/block-sdk/v2/lanes/mev" + "github.com/skip-mev/block-sdk/v2/testutils" ) func CreateMempool() *block.LanedMempool { diff --git a/testutils/networksuite/networksuite.go b/testutils/networksuite/networksuite.go index 85d46bf..53adb3f 100644 --- a/testutils/networksuite/networksuite.go +++ b/testutils/networksuite/networksuite.go @@ -25,12 +25,12 @@ import ( "github.com/skip-mev/chaintestutil/account" - "github.com/skip-mev/block-sdk/lanes/base" - "github.com/skip-mev/block-sdk/lanes/free" - "github.com/skip-mev/block-sdk/lanes/mev" - "github.com/skip-mev/block-sdk/tests/app" - auctiontypes "github.com/skip-mev/block-sdk/x/auction/types" - blocksdktypes "github.com/skip-mev/block-sdk/x/blocksdk/types" + "github.com/skip-mev/block-sdk/v2/lanes/base" + "github.com/skip-mev/block-sdk/v2/lanes/free" + "github.com/skip-mev/block-sdk/v2/lanes/mev" + "github.com/skip-mev/block-sdk/v2/tests/app" + auctiontypes "github.com/skip-mev/block-sdk/v2/x/auction/types" + blocksdktypes "github.com/skip-mev/block-sdk/v2/x/blocksdk/types" ) var ( diff --git a/testutils/utils.go b/testutils/utils.go index 42ba0a1..847794d 100644 --- a/testutils/utils.go +++ b/testutils/utils.go @@ -24,7 +24,7 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/cosmos/gogoproto/proto" - auctiontypes "github.com/skip-mev/block-sdk/x/auction/types" + auctiontypes "github.com/skip-mev/block-sdk/v2/x/auction/types" ) type EncodingConfig struct { diff --git a/x/auction/ante/utils.go b/x/auction/ante/utils.go index 81b7a17..3a7b1ef 100644 --- a/x/auction/ante/utils.go +++ b/x/auction/ante/utils.go @@ -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 diff --git a/x/auction/client/cli/query.go b/x/auction/client/cli/query.go index b6d20bd..c3e66a2 100644 --- a/x/auction/client/cli/query.go +++ b/x/auction/client/cli/query.go @@ -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. diff --git a/x/auction/client/cli/tx.go b/x/auction/client/cli/tx.go index 0b23ca5..c1931c1 100644 --- a/x/auction/client/cli/tx.go +++ b/x/auction/client/cli/tx.go @@ -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 diff --git a/x/auction/keeper/auction.go b/x/auction/keeper/auction.go index 2ec0e32..66cdc1a 100644 --- a/x/auction/keeper/auction.go +++ b/x/auction/keeper/auction.go @@ -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. diff --git a/x/auction/keeper/auction_test.go b/x/auction/keeper/auction_test.go index 1e11f3f..e1eb6a4 100644 --- a/x/auction/keeper/auction_test.go +++ b/x/auction/keeper/auction_test.go @@ -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() { diff --git a/x/auction/keeper/genesis.go b/x/auction/keeper/genesis.go index f7a3ac1..6a1cbd5 100644 --- a/x/auction/keeper/genesis.go +++ b/x/auction/keeper/genesis.go @@ -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. diff --git a/x/auction/keeper/grpc_query.go b/x/auction/keeper/grpc_query.go index 5889191..e1735c5 100644 --- a/x/auction/keeper/grpc_query.go +++ b/x/auction/keeper/grpc_query.go @@ -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{} diff --git a/x/auction/keeper/grpc_query_test.go b/x/auction/keeper/grpc_query_test.go index a124a22..435f1bc 100644 --- a/x/auction/keeper/grpc_query_test.go +++ b/x/auction/keeper/grpc_query_test.go @@ -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() { diff --git a/x/auction/keeper/keeper.go b/x/auction/keeper/keeper.go index 897a0a3..97812c8 100644 --- a/x/auction/keeper/keeper.go +++ b/x/auction/keeper/keeper.go @@ -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 { diff --git a/x/auction/keeper/keeper_test.go b/x/auction/keeper/keeper_test.go index 3796702..e2348f5 100644 --- a/x/auction/keeper/keeper_test.go +++ b/x/auction/keeper/keeper_test.go @@ -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" ) diff --git a/x/auction/keeper/msg_server.go b/x/auction/keeper/msg_server.go index 65d83eb..ed240f4 100644 --- a/x/auction/keeper/msg_server.go +++ b/x/auction/keeper/msg_server.go @@ -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{} diff --git a/x/auction/keeper/msg_server_test.go b/x/auction/keeper/msg_server_test.go index 248d36b..67651a4 100644 --- a/x/auction/keeper/msg_server_test.go +++ b/x/auction/keeper/msg_server_test.go @@ -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() { diff --git a/x/auction/module.go b/x/auction/module.go index 4afb72f..2b25ccd 100644 --- a/x/auction/module.go +++ b/x/auction/module.go @@ -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 ( diff --git a/x/auction/rewards/fixed_provider.go b/x/auction/rewards/fixed_provider.go index fe608ca..19fc068 100644 --- a/x/auction/rewards/fixed_provider.go +++ b/x/auction/rewards/fixed_provider.go @@ -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) diff --git a/x/auction/rewards/proposer_provider.go b/x/auction/rewards/proposer_provider.go index d1dda89..ed0ef06 100644 --- a/x/auction/rewards/proposer_provider.go +++ b/x/auction/rewards/proposer_provider.go @@ -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) diff --git a/x/auction/types/mocks/account_keeper.go b/x/auction/types/mocks/account_keeper.go index f0ddfcf..45c7b8e 100644 --- a/x/auction/types/mocks/account_keeper.go +++ b/x/auction/types/mocks/account_keeper.go @@ -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) diff --git a/x/auction/types/mocks/bank_keeper.go b/x/auction/types/mocks/bank_keeper.go index 671f024..3047c6f 100644 --- a/x/auction/types/mocks/bank_keeper.go +++ b/x/auction/types/mocks/bank_keeper.go @@ -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) diff --git a/x/auction/types/mocks/distribution_keeper.go b/x/auction/types/mocks/distribution_keeper.go index f363a87..fbe703a 100644 --- a/x/auction/types/mocks/distribution_keeper.go +++ b/x/auction/types/mocks/distribution_keeper.go @@ -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 { diff --git a/x/auction/types/mocks/rewards_address_provider.go b/x/auction/types/mocks/rewards_address_provider.go index 6932fcd..fe56604 100644 --- a/x/auction/types/mocks/rewards_address_provider.go +++ b/x/auction/types/mocks/rewards_address_provider.go @@ -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 { diff --git a/x/auction/types/mocks/staking_keeper.go b/x/auction/types/mocks/staking_keeper.go index 01f1064..eda1f9c 100644 --- a/x/auction/types/mocks/staking_keeper.go +++ b/x/auction/types/mocks/staking_keeper.go @@ -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 { diff --git a/x/auction/types/msgs_test.go b/x/auction/types/msgs_test.go index d0bafd4..5599d42 100644 --- a/x/auction/types/msgs_test.go +++ b/x/auction/types/msgs_test.go @@ -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 diff --git a/x/blocksdk/client/cli/query.go b/x/blocksdk/client/cli/query.go index 3701d43..57feec3 100644 --- a/x/blocksdk/client/cli/query.go +++ b/x/blocksdk/client/cli/query.go @@ -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. diff --git a/x/blocksdk/client/cli/tx.go b/x/blocksdk/client/cli/tx.go index 5cf59a7..c86c59a 100644 --- a/x/blocksdk/client/cli/tx.go +++ b/x/blocksdk/client/cli/tx.go @@ -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 diff --git a/x/blocksdk/keeper/genesis.go b/x/blocksdk/keeper/genesis.go index f8ff6a3..1079605 100644 --- a/x/blocksdk/keeper/genesis.go +++ b/x/blocksdk/keeper/genesis.go @@ -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. diff --git a/x/blocksdk/keeper/grpc_query.go b/x/blocksdk/keeper/grpc_query.go index 12d4250..d3ebae0 100644 --- a/x/blocksdk/keeper/grpc_query.go +++ b/x/blocksdk/keeper/grpc_query.go @@ -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{} diff --git a/x/blocksdk/keeper/grpc_query_test.go b/x/blocksdk/keeper/grpc_query_test.go index 48e451c..3f060ad 100644 --- a/x/blocksdk/keeper/grpc_query_test.go +++ b/x/blocksdk/keeper/grpc_query_test.go @@ -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() { diff --git a/x/blocksdk/keeper/keeper.go b/x/blocksdk/keeper/keeper.go index a6b3c2b..482aecd 100644 --- a/x/blocksdk/keeper/keeper.go +++ b/x/blocksdk/keeper/keeper.go @@ -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 { diff --git a/x/blocksdk/keeper/keeper_test.go b/x/blocksdk/keeper/keeper_test.go index fb88b99..e887365 100644 --- a/x/blocksdk/keeper/keeper_test.go +++ b/x/blocksdk/keeper/keeper_test.go @@ -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 { diff --git a/x/blocksdk/keeper/msg_server.go b/x/blocksdk/keeper/msg_server.go index 870c519..3ada5b2 100644 --- a/x/blocksdk/keeper/msg_server.go +++ b/x/blocksdk/keeper/msg_server.go @@ -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{} diff --git a/x/blocksdk/keeper/msg_server_test.go b/x/blocksdk/keeper/msg_server_test.go index 852a81e..f2bec69 100644 --- a/x/blocksdk/keeper/msg_server_test.go +++ b/x/blocksdk/keeper/msg_server_test.go @@ -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() { diff --git a/x/blocksdk/module.go b/x/blocksdk/module.go index 3542a90..cdce391 100644 --- a/x/blocksdk/module.go +++ b/x/blocksdk/module.go @@ -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 ( diff --git a/x/blocksdk/types/lane_test.go b/x/blocksdk/types/lane_test.go index 380e497..680ba97 100644 --- a/x/blocksdk/types/lane_test.go +++ b/x/blocksdk/types/lane_test.go @@ -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) { diff --git a/x/blocksdk/types/msgs_test.go b/x/blocksdk/types/msgs_test.go index 82219ae..93b6618 100644 --- a/x/blocksdk/types/msgs_test.go +++ b/x/blocksdk/types/msgs_test.go @@ -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) {