From 3ac4f0e52f62e6db4b6f26ffa62e4ae866d67a4a Mon Sep 17 00:00:00 2001 From: aljo242 Date: Tue, 14 Nov 2023 09:57:44 -0500 Subject: [PATCH] run make format --- abci/abci.go | 1 + abci/abci_test.go | 3 ++- abci/utils.go | 1 + abci/utils_test.go | 1 + .../signer_extraction_adapter_test.go | 3 ++- block/base/abci.go | 1 + block/base/lane.go | 1 + block/base/priority_nonce.go | 1 + block/lane.go | 1 + block/mocks/lane.go | 3 ++- block/mocks/lane_mempool.go | 3 ++- block/proposals/proposals.go | 1 + block/proposals/proposals_test.go | 3 ++- block/proposals/update.go | 1 + block/types.go | 1 + lanes/base/base_test.go | 3 ++- lanes/free/lane.go | 1 + lanes/mev/abci.go | 1 + lanes/mev/abci_test.go | 1 + lanes/mev/factory_test.go | 1 + lanes/mev/lane.go | 1 + lanes/mev/mempool.go | 1 + lanes/mev/utils_test.go | 3 ++- lanes/terminator/lane.go | 1 + tests/app/ante.go | 1 + tests/app/config.go | 1 + tests/app/testappd/cmd/root.go | 5 +++-- tests/app/testappd/main.go | 1 + tests/integration/block_sdk_integration_test.go | 3 ++- x/auction/ante/utils.go | 1 + x/auction/keeper/auction_test.go | 3 ++- x/auction/keeper/keeper.go | 1 + x/auction/keeper/keeper_test.go | 1 + x/auction/keeper/msg_server_test.go | 1 + x/auction/types/mocks/account_keeper.go | 3 ++- x/auction/types/mocks/bank_keeper.go | 3 ++- x/auction/types/mocks/distribution_keeper.go | 3 ++- x/auction/types/mocks/rewards_address_provider.go | 3 ++- x/auction/types/mocks/staking_keeper.go | 3 ++- 39 files changed, 55 insertions(+), 16 deletions(-) diff --git a/abci/abci.go b/abci/abci.go index 806aa6c3..7f9743c5 100644 --- a/abci/abci.go +++ b/abci/abci.go @@ -4,6 +4,7 @@ import ( abci "github.com/cometbft/cometbft/abci/types" "github.com/cometbft/cometbft/libs/log" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/skip-mev/block-sdk/block" "github.com/skip-mev/block-sdk/block/proposals" ) diff --git a/abci/abci_test.go b/abci/abci_test.go index e200087d..304c1fdd 100644 --- a/abci/abci_test.go +++ b/abci/abci_test.go @@ -12,11 +12,12 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" "github.com/cosmos/cosmos-sdk/testutil" 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/proposals" testutils "github.com/skip-mev/block-sdk/testutils" - "github.com/stretchr/testify/suite" ) type ProposalsTestSuite struct { diff --git a/abci/utils.go b/abci/utils.go index e6950f47..a834910c 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 9aa7763a..afb7715a 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 220db0bb..6426aef0 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/abci.go b/block/base/abci.go index 22eb6f87..59b0b648 100644 --- a/block/base/abci.go +++ b/block/base/abci.go @@ -2,6 +2,7 @@ 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" diff --git a/block/base/lane.go b/block/base/lane.go index 13c7b383..c17cfe29 100644 --- a/block/base/lane.go +++ b/block/base/lane.go @@ -6,6 +6,7 @@ import ( "cosmossdk.io/math" "github.com/cometbft/cometbft/libs/log" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/skip-mev/block-sdk/block" ) diff --git a/block/base/priority_nonce.go b/block/base/priority_nonce.go index 21913fa7..f5afc6dc 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 c6d3ac18..71923cca 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 933afab2..f9220913 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 d4116e09..d3892d38 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 4ef15598..88a5c6b2 100644 --- a/block/proposals/proposals.go +++ b/block/proposals/proposals.go @@ -4,6 +4,7 @@ import ( "cosmossdk.io/math" "github.com/cometbft/cometbft/libs/log" 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 ab39a451..d7be4659 100644 --- a/block/proposals/proposals_test.go +++ b/block/proposals/proposals_test.go @@ -8,12 +8,13 @@ import ( "cosmossdk.io/math" "github.com/cometbft/cometbft/libs/log" 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 51a447e6..a5896a79 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 2b19290c..f08ab8a4 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/base/base_test.go b/lanes/base/base_test.go index 2593b2c0..2d5f16dd 100644 --- a/lanes/base/base_test.go +++ b/lanes/base/base_test.go @@ -7,9 +7,10 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" "github.com/cosmos/cosmos-sdk/testutil" 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" - "github.com/stretchr/testify/suite" ) type BaseTestSuite struct { diff --git a/lanes/free/lane.go b/lanes/free/lane.go index 561827b7..ceabef76 100644 --- a/lanes/free/lane.go +++ b/lanes/free/lane.go @@ -3,6 +3,7 @@ package free import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/staking/types" + "github.com/skip-mev/block-sdk/block" "github.com/skip-mev/block-sdk/block/base" ) diff --git a/lanes/mev/abci.go b/lanes/mev/abci.go index 16c3d50a..574f01ef 100644 --- a/lanes/mev/abci.go +++ b/lanes/mev/abci.go @@ -5,6 +5,7 @@ import ( "fmt" 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/block/utils" diff --git a/lanes/mev/abci_test.go b/lanes/mev/abci_test.go index 22b85cd7..b01a470a 100644 --- a/lanes/mev/abci_test.go +++ b/lanes/mev/abci_test.go @@ -6,6 +6,7 @@ import ( "cosmossdk.io/math" "github.com/cometbft/cometbft/libs/log" 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/lanes/mev/factory_test.go b/lanes/mev/factory_test.go index 5a97d29b..6102bc2d 100644 --- a/lanes/mev/factory_test.go +++ b/lanes/mev/factory_test.go @@ -5,6 +5,7 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" + testutils "github.com/skip-mev/block-sdk/testutils" ) diff --git a/lanes/mev/lane.go b/lanes/mev/lane.go index 51e29dd9..63ed3274 100644 --- a/lanes/mev/lane.go +++ b/lanes/mev/lane.go @@ -4,6 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/skip-mev/block-sdk/block" "github.com/skip-mev/block-sdk/block/base" ) diff --git a/lanes/mev/mempool.go b/lanes/mev/mempool.go index b74a71d7..cae04e62 100644 --- a/lanes/mev/mempool.go +++ b/lanes/mev/mempool.go @@ -4,6 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/skip-mev/block-sdk/block/base" ) diff --git a/lanes/mev/utils_test.go b/lanes/mev/utils_test.go index 9644ba74..9f97512b 100644 --- a/lanes/mev/utils_test.go +++ b/lanes/mev/utils_test.go @@ -4,10 +4,11 @@ import ( "testing" 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/stretchr/testify/require" ) func TestGetMsgAuctionBidFromTx_Valid(t *testing.T) { diff --git a/lanes/terminator/lane.go b/lanes/terminator/lane.go index 42a05b56..fa824f4b 100644 --- a/lanes/terminator/lane.go +++ b/lanes/terminator/lane.go @@ -7,6 +7,7 @@ import ( "github.com/cometbft/cometbft/libs/log" 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" ) diff --git a/tests/app/ante.go b/tests/app/ante.go index 4a04e549..6a8f59be 100644 --- a/tests/app/ante.go +++ b/tests/app/ante.go @@ -3,6 +3,7 @@ package app 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" diff --git a/tests/app/config.go b/tests/app/config.go index 05b138a7..809adff9 100644 --- a/tests/app/config.go +++ b/tests/app/config.go @@ -44,6 +44,7 @@ import ( "google.golang.org/protobuf/types/known/durationpb" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" + auctionmodulev1 "github.com/skip-mev/block-sdk/api/sdk/auction/module/v1" auctiontypes "github.com/skip-mev/block-sdk/x/auction/types" ) diff --git a/tests/app/testappd/cmd/root.go b/tests/app/testappd/cmd/root.go index efa9b285..cfd71aa7 100644 --- a/tests/app/testappd/cmd/root.go +++ b/tests/app/testappd/cmd/root.go @@ -24,10 +24,11 @@ import ( "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/cosmos/cosmos-sdk/x/crisis" genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli" - "github.com/skip-mev/block-sdk/tests/app" - "github.com/skip-mev/block-sdk/tests/app/params" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/skip-mev/block-sdk/tests/app" + "github.com/skip-mev/block-sdk/tests/app/params" ) func NewRootCmd() *cobra.Command { diff --git a/tests/app/testappd/main.go b/tests/app/testappd/main.go index 46c26fba..69ad9ea9 100644 --- a/tests/app/testappd/main.go +++ b/tests/app/testappd/main.go @@ -5,6 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/server" 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" ) diff --git a/tests/integration/block_sdk_integration_test.go b/tests/integration/block_sdk_integration_test.go index 80b88b2d..dc92fbff 100644 --- a/tests/integration/block_sdk_integration_test.go +++ b/tests/integration/block_sdk_integration_test.go @@ -5,13 +5,14 @@ import ( "testing" testutil "github.com/cosmos/cosmos-sdk/types/module/testutil" - "github.com/skip-mev/block-sdk/tests/integration" "github.com/strangelove-ventures/interchaintest/v7" "github.com/strangelove-ventures/interchaintest/v7/chain/cosmos" "github.com/strangelove-ventures/interchaintest/v7/ibc" ictestutil "github.com/strangelove-ventures/interchaintest/v7/testutil" "github.com/stretchr/testify/suite" + "github.com/skip-mev/block-sdk/tests/integration" + auctiontypes "github.com/skip-mev/block-sdk/x/auction/types" ) diff --git a/x/auction/ante/utils.go b/x/auction/ante/utils.go index 5faece0e..dd2db09d 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 df4b2cc5..00657689 100644 --- a/x/auction/keeper/auction_test.go +++ b/x/auction/keeper/auction_test.go @@ -7,11 +7,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/keeper/keeper.go b/x/auction/keeper/keeper.go index 8a540e22..52740b97 100644 --- a/x/auction/keeper/keeper.go +++ b/x/auction/keeper/keeper.go @@ -9,6 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" 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" ) diff --git a/x/auction/keeper/keeper_test.go b/x/auction/keeper/keeper_test.go index 05b3d92e..b89d2a36 100644 --- a/x/auction/keeper/keeper_test.go +++ b/x/auction/keeper/keeper_test.go @@ -6,6 +6,7 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" "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" diff --git a/x/auction/keeper/msg_server_test.go b/x/auction/keeper/msg_server_test.go index 53bac912..0f1f2de8 100644 --- a/x/auction/keeper/msg_server_test.go +++ b/x/auction/keeper/msg_server_test.go @@ -5,6 +5,7 @@ import ( "time" sdk "github.com/cosmos/cosmos-sdk/types" + testutils "github.com/skip-mev/block-sdk/testutils" "github.com/skip-mev/block-sdk/x/auction/types" ) diff --git a/x/auction/types/mocks/account_keeper.go b/x/auction/types/mocks/account_keeper.go index a98ff41b..f0ddfcfb 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 d63ce886..e18c7c4a 100644 --- a/x/auction/types/mocks/bank_keeper.go +++ b/x/auction/types/mocks/bank_keeper.go @@ -45,7 +45,8 @@ func (_m *BankKeeper) SendCoins(ctx types.Context, fromAddr types.AccAddress, to 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 fd21a9e9..8301da90 100644 --- a/x/auction/types/mocks/distribution_keeper.go +++ b/x/auction/types/mocks/distribution_keeper.go @@ -33,7 +33,8 @@ func (_m *DistributionKeeper) GetPreviousProposerConsAddr(ctx types.Context) typ 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 5c740bc1..6932fcd1 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 b9163b16..47d818b4 100644 --- a/x/auction/types/mocks/staking_keeper.go +++ b/x/auction/types/mocks/staking_keeper.go @@ -35,7 +35,8 @@ func (_m *StakingKeeper) ValidatorByConsAddr(_a0 types.Context, _a1 types.ConsAd func NewStakingKeeper(t interface { mock.TestingT Cleanup(func()) -}) *StakingKeeper { +}, +) *StakingKeeper { mock := &StakingKeeper{} mock.Mock.Test(t)