LaconicNetwork/block-sdk
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

chore: Upgrade module path for v2 (#383)

Browse Source
This commit is contained in:
Eric Warehime
2024-01-24 09:06:20 -08:00
committed by GitHub
parent 234e2ff719
commit acff9d0edf
104 changed files with 363 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/app/ante.go
+3 -3
View File
@@ -4,9 +4,9 @@ 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"
"github.com/skip-mev/block-sdk/v2/block"
auctionante "github.com/skip-mev/block-sdk/v2/x/auction/ante"
auctionkeeper "github.com/skip-mev/block-sdk/v2/x/auction/keeper"
)
type BSDKHandlerOptions struct {
tests/app/app.go
+7 -7
View File
@@ -41,13 +41,13 @@ import (
slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper"
stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
"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"
auctionkeeper "github.com/skip-mev/block-sdk/x/auction/keeper"
blocksdkkeeper "github.com/skip-mev/block-sdk/x/blocksdk/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"
auctionkeeper "github.com/skip-mev/block-sdk/v2/x/auction/keeper"
blocksdkkeeper "github.com/skip-mev/block-sdk/v2/x/blocksdk/keeper"
)
const (
tests/app/config.go
+6 -6
View File
@@ -66,12 +66,12 @@ import (
_ "github.com/cosmos/cosmos-sdk/x/slashing" // import for side-effects
_ "github.com/cosmos/cosmos-sdk/x/staking" // import for side-effects
auctionmodulev1 "github.com/skip-mev/block-sdk/api/sdk/auction/module/v1"
blocksdkmodulev1 "github.com/skip-mev/block-sdk/api/sdk/blocksdk/module/v1"
_ "github.com/skip-mev/block-sdk/x/auction" // import for side-effects
auctiontypes "github.com/skip-mev/block-sdk/x/auction/types"
_ "github.com/skip-mev/block-sdk/x/blocksdk" // import for side-effects
blocksdktypes "github.com/skip-mev/block-sdk/x/blocksdk/types"
auctionmodulev1 "github.com/skip-mev/block-sdk/v2/api/sdk/auction/module/v1"
blocksdkmodulev1 "github.com/skip-mev/block-sdk/v2/api/sdk/blocksdk/module/v1"
_ "github.com/skip-mev/block-sdk/v2/x/auction" // import for side-effects
auctiontypes "github.com/skip-mev/block-sdk/v2/x/auction/types"
_ "github.com/skip-mev/block-sdk/v2/x/blocksdk" // import for side-effects
blocksdktypes "github.com/skip-mev/block-sdk/v2/x/blocksdk/types"
)
var (
tests/app/lanes.go
+5 -5
View File
@@ -3,11 +3,11 @@ package app
import (
"cosmossdk.io/math"
signerextraction "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter"
"github.com/skip-mev/block-sdk/block/base"
defaultlane "github.com/skip-mev/block-sdk/lanes/base"
freelane "github.com/skip-mev/block-sdk/lanes/free"
mevlane "github.com/skip-mev/block-sdk/lanes/mev"
signerextraction "github.com/skip-mev/block-sdk/v2/adapters/signer_extraction_adapter"
"github.com/skip-mev/block-sdk/v2/block/base"
defaultlane "github.com/skip-mev/block-sdk/v2/lanes/base"
freelane "github.com/skip-mev/block-sdk/v2/lanes/free"
mevlane "github.com/skip-mev/block-sdk/v2/lanes/mev"
)
// CreateLanes walks through the process of creating the lanes for the block sdk. In this function
tests/app/testappd/cmd/root.go
+1 -1
View File
@@ -15,7 +15,7 @@ import (
"cosmossdk.io/log"
confixcmd "cosmossdk.io/tools/confix/cmd"
"github.com/skip-mev/block-sdk/tests/app"
"github.com/skip-mev/block-sdk/v2/tests/app"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/config"
tests/app/testappd/cmd/testnet.go
+1 -1
View File
@@ -16,7 +16,7 @@ import (
"cosmossdk.io/math"
"cosmossdk.io/math/unsafe"
"github.com/skip-mev/block-sdk/tests/app"
"github.com/skip-mev/block-sdk/v2/tests/app"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/flags"
tests/app/testappd/main.go
+2 -2
View File
@@ -6,8 +6,8 @@ import (
"cosmossdk.io/log"
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"
"github.com/skip-mev/block-sdk/v2/tests/app"
"github.com/skip-mev/block-sdk/v2/tests/app/testappd/cmd"
)
func main() {
tests/e2e/block_sdk_e2e_test.go
+6 -6
View File
@@ -13,12 +13,12 @@ import (
ictestutil "github.com/strangelove-ventures/interchaintest/v8/testutil"
"github.com/stretchr/testify/suite"
"github.com/skip-mev/block-sdk/lanes/base"
"github.com/skip-mev/block-sdk/lanes/free"
"github.com/skip-mev/block-sdk/lanes/mev"
"github.com/skip-mev/block-sdk/tests/e2e"
auctiontypes "github.com/skip-mev/block-sdk/x/auction/types"
blocksdkmoduletypes "github.com/skip-mev/block-sdk/x/blocksdk/types"
"github.com/skip-mev/block-sdk/v2/lanes/base"
"github.com/skip-mev/block-sdk/v2/lanes/free"
"github.com/skip-mev/block-sdk/v2/lanes/mev"
"github.com/skip-mev/block-sdk/v2/tests/e2e"
auctiontypes "github.com/skip-mev/block-sdk/v2/x/auction/types"
blocksdkmoduletypes "github.com/skip-mev/block-sdk/v2/x/blocksdk/types"
)
var (
tests/e2e/block_sdk_suite.go
+2 -2
View File
@@ -18,8 +18,8 @@ import (
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"github.com/skip-mev/block-sdk/lanes/base"
"github.com/skip-mev/block-sdk/lanes/free"
"github.com/skip-mev/block-sdk/v2/lanes/base"
"github.com/skip-mev/block-sdk/v2/lanes/free"
)
const (
tests/e2e/chain_setup.go
+2 -2
View File
@@ -37,8 +37,8 @@ import (
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
servicetypes "github.com/skip-mev/block-sdk/block/service/types"
auctiontypes "github.com/skip-mev/block-sdk/x/auction/types"
servicetypes "github.com/skip-mev/block-sdk/v2/block/service/types"
auctiontypes "github.com/skip-mev/block-sdk/v2/x/auction/types"
)
type KeyringOverride struct {
tests/e2e/go.mod
+4 -4
View File
@@ -1,4 +1,4 @@
module github.com/skip-mev/block-sdk/tests/e2e
module github.com/skip-mev/block-sdk/v2/tests/e2e
go 1.21.5
@@ -6,14 +6,14 @@ replace (
github.com/ChainSafe/go-schnorrkel => github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d
github.com/ChainSafe/go-schnorrkel/1 => github.com/ChainSafe/go-schnorrkel v1.0.0
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
github.com/skip-mev/block-sdk => ../../
github.com/skip-mev/block-sdk/v2 => ../../
)
require (
cosmossdk.io/math v1.2.0
github.com/cometbft/cometbft v0.38.2
github.com/cosmos/cosmos-sdk v0.50.2
github.com/skip-mev/block-sdk v1.0.0 // reference local
github.com/skip-mev/block-sdk/v2 v2.1.0 // reference local
github.com/strangelove-ventures/interchaintest/v8 v8.0.0
github.com/stretchr/testify v1.8.4
go.uber.org/zap v1.26.0
@@ -235,7 +235,7 @@ require (
google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
google.golang.org/protobuf v1.31.0 // indirect
google.golang.org/protobuf v1.32.0 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
tests/e2e/go.sum
+2 -2
View File
@@ -1759,8 +1759,8 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ
google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
tests/integration/integration_test.go
+3 -3
View File
@@ -8,9 +8,9 @@ import (
"github.com/skip-mev/chaintestutil/encoding"
"github.com/stretchr/testify/suite"
testkeeper "github.com/skip-mev/block-sdk/testutils/keeper"
auctiontypes "github.com/skip-mev/block-sdk/x/auction/types"
blocksdktypes "github.com/skip-mev/block-sdk/x/blocksdk/types"
testkeeper "github.com/skip-mev/block-sdk/v2/testutils/keeper"
auctiontypes "github.com/skip-mev/block-sdk/v2/x/auction/types"
blocksdktypes "github.com/skip-mev/block-sdk/v2/x/blocksdk/types"
)
type IntegrationTestSuite struct {
tests/integration/network/auction_test.go
+1 -1
View File
@@ -12,7 +12,7 @@ import (
"github.com/skip-mev/chaintestutil/network"
"github.com/stretchr/testify/require"
auctiontypes "github.com/skip-mev/block-sdk/x/auction/types"
auctiontypes "github.com/skip-mev/block-sdk/v2/x/auction/types"
)
func (s *NetworkTestSuite) TestAuctionWithValidBids() {
tests/integration/network/mempool_test.go
+2 -2
View File
@@ -20,8 +20,8 @@ import (
"github.com/skip-mev/chaintestutil/account"
"github.com/skip-mev/chaintestutil/network"
blockservicetypes "github.com/skip-mev/block-sdk/block/service/types"
auctiontypes "github.com/skip-mev/block-sdk/x/auction/types"
blockservicetypes "github.com/skip-mev/block-sdk/v2/block/service/types"
auctiontypes "github.com/skip-mev/block-sdk/v2/x/auction/types"
)
const (
tests/integration/network/network_test.go
+3 -3
View File
@@ -19,9 +19,9 @@ import (
"github.com/stretchr/testify/suite"
"google.golang.org/grpc/status"
"github.com/skip-mev/block-sdk/testutils/networksuite"
auctiontypes "github.com/skip-mev/block-sdk/x/auction/types"
blocksdktypes "github.com/skip-mev/block-sdk/x/blocksdk/types"
"github.com/skip-mev/block-sdk/v2/testutils/networksuite"
auctiontypes "github.com/skip-mev/block-sdk/v2/x/auction/types"
blocksdktypes "github.com/skip-mev/block-sdk/v2/x/blocksdk/types"
)
// NetworkTestSuite is a test suite for network integration tests.