From dcbeb83115c6b4ecd67f9981a5d7e0aae3966fb8 Mon Sep 17 00:00:00 2001 From: aljo242 Date: Tue, 28 May 2024 18:37:46 -0400 Subject: [PATCH] format --- Makefile | 4 ++-- app/app.go | 7 ++++--- app/genesis.go | 4 +++- app/lane.go | 4 +--- tests/ibc/ibc_setup_test.go | 7 ++++--- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 9274bdbe2..8c6567d74 100644 --- a/Makefile +++ b/Makefile @@ -266,10 +266,10 @@ check-proto-format: --workdir /workspace $(PROTO_FORMATTER_IMAGE) \ format proto -d --exit-code -TEST_E2E_DEPS = build-docker-image +TEST_E2E_DEPS = build-docker-image-e2e TEST_E2E_TAGS = e2e -build-docker-image: +build-docker-image-e2e: @echo "Building e2e-test Docker image..." @DOCKER_BUILDKIT=1 docker build -t neutron-e2e -f contrib/images/neutron.e2e.Dockerfile . diff --git a/app/app.go b/app/app.go index d0c0e7d35..61c5866c6 100644 --- a/app/app.go +++ b/app/app.go @@ -3,9 +3,6 @@ package app import ( "context" "fmt" - "github.com/skip-mev/feemarket/x/feemarket" - feemarketkeeper "github.com/skip-mev/feemarket/x/feemarket/keeper" - feemarkettypes "github.com/skip-mev/feemarket/x/feemarket/types" "io" "io/fs" "net/http" @@ -13,6 +10,10 @@ import ( "path/filepath" "time" + "github.com/skip-mev/feemarket/x/feemarket" + feemarketkeeper "github.com/skip-mev/feemarket/x/feemarket/keeper" + feemarkettypes "github.com/skip-mev/feemarket/x/feemarket/types" + "cosmossdk.io/client/v2/autocli" "cosmossdk.io/core/appmodule" "github.com/cosmos/cosmos-sdk/runtime/services" diff --git a/app/genesis.go b/app/genesis.go index 579334006..297395c33 100644 --- a/app/genesis.go +++ b/app/genesis.go @@ -1,8 +1,10 @@ package app import ( - "cosmossdk.io/math" "encoding/json" + + "cosmossdk.io/math" + feemarkettypes "github.com/skip-mev/feemarket/x/feemarket/types" "github.com/cosmos/cosmos-sdk/codec" diff --git a/app/lane.go b/app/lane.go index 8175af289..538d8a3b6 100644 --- a/app/lane.go +++ b/app/lane.go @@ -11,9 +11,7 @@ const ( MaxTxsForDefaultLane = 3000 // maximal number of txs that can be stored in this lane at any point in time ) -var ( - MaxBlockspaceForDefaultLane = math.LegacyMustNewDecFromStr("1") // maximal fraction of blockMaxBytes / gas that can be used by this lane at any point in time (90%) -) +var MaxBlockspaceForDefaultLane = math.LegacyMustNewDecFromStr("1") // maximal fraction of blockMaxBytes / gas that can be used by this lane at any point in time (90%) // CreateLanes creates a LaneMempool containing MEV, default lanes (in that order) func (app *App) CreateLanes() *blocksdkbase.BaseLane { diff --git a/tests/ibc/ibc_setup_test.go b/tests/ibc/ibc_setup_test.go index a74e111f7..e0cb15762 100644 --- a/tests/ibc/ibc_setup_test.go +++ b/tests/ibc/ibc_setup_test.go @@ -1,13 +1,14 @@ package ibc_test import ( + "testing" + "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward" transfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types" clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" //nolint:staticcheck channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" - "testing" ibctesting "github.com/cosmos/ibc-go/v8/testing" @@ -56,8 +57,8 @@ func TestIBCTestSuite(t *testing.T) { func (s *IBCTestSuite) SetupTest() { // we need to redefine this variable to make tests work cause we use untrn as default bond denom in neutron sdk.DefaultBondDenom = appparams.DefaultDenom - //simapp.DefautFeeDenom = app.FeeDenom - //simapp.DefaultFee = 100_000 + // simapp.DefautFeeDenom = app.FeeDenom + // simapp.DefaultFee = 100_000 // Create coordinator s.coordinator = ibctesting.NewCoordinator(s.T(), 0)