merge

skip-mev · Jun 20, 2024 · 663ef37 · 663ef37
1 parent fa239c4
commit 663ef37
Show file tree

Hide file tree

Showing 6 changed files with 92 additions and 450 deletions.
diff --git a/abci/checktx/check_tx_test.go b/abci/checktx/check_tx_test.go
@@ -11,27 +11,17 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/stretchr/testify/suite"
 
-<<<<<<< HEAD
 	"github.com/skip-mev/block-sdk/abci/checktx"
 	"github.com/skip-mev/block-sdk/block"
 
 	"github.com/cometbft/cometbft/libs/log"
 	"github.com/cosmos/cosmos-sdk/store"
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 
+	"github.com/skip-mev/block-sdk/block/utils"
 	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"
-=======
-	"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/utils"
-	"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"
->>>>>>> bfdd584 (feat: Cache Tx Decoder (#528))
 )
 
 type CheckTxTestSuite struct {
@@ -148,13 +138,8 @@ func (s *CheckTxTestSuite) TestRemovalOnRecheckTx() {
 	handler := checktx.NewMempoolParityCheckTx(
 		s.Ctx.Logger(),
 		mempool,
-<<<<<<< HEAD
-		s.EncCfg.TxConfig.TxDecoder(),
-		func(cometabci.RequestCheckTx) cometabci.ResponseCheckTx {
-=======
 		cacheDecoder.TxDecoder(),
-		func(*cometabci.RequestCheckTx) (*cometabci.ResponseCheckTx, error) {
->>>>>>> bfdd584 (feat: Cache Tx Decoder (#528))
+		func(cometabci.RequestCheckTx) cometabci.ResponseCheckTx {
 			// always fail
 			return cometabci.ResponseCheckTx{Code: 1}
 		},

diff --git a/block/utils/decoder_test.go b/block/utils/decoder_test.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/skip-mev/block-sdk/v2/block/utils"
-	"github.com/skip-mev/block-sdk/v2/testutils"
+	"github.com/skip-mev/block-sdk/block/utils"
+	"github.com/skip-mev/block-sdk/testutils"
 )
 
 var (

diff --git a/go.mod b/go.mod
@@ -1,12 +1,6 @@
 module github.com/skip-mev/block-sdk
 
-<<<<<<< HEAD
-go 1.21.4
-
-toolchain go1.21.6
-=======
 go 1.22.4
->>>>>>> bfdd584 (feat: Cache Tx Decoder (#528))
 
 require (
 	cosmossdk.io/api v0.3.1

diff --git a/tests/app/app.go b/tests/app/app.go
@@ -63,24 +63,14 @@ import (
 	upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client"
 	upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper"
 
-<<<<<<< HEAD
 	"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"
+	"github.com/skip-mev/block-sdk/block/utils"
 	auctionmodule "github.com/skip-mev/block-sdk/x/auction"
 	auctionkeeper "github.com/skip-mev/block-sdk/x/auction/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"
-	"github.com/skip-mev/block-sdk/v2/block/utils"
-	auctionkeeper "github.com/skip-mev/block-sdk/v2/x/auction/keeper"
-	blocksdkkeeper "github.com/skip-mev/block-sdk/v2/x/blocksdk/keeper"
->>>>>>> bfdd584 (feat: Cache Tx Decoder (#528))
 )
 
 const (
@@ -345,22 +335,13 @@ func New(
 		mevLane,
 		anteHandler,
 		app.App.CheckTx,
-<<<<<<< HEAD
 		app.ChainID(),
-=======
-	)
-	checkTxHandler := checktx.NewMempoolParityCheckTx(
-		app.Logger(),
-		mempool,
-		cacheDecoder.TxDecoder(),
-		mevCheckTx.CheckTx(),
->>>>>>> bfdd584 (feat: Cache Tx Decoder (#528))
 	)
 
 	parityCheckTxHandler := checktx.NewMempoolParityCheckTx(
 		app.App.Logger(),
 		mempool,
-		app.txConfig.TxDecoder(),
+		cacheDecoder.TxDecoder(),
 		mevCheckTxHandler.CheckTx(),
 	)