use sample

go.mod

@@ -18,6 +18,7 @@ require (
 	github.com/golang/protobuf v1.5.3
 	github.com/golangci/golangci-lint v1.55.3-0.20231203192459-84442f26446b
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
+	github.com/skip-mev/chaintestutil v0.0.0-00010101000000-000000000000
 	github.com/spf13/cobra v1.8.0
 	github.com/spf13/viper v1.17.0
 	github.com/stretchr/testify v1.8.4
@@ -26,6 +27,7 @@ require (
 	google.golang.org/grpc v1.59.0
 	google.golang.org/protobuf v1.31.0
 	mvdan.cc/gofumpt v0.5.0
+	pgregory.net/rapid v1.1.0
 )
 
 require (
@@ -316,7 +318,6 @@ require (
 	mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect
 	mvdan.cc/unparam v0.0.0-20221223090309-7455f1af531d // indirect
 	nhooyr.io/websocket v1.8.6 // indirect
-	pgregory.net/rapid v1.1.0 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect
 )
 
@@ -328,3 +329,5 @@ replace (
 	github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
 	golang.org/x/exp => golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2
 )
+
+replace github.com/skip-mev/chaintestutil => ../chaintestutil

tests/e2e/setup.go

@@ -15,8 +15,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/skip-mev/feemarket/testutils/sample"
-
 	rpctypes "github.com/cometbft/cometbft/rpc/core/types"
 	comettypes "github.com/cometbft/cometbft/types"
 	"github.com/cosmos/cosmos-sdk/client"
@@ -27,6 +25,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
+	"github.com/skip-mev/chaintestutil/sample"
 	interchaintest "github.com/strangelove-ventures/interchaintest/v7"
 	"github.com/strangelove-ventures/interchaintest/v7/chain/cosmos"
 	"github.com/strangelove-ventures/interchaintest/v7/ibc"

testutils/encoding/encoding.go

@@ -2,17 +2,24 @@ package encoding
 
 import (
 	"github.com/cosmos/cosmos-sdk/codec"
+	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	"github.com/cosmos/cosmos-sdk/std"
 	"github.com/cosmos/cosmos-sdk/x/auth/tx"
+	"github.com/skip-mev/chaintestutil/sample"
 
 	appparams "github.com/skip-mev/feemarket/tests/app/params"
-	"github.com/skip-mev/feemarket/testutils/sample"
+	feemarkettypes "github.com/skip-mev/feemarket/x/feemarket/types"
 )
 
-// MakeTestEncodingConfig creates a test EncodingConfig for a  test configuration.
+// MakeTestEncodingConfig creates a test EncodingConfig for a test configuration.
 func MakeTestEncodingConfig() appparams.EncodingConfig {
 	amino := codec.NewLegacyAmino()
-	interfaceRegistry := sample.InterfaceRegistry()
+
+	addFeeMarket := func(ir codectypes.InterfaceRegistry) {
+		feemarkettypes.RegisterInterfaces(ir)
+	}
+
+	interfaceRegistry := sample.InterfaceRegistry(addFeeMarket)
 	cdc := codec.NewProtoCodec(interfaceRegistry)
 	txCfg := tx.NewTxConfig(cdc, tx.DefaultSignModes)
 

testutils/keeper/bank_test.go

@@ -5,10 +5,10 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
+	"github.com/skip-mev/chaintestutil/sample"
 	"github.com/stretchr/testify/require"
 
 	testkeeper "github.com/skip-mev/feemarket/testutils/keeper"
-	"github.com/skip-mev/feemarket/testutils/sample"
 )
 
 func TestTestKeepers_MintToAccount(t *testing.T) {

testutils/keeper/initializer.go

@@ -22,8 +22,8 @@ import (
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 	upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
+	"github.com/skip-mev/chaintestutil/sample"
 
-	"github.com/skip-mev/feemarket/testutils/sample"
 	feemarketkeeper "github.com/skip-mev/feemarket/x/feemarket/keeper"
 	feemarkettypes "github.com/skip-mev/feemarket/x/feemarket/types"
 )

testutils/networksuite/networksuite.go

@@ -8,8 +8,8 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
+	"github.com/skip-mev/chaintestutil/sample"
 	"github.com/skip-mev/feemarket/testutils/network"
-	"github.com/skip-mev/feemarket/testutils/sample"
 	feemarkettypes "github.com/skip-mev/feemarket/x/feemarket/types"
 )