Skip to content

Commit

Permalink
format
Browse files Browse the repository at this point in the history
  • Loading branch information
aljo242 committed May 28, 2024
1 parent 2c3c64c commit dcbeb83
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 12 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 .

Expand Down
7 changes: 4 additions & 3 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,17 @@ 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"
"os"
"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"
Expand Down
4 changes: 3 additions & 1 deletion app/genesis.go
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 1 addition & 3 deletions app/lane.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
7 changes: 4 additions & 3 deletions tests/ibc/ibc_setup_test.go
Original file line number Diff line number Diff line change
@@ -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"

Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit dcbeb83

Please sign in to comment.