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
block/base/abci.go
+3 -3
View File
@@ -3,9 +3,9 @@ package base
import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/block"
"github.com/skip-mev/block-sdk/block/proposals"
"github.com/skip-mev/block-sdk/block/utils"
"github.com/skip-mev/block-sdk/v2/block"
"github.com/skip-mev/block-sdk/v2/block/proposals"
"github.com/skip-mev/block-sdk/v2/block/utils"
)
// PrepareLane will prepare a partial proposal for the lane. It will select transactions from the
block/base/config.go
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"cosmossdk.io/math"
sdk "github.com/cosmos/cosmos-sdk/types"
signer_extraction "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter"
signer_extraction "github.com/skip-mev/block-sdk/v2/adapters/signer_extraction_adapter"
)
// LaneConfig defines the basic configurations needed for a lane.
block/base/lane.go
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"cosmossdk.io/math"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/block"
"github.com/skip-mev/block-sdk/v2/block"
)
var _ block.Lane = (*BaseLane)(nil)
block/base/mempool.go
+2 -2
View File
@@ -8,8 +8,8 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
sdkmempool "github.com/cosmos/cosmos-sdk/types/mempool"
signer_extraction "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter"
"github.com/skip-mev/block-sdk/block/utils"
signer_extraction "github.com/skip-mev/block-sdk/v2/adapters/signer_extraction_adapter"
"github.com/skip-mev/block-sdk/v2/block/utils"
)
type (
block/base/mempool_test.go
+2 -2
View File
@@ -9,8 +9,8 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/stretchr/testify/require"
signerextraction "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter"
"github.com/skip-mev/block-sdk/testutils"
signerextraction "github.com/skip-mev/block-sdk/v2/adapters/signer_extraction_adapter"
"github.com/skip-mev/block-sdk/v2/testutils"
)
type txGen struct {
block/base/options.go
+1 -1
View File
@@ -3,7 +3,7 @@ package base
import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/block"
"github.com/skip-mev/block-sdk/v2/block"
)
// LaneOption defines a function that can be used to set options on a lane.
block/base/priority_nonce.go
+1 -1
View File
@@ -22,7 +22,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
sdkmempool "github.com/cosmos/cosmos-sdk/types/mempool"
signer_extraction "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter"
signer_extraction "github.com/skip-mev/block-sdk/v2/adapters/signer_extraction_adapter"
)
var (
block/base/proposals.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/block/proposals"
"github.com/skip-mev/block-sdk/v2/block/proposals"
)
// DefaultProposalHandler returns a default implementation of the PrepareLaneHandler and
block/base/tx_info.go
+1 -1
View File
@@ -8,7 +8,7 @@ import (
comettypes "github.com/cometbft/cometbft/types"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/block/utils"
"github.com/skip-mev/block-sdk/v2/block/utils"
)
// GetTxInfo returns various information about the transaction that
block/base/tx_priority_test.go
+3 -2
View File
@@ -7,9 +7,10 @@ import (
"cosmossdk.io/math"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/block/base"
"github.com/skip-mev/block-sdk/testutils"
"github.com/stretchr/testify/require"
"github.com/skip-mev/block-sdk/v2/block/base"
"github.com/skip-mev/block-sdk/v2/testutils"
)
func TestNopTxPriority(t *testing.T) {
block/base/types.go
+1 -1
View File
@@ -3,7 +3,7 @@ package base
import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/block/proposals"
"github.com/skip-mev/block-sdk/v2/block/proposals"
)
type (
block/lane.go
+2 -2
View File
@@ -5,8 +5,8 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
sdkmempool "github.com/cosmos/cosmos-sdk/types/mempool"
"github.com/skip-mev/block-sdk/block/proposals"
"github.com/skip-mev/block-sdk/block/utils"
"github.com/skip-mev/block-sdk/v2/block/proposals"
"github.com/skip-mev/block-sdk/v2/block/utils"
)
// LaneMempool defines the interface a lane's mempool should implement. The basic API
block/lane_test.go
+2 -2
View File
@@ -3,8 +3,8 @@ package block_test
import (
"fmt"
"github.com/skip-mev/block-sdk/block"
"github.com/skip-mev/block-sdk/block/mocks"
"github.com/skip-mev/block-sdk/v2/block"
"github.com/skip-mev/block-sdk/v2/block/mocks"
)
func (suite *BlockBusterTestSuite) TestFindLane() {
block/mempool.go
+1 -1
View File
@@ -9,7 +9,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
sdkmempool "github.com/cosmos/cosmos-sdk/types/mempool"
blocksdkmoduletypes "github.com/skip-mev/block-sdk/x/blocksdk/types"
blocksdkmoduletypes "github.com/skip-mev/block-sdk/v2/x/blocksdk/types"
)
var _ Mempool = (*LanedMempool)(nil)
block/mempool_test.go
+10 -10
View File
@@ -5,9 +5,9 @@ import (
"testing"
"time"
blocksdkmoduletypes "github.com/skip-mev/block-sdk/x/blocksdk/types"
blocksdkmoduletypes "github.com/skip-mev/block-sdk/v2/x/blocksdk/types"
"github.com/skip-mev/block-sdk/block/mocks"
"github.com/skip-mev/block-sdk/v2/block/mocks"
"cosmossdk.io/log"
"cosmossdk.io/math"
@@ -16,14 +16,14 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/stretchr/testify/suite"
signer_extraction "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter"
"github.com/skip-mev/block-sdk/block"
"github.com/skip-mev/block-sdk/block/base"
defaultlane "github.com/skip-mev/block-sdk/lanes/base"
"github.com/skip-mev/block-sdk/lanes/free"
"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"
signer_extraction "github.com/skip-mev/block-sdk/v2/adapters/signer_extraction_adapter"
"github.com/skip-mev/block-sdk/v2/block"
"github.com/skip-mev/block-sdk/v2/block/base"
defaultlane "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"
testutils "github.com/skip-mev/block-sdk/v2/testutils"
auctiontypes "github.com/skip-mev/block-sdk/v2/x/auction/types"
)
type BlockBusterTestSuite struct {
block/mocks/lane.go
+56 -4
View File
@@ -1,11 +1,11 @@
// Code generated by mockery v2.30.1. DO NOT EDIT.
// Code generated by mockery v2.40.1. DO NOT EDIT.
package mocks
import (
context "context"
block "github.com/skip-mev/block-sdk/block"
block "github.com/skip-mev/block-sdk/v2/block"
math "cosmossdk.io/math"
@@ -13,11 +13,11 @@ import (
mock "github.com/stretchr/testify/mock"
proposals "github.com/skip-mev/block-sdk/block/proposals"
proposals "github.com/skip-mev/block-sdk/v2/block/proposals"
types "github.com/cosmos/cosmos-sdk/types"
utils "github.com/skip-mev/block-sdk/block/utils"
utils "github.com/skip-mev/block-sdk/v2/block/utils"
)
// Lane is an autogenerated mock type for the Lane type
@@ -29,6 +29,10 @@ type Lane struct {
func (_m *Lane) Compare(ctx types.Context, this types.Tx, other types.Tx) (int, error) {
ret := _m.Called(ctx, this, other)
if len(ret) == 0 {
panic("no return value specified for Compare")
}
var r0 int
var r1 error
if rf, ok := ret.Get(0).(func(types.Context, types.Tx, types.Tx) (int, error)); ok {
@@ -53,6 +57,10 @@ func (_m *Lane) Compare(ctx types.Context, this types.Tx, other types.Tx) (int,
func (_m *Lane) Contains(tx types.Tx) bool {
ret := _m.Called(tx)
if len(ret) == 0 {
panic("no return value specified for Contains")
}
var r0 bool
if rf, ok := ret.Get(0).(func(types.Tx) bool); ok {
r0 = rf(tx)
@@ -67,6 +75,10 @@ func (_m *Lane) Contains(tx types.Tx) bool {
func (_m *Lane) CountTx() int {
ret := _m.Called()
if len(ret) == 0 {
panic("no return value specified for CountTx")
}
var r0 int
if rf, ok := ret.Get(0).(func() int); ok {
r0 = rf()
@@ -81,6 +93,10 @@ func (_m *Lane) CountTx() int {
func (_m *Lane) GetMaxBlockSpace() math.LegacyDec {
ret := _m.Called()
if len(ret) == 0 {
panic("no return value specified for GetMaxBlockSpace")
}
var r0 math.LegacyDec
if rf, ok := ret.Get(0).(func() math.LegacyDec); ok {
r0 = rf()
@@ -95,6 +111,10 @@ func (_m *Lane) GetMaxBlockSpace() math.LegacyDec {
func (_m *Lane) GetTxInfo(ctx types.Context, tx types.Tx) (utils.TxWithInfo, error) {
ret := _m.Called(ctx, tx)
if len(ret) == 0 {
panic("no return value specified for GetTxInfo")
}
var r0 utils.TxWithInfo
var r1 error
if rf, ok := ret.Get(0).(func(types.Context, types.Tx) (utils.TxWithInfo, error)); ok {
@@ -119,6 +139,10 @@ func (_m *Lane) GetTxInfo(ctx types.Context, tx types.Tx) (utils.TxWithInfo, err
func (_m *Lane) Insert(_a0 context.Context, _a1 types.Tx) error {
ret := _m.Called(_a0, _a1)
if len(ret) == 0 {
panic("no return value specified for Insert")
}
var r0 error
if rf, ok := ret.Get(0).(func(context.Context, types.Tx) error); ok {
r0 = rf(_a0, _a1)
@@ -133,6 +157,10 @@ func (_m *Lane) Insert(_a0 context.Context, _a1 types.Tx) error {
func (_m *Lane) Match(ctx types.Context, tx types.Tx) bool {
ret := _m.Called(ctx, tx)
if len(ret) == 0 {
panic("no return value specified for Match")
}
var r0 bool
if rf, ok := ret.Get(0).(func(types.Context, types.Tx) bool); ok {
r0 = rf(ctx, tx)
@@ -147,6 +175,10 @@ func (_m *Lane) Match(ctx types.Context, tx types.Tx) bool {
func (_m *Lane) Name() string {
ret := _m.Called()
if len(ret) == 0 {
panic("no return value specified for Name")
}
var r0 string
if rf, ok := ret.Get(0).(func() string); ok {
r0 = rf()
@@ -161,6 +193,10 @@ func (_m *Lane) Name() string {
func (_m *Lane) PrepareLane(ctx types.Context, proposal proposals.Proposal, next block.PrepareLanesHandler) (proposals.Proposal, error) {
ret := _m.Called(ctx, proposal, next)
if len(ret) == 0 {
panic("no return value specified for PrepareLane")
}
var r0 proposals.Proposal
var r1 error
if rf, ok := ret.Get(0).(func(types.Context, proposals.Proposal, block.PrepareLanesHandler) (proposals.Proposal, error)); ok {
@@ -185,6 +221,10 @@ func (_m *Lane) PrepareLane(ctx types.Context, proposal proposals.Proposal, next
func (_m *Lane) Priority(ctx types.Context, tx types.Tx) interface{} {
ret := _m.Called(ctx, tx)
if len(ret) == 0 {
panic("no return value specified for Priority")
}
var r0 interface{}
if rf, ok := ret.Get(0).(func(types.Context, types.Tx) interface{}); ok {
r0 = rf(ctx, tx)
@@ -201,6 +241,10 @@ func (_m *Lane) Priority(ctx types.Context, tx types.Tx) interface{} {
func (_m *Lane) ProcessLane(ctx types.Context, proposal proposals.Proposal, txs []types.Tx, next block.ProcessLanesHandler) (proposals.Proposal, error) {
ret := _m.Called(ctx, proposal, txs, next)
if len(ret) == 0 {
panic("no return value specified for ProcessLane")
}
var r0 proposals.Proposal
var r1 error
if rf, ok := ret.Get(0).(func(types.Context, proposals.Proposal, []types.Tx, block.ProcessLanesHandler) (proposals.Proposal, error)); ok {
@@ -225,6 +269,10 @@ func (_m *Lane) ProcessLane(ctx types.Context, proposal proposals.Proposal, txs
func (_m *Lane) Remove(_a0 types.Tx) error {
ret := _m.Called(_a0)
if len(ret) == 0 {
panic("no return value specified for Remove")
}
var r0 error
if rf, ok := ret.Get(0).(func(types.Tx) error); ok {
r0 = rf(_a0)
@@ -239,6 +287,10 @@ func (_m *Lane) Remove(_a0 types.Tx) error {
func (_m *Lane) Select(_a0 context.Context, _a1 [][]byte) mempool.Iterator {
ret := _m.Called(_a0, _a1)
if len(ret) == 0 {
panic("no return value specified for Select")
}
var r0 mempool.Iterator
if rf, ok := ret.Get(0).(func(context.Context, [][]byte) mempool.Iterator); ok {
r0 = rf(_a0, _a1)
block/mocks/lane_fetcher.go
+1 -1
View File
@@ -3,7 +3,7 @@ package mocks
import (
sdk "github.com/cosmos/cosmos-sdk/types"
blocksdkmoduletypes "github.com/skip-mev/block-sdk/x/blocksdk/types"
blocksdkmoduletypes "github.com/skip-mev/block-sdk/v2/x/blocksdk/types"
)
type MockLaneFetcher struct {
block/mocks/lane_mempool.go
+29 -1
View File
@@ -1,4 +1,4 @@
// Code generated by mockery v2.30.1. DO NOT EDIT.
// Code generated by mockery v2.40.1. DO NOT EDIT.
package mocks
@@ -20,6 +20,10 @@ type LaneMempool struct {
func (_m *LaneMempool) Compare(ctx types.Context, this types.Tx, other types.Tx) (int, error) {
ret := _m.Called(ctx, this, other)
if len(ret) == 0 {
panic("no return value specified for Compare")
}
var r0 int
var r1 error
if rf, ok := ret.Get(0).(func(types.Context, types.Tx, types.Tx) (int, error)); ok {
@@ -44,6 +48,10 @@ func (_m *LaneMempool) Compare(ctx types.Context, this types.Tx, other types.Tx)
func (_m *LaneMempool) Contains(tx types.Tx) bool {
ret := _m.Called(tx)
if len(ret) == 0 {
panic("no return value specified for Contains")
}
var r0 bool
if rf, ok := ret.Get(0).(func(types.Tx) bool); ok {
r0 = rf(tx)
@@ -58,6 +66,10 @@ func (_m *LaneMempool) Contains(tx types.Tx) bool {
func (_m *LaneMempool) CountTx() int {
ret := _m.Called()
if len(ret) == 0 {
panic("no return value specified for CountTx")
}
var r0 int
if rf, ok := ret.Get(0).(func() int); ok {
r0 = rf()
@@ -72,6 +84,10 @@ func (_m *LaneMempool) CountTx() int {
func (_m *LaneMempool) Insert(_a0 context.Context, _a1 types.Tx) error {
ret := _m.Called(_a0, _a1)
if len(ret) == 0 {
panic("no return value specified for Insert")
}
var r0 error
if rf, ok := ret.Get(0).(func(context.Context, types.Tx) error); ok {
r0 = rf(_a0, _a1)
@@ -86,6 +102,10 @@ func (_m *LaneMempool) Insert(_a0 context.Context, _a1 types.Tx) error {
func (_m *LaneMempool) Priority(ctx types.Context, tx types.Tx) interface{} {
ret := _m.Called(ctx, tx)
if len(ret) == 0 {
panic("no return value specified for Priority")
}
var r0 interface{}
if rf, ok := ret.Get(0).(func(types.Context, types.Tx) interface{}); ok {
r0 = rf(ctx, tx)
@@ -102,6 +122,10 @@ func (_m *LaneMempool) Priority(ctx types.Context, tx types.Tx) interface{} {
func (_m *LaneMempool) Remove(_a0 types.Tx) error {
ret := _m.Called(_a0)
if len(ret) == 0 {
panic("no return value specified for Remove")
}
var r0 error
if rf, ok := ret.Get(0).(func(types.Tx) error); ok {
r0 = rf(_a0)
@@ -116,6 +140,10 @@ func (_m *LaneMempool) Remove(_a0 types.Tx) error {
func (_m *LaneMempool) Select(_a0 context.Context, _a1 [][]byte) mempool.Iterator {
ret := _m.Called(_a0, _a1)
if len(ret) == 0 {
panic("no return value specified for Select")
}
var r0 mempool.Iterator
if rf, ok := ret.Get(0).(func(context.Context, [][]byte) mempool.Iterator); ok {
r0 = rf(_a0, _a1)
block/proposals/proposals.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"cosmossdk.io/math"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/block/proposals/types"
"github.com/skip-mev/block-sdk/v2/block/proposals/types"
)
type (
block/proposals/proposals_test.go
+8 -8
View File
@@ -9,14 +9,14 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/stretchr/testify/require"
signerextraction "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter"
"github.com/skip-mev/block-sdk/block/base"
"github.com/skip-mev/block-sdk/block/mocks"
"github.com/skip-mev/block-sdk/block/proposals"
"github.com/skip-mev/block-sdk/block/proposals/types"
"github.com/skip-mev/block-sdk/block/utils"
defaultlane "github.com/skip-mev/block-sdk/lanes/base"
"github.com/skip-mev/block-sdk/testutils"
signerextraction "github.com/skip-mev/block-sdk/v2/adapters/signer_extraction_adapter"
"github.com/skip-mev/block-sdk/v2/block/base"
"github.com/skip-mev/block-sdk/v2/block/mocks"
"github.com/skip-mev/block-sdk/v2/block/proposals"
"github.com/skip-mev/block-sdk/v2/block/proposals/types"
"github.com/skip-mev/block-sdk/v2/block/utils"
defaultlane "github.com/skip-mev/block-sdk/v2/lanes/base"
"github.com/skip-mev/block-sdk/v2/testutils"
)
func TestUpdateProposal(t *testing.T) {
block/proposals/update.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"cosmossdk.io/math"
"github.com/skip-mev/block-sdk/block/utils"
"github.com/skip-mev/block-sdk/v2/block/utils"
)
// Lane defines the contract interface for a lane.
block/service/service.go
+2 -2
View File
@@ -6,8 +6,8 @@ import (
gogogrpc "github.com/cosmos/gogoproto/grpc"
"github.com/grpc-ecosystem/grpc-gateway/runtime"
"github.com/skip-mev/block-sdk/block"
"github.com/skip-mev/block-sdk/block/service/types"
"github.com/skip-mev/block-sdk/v2/block"
"github.com/skip-mev/block-sdk/v2/block/service/types"
)
var _ types.ServiceServer = (*QueryService)(nil)
block/service/service_test.go
+8 -8
View File
@@ -10,14 +10,14 @@ import (
"github.com/stretchr/testify/require"
"github.com/skip-mev/block-sdk/block"
"github.com/skip-mev/block-sdk/block/service"
"github.com/skip-mev/block-sdk/block/service/types"
"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/testutils"
"github.com/skip-mev/block-sdk/testutils/mempool"
"github.com/skip-mev/block-sdk/v2/block"
"github.com/skip-mev/block-sdk/v2/block/service"
"github.com/skip-mev/block-sdk/v2/block/service/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/testutils"
"github.com/skip-mev/block-sdk/v2/testutils/mempool"
)
func TestGetTxDistribution(t *testing.T) {
block/types.go
+1 -1
View File
@@ -3,7 +3,7 @@ package block
import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/block/proposals"
"github.com/skip-mev/block-sdk/v2/block/proposals"
)
type (
block/utils/utils.go
+1 -1
View File
@@ -9,7 +9,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
sdkmempool "github.com/cosmos/cosmos-sdk/types/mempool"
signerextraction "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter"
signerextraction "github.com/skip-mev/block-sdk/v2/adapters/signer_extraction_adapter"
)
// TxWithInfo contains the information required for a transaction to be