diff --git a/abci/utils.go b/abci/utils.go index e6950f4..a834910 100644 --- a/abci/utils.go +++ b/abci/utils.go @@ -4,6 +4,7 @@ import ( "fmt" 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/proposals/types" diff --git a/abci/utils_test.go b/abci/utils_test.go index e8157d2..953e1ad 100644 --- a/abci/utils_test.go +++ b/abci/utils_test.go @@ -10,6 +10,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" 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" diff --git a/adapters/signer_extraction_adapter/signer_extraction_adapter_test.go b/adapters/signer_extraction_adapter/signer_extraction_adapter_test.go index 220db0b..6426aef 100644 --- a/adapters/signer_extraction_adapter/signer_extraction_adapter_test.go +++ b/adapters/signer_extraction_adapter/signer_extraction_adapter_test.go @@ -8,9 +8,10 @@ import ( "github.com/cosmos/cosmos-sdk/client" sdk "github.com/cosmos/cosmos-sdk/types" 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" - "github.com/stretchr/testify/suite" ) type SignerExtractionAdapterTestSuite struct { diff --git a/block/base/priority_nonce.go b/block/base/priority_nonce.go index 21913fa..f5afc6d 100644 --- a/block/base/priority_nonce.go +++ b/block/base/priority_nonce.go @@ -21,6 +21,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" ) diff --git a/block/lane.go b/block/lane.go index c6d3ac1..71923cc 100644 --- a/block/lane.go +++ b/block/lane.go @@ -4,6 +4,7 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" sdkmempool "github.com/cosmos/cosmos-sdk/types/mempool" + "github.com/skip-mev/block-sdk/block/proposals" ) diff --git a/block/mocks/lane.go b/block/mocks/lane.go index 933afab..f922091 100644 --- a/block/mocks/lane.go +++ b/block/mocks/lane.go @@ -214,7 +214,8 @@ func (_m *Lane) SetIgnoreList(ignoreList []block.Lane) { func NewLane(t interface { mock.TestingT Cleanup(func()) -}) *Lane { +}, +) *Lane { mock := &Lane{} mock.Mock.Test(t) diff --git a/block/mocks/lane_mempool.go b/block/mocks/lane_mempool.go index d4116e0..d3892d3 100644 --- a/block/mocks/lane_mempool.go +++ b/block/mocks/lane_mempool.go @@ -107,7 +107,8 @@ func (_m *LaneMempool) Select(_a0 context.Context, _a1 [][]byte) mempool.Iterato func NewLaneMempool(t interface { mock.TestingT Cleanup(func()) -}) *LaneMempool { +}, +) *LaneMempool { mock := &LaneMempool{} mock.Mock.Test(t) diff --git a/block/proposals/proposals.go b/block/proposals/proposals.go index 06f26c9..e8bcca1 100644 --- a/block/proposals/proposals.go +++ b/block/proposals/proposals.go @@ -4,6 +4,7 @@ import ( "cosmossdk.io/log" "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/skip-mev/block-sdk/block/proposals/types" ) diff --git a/block/proposals/proposals_test.go b/block/proposals/proposals_test.go index bd0e5e7..77d37bd 100644 --- a/block/proposals/proposals_test.go +++ b/block/proposals/proposals_test.go @@ -7,12 +7,13 @@ import ( "cosmossdk.io/log" "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/stretchr/testify/require" + "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" "github.com/skip-mev/block-sdk/testutils" - "github.com/stretchr/testify/require" ) func TestUpdateProposal(t *testing.T) { diff --git a/block/proposals/update.go b/block/proposals/update.go index 51a447e..a5896a7 100644 --- a/block/proposals/update.go +++ b/block/proposals/update.go @@ -6,6 +6,7 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/skip-mev/block-sdk/block/utils" ) diff --git a/block/types.go b/block/types.go index 2b19290..f08ab8a 100644 --- a/block/types.go +++ b/block/types.go @@ -2,6 +2,7 @@ package block import ( sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/skip-mev/block-sdk/block/proposals" ) diff --git a/lanes/mev/abci_test.go b/lanes/mev/abci_test.go index 21fa9cc..3cb2ad2 100644 --- a/lanes/mev/abci_test.go +++ b/lanes/mev/abci_test.go @@ -4,6 +4,7 @@ import ( log "cosmossdk.io/log" "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" diff --git a/tests/app/testappd/cmd/root.go b/tests/app/testappd/cmd/root.go index 733305f..06044b4 100644 --- a/tests/app/testappd/cmd/root.go +++ b/tests/app/testappd/cmd/root.go @@ -14,6 +14,7 @@ import ( "cosmossdk.io/depinject" "cosmossdk.io/log" confixcmd "cosmossdk.io/tools/confix/cmd" + "github.com/skip-mev/block-sdk/tests/app" "github.com/cosmos/cosmos-sdk/client" diff --git a/x/auction/ante/utils.go b/x/auction/ante/utils.go index e59aedb..81b7a17 100644 --- a/x/auction/ante/utils.go +++ b/x/auction/ante/utils.go @@ -5,6 +5,7 @@ import ( "fmt" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/skip-mev/block-sdk/x/auction/types" ) diff --git a/x/auction/keeper/auction_test.go b/x/auction/keeper/auction_test.go index 2ae6522..1e11f3f 100644 --- a/x/auction/keeper/auction_test.go +++ b/x/auction/keeper/auction_test.go @@ -8,11 +8,12 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" + 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" - mock "github.com/stretchr/testify/mock" ) func (s *KeeperTestSuite) TestValidateAuctionBid() { diff --git a/x/auction/types/mocks/account_keeper.go b/x/auction/types/mocks/account_keeper.go index a98ff41..f0ddfcf 100644 --- a/x/auction/types/mocks/account_keeper.go +++ b/x/auction/types/mocks/account_keeper.go @@ -33,7 +33,8 @@ func (_m *AccountKeeper) GetModuleAddress(moduleName string) types.AccAddress { func NewAccountKeeper(t interface { mock.TestingT Cleanup(func()) -}) *AccountKeeper { +}, +) *AccountKeeper { mock := &AccountKeeper{} mock.Mock.Test(t) diff --git a/x/auction/types/mocks/bank_keeper.go b/x/auction/types/mocks/bank_keeper.go index e6ebe05..671f024 100644 --- a/x/auction/types/mocks/bank_keeper.go +++ b/x/auction/types/mocks/bank_keeper.go @@ -47,7 +47,8 @@ func (_m *BankKeeper) SendCoins(ctx context.Context, fromAddr types.AccAddress, func NewBankKeeper(t interface { mock.TestingT Cleanup(func()) -}) *BankKeeper { +}, +) *BankKeeper { mock := &BankKeeper{} mock.Mock.Test(t) diff --git a/x/auction/types/mocks/distribution_keeper.go b/x/auction/types/mocks/distribution_keeper.go index b64864a..f363a87 100644 --- a/x/auction/types/mocks/distribution_keeper.go +++ b/x/auction/types/mocks/distribution_keeper.go @@ -45,7 +45,8 @@ func (_m *DistributionKeeper) GetPreviousProposerConsAddr(ctx context.Context) ( func NewDistributionKeeper(t interface { mock.TestingT Cleanup(func()) -}) *DistributionKeeper { +}, +) *DistributionKeeper { mock := &DistributionKeeper{} mock.Mock.Test(t) diff --git a/x/auction/types/mocks/rewards_address_provider.go b/x/auction/types/mocks/rewards_address_provider.go index 5c740bc..6932fcd 100644 --- a/x/auction/types/mocks/rewards_address_provider.go +++ b/x/auction/types/mocks/rewards_address_provider.go @@ -43,7 +43,8 @@ func (_m *RewardsAddressProvider) GetRewardsAddress(context types.Context) (type func NewRewardsAddressProvider(t interface { mock.TestingT Cleanup(func()) -}) *RewardsAddressProvider { +}, +) *RewardsAddressProvider { mock := &RewardsAddressProvider{} mock.Mock.Test(t) diff --git a/x/auction/types/mocks/staking_keeper.go b/x/auction/types/mocks/staking_keeper.go index 81a2905..01f1064 100644 --- a/x/auction/types/mocks/staking_keeper.go +++ b/x/auction/types/mocks/staking_keeper.go @@ -45,7 +45,8 @@ func (_m *StakingKeeper) GetValidatorByConsAddr(_a0 context.Context, _a1 types.C func NewStakingKeeper(t interface { mock.TestingT Cleanup(func()) -}) *StakingKeeper { +}, +) *StakingKeeper { mock := &StakingKeeper{} mock.Mock.Test(t)