Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: Remove BlockSDK Module #530

Merged
merged 2 commits into from
Jun 24, 2024
Merged

chore: Remove BlockSDK Module #530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4f5c4d
rm
davidterpay Jun 20, 2024
5122363
Merge branch 'main' into terpay/sudo-rm-blocksdkmodule
davidterpay Jun 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 2 additions & 13 deletions abci/abci.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,18 +68,12 @@ func (h *ProposalHandler) PrepareProposalHandler() sdk.PrepareProposalHandler {
"height", req.Height,
)

registry, err := h.mempool.Registry(ctx)
if err != nil {
h.logger.Error("failed to get lane registry", "err", err)
return &abci.ResponsePrepareProposal{Txs: make([][]byte, 0)}, err
}

// Get the max gas limit and max block size for the proposal.
_, maxGasLimit := proposals.GetBlockLimits(ctx)
proposal := proposals.NewProposal(h.logger, req.MaxTxBytes, maxGasLimit)

// Fill the proposal with transactions from each lane.
prepareLanesHandler := ChainPrepareLanes(registry)
prepareLanesHandler := ChainPrepareLanes(h.mempool.Registry())
finalProposal, err := prepareLanesHandler(ctx, proposal)
if err != nil {
h.logger.Error("failed to prepare proposal", "err", err)
Expand Down Expand Up @@ -138,14 +132,9 @@ func (h *ProposalHandler) ProcessProposalHandler() sdk.ProcessProposalHandler {
}

// Build handler that will verify the partial proposals according to each lane's verification logic.
registry, err := h.mempool.Registry(ctx)
if err != nil {
h.logger.Error("failed to get lane registry", "err", err)
return &abci.ResponseProcessProposal{Status: abci.ResponseProcessProposal_REJECT}, err
}
processLanesHandler := ChainProcessLanes(h.mempool.Registry())

// Verify the proposal.
processLanesHandler := ChainProcessLanes(registry)
finalProposal, err := processLanesHandler(
ctx,
proposals.NewProposalWithContext(ctx, h.logger),
Expand Down
112 changes: 0 additions & 112 deletions abci/abci_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,40 +15,10 @@ import (

"github.com/skip-mev/block-sdk/v2/abci"
"github.com/skip-mev/block-sdk/v2/block"
"github.com/skip-mev/block-sdk/v2/block/mocks"
"github.com/skip-mev/block-sdk/v2/lanes/free"
testutils "github.com/skip-mev/block-sdk/v2/testutils"
blocksdkmoduletypes "github.com/skip-mev/block-sdk/v2/x/blocksdk/types"
)

type MockLaneFetcher struct {
getLaneHandler func() (blocksdkmoduletypes.Lane, error)
getLanesHandler func() []blocksdkmoduletypes.Lane
}

func NewMockLaneFetcher(getLane func() (blocksdkmoduletypes.Lane, error), getLanes func() []blocksdkmoduletypes.Lane) MockLaneFetcher {
return MockLaneFetcher{
getLaneHandler: getLane,
getLanesHandler: getLanes,
}
}

func (m *MockLaneFetcher) SetGetLaneHandler(h func() (blocksdkmoduletypes.Lane, error)) {
m.getLaneHandler = h
}

func (m MockLaneFetcher) GetLane(_ sdk.Context, _ string) (blocksdkmoduletypes.Lane, error) {
return m.getLaneHandler()
}

func (m *MockLaneFetcher) SetGetLanesHandler(h func() []blocksdkmoduletypes.Lane) {
m.getLanesHandler = h
}

func (m MockLaneFetcher) GetLanes(_ sdk.Context) []blocksdkmoduletypes.Lane {
return m.getLanesHandler()
}

type ProposalsTestSuite struct {
suite.Suite
ctx sdk.Context
Expand Down Expand Up @@ -522,27 +492,9 @@ func (s *ProposalsTestSuite) TestPrepareProposalEdgeCases() {
defaultLane,
}

chainLanes := []blocksdkmoduletypes.Lane{
{
Id: panicLane.Name(),
MaxBlockSpace: panicLane.GetMaxBlockSpace(),
Order: 0,
},
{
Id: defaultLane.Name(),
MaxBlockSpace: defaultLane.GetMaxBlockSpace(),
Order: 1,
},
}

mempool, err := block.NewLanedMempool(
log.NewNopLogger(),
lanes,
mocks.NewMockLaneFetcher(func() (blocksdkmoduletypes.Lane, error) {
return blocksdkmoduletypes.Lane{}, nil
}, func() []blocksdkmoduletypes.Lane {
return chainLanes
}),
)
s.Require().NoError(err)

Expand Down Expand Up @@ -587,27 +539,9 @@ func (s *ProposalsTestSuite) TestPrepareProposalEdgeCases() {
panicLane,
}

chainLanes := []blocksdkmoduletypes.Lane{
{
Id: panicLane.Name(),
MaxBlockSpace: panicLane.GetMaxBlockSpace(),
Order: 1,
},
{
Id: defaultLane.Name(),
MaxBlockSpace: defaultLane.GetMaxBlockSpace(),
Order: 0,
},
}

mempool, err := block.NewLanedMempool(
log.NewNopLogger(),
lanes,
mocks.NewMockLaneFetcher(func() (blocksdkmoduletypes.Lane, error) {
return blocksdkmoduletypes.Lane{}, nil
}, func() []blocksdkmoduletypes.Lane {
return chainLanes
}),
)
s.Require().NoError(err)

Expand Down Expand Up @@ -654,32 +588,9 @@ func (s *ProposalsTestSuite) TestPrepareProposalEdgeCases() {
defaultLane,
}

chainLanes := []blocksdkmoduletypes.Lane{
{
Id: panicLane.Name(),
MaxBlockSpace: panicLane.GetMaxBlockSpace(),
Order: 0,
},
{
Id: panicLane2.Name(),
MaxBlockSpace: panicLane2.GetMaxBlockSpace(),
Order: 1,
},
{
Id: defaultLane.Name(),
MaxBlockSpace: defaultLane.GetMaxBlockSpace(),
Order: 2,
},
}

mempool, err := block.NewLanedMempool(
log.NewNopLogger(),
lanes,
mocks.NewMockLaneFetcher(func() (blocksdkmoduletypes.Lane, error) {
return blocksdkmoduletypes.Lane{}, nil
}, func() []blocksdkmoduletypes.Lane {
return chainLanes
}),
)
s.Require().NoError(err)

Expand Down Expand Up @@ -726,32 +637,9 @@ func (s *ProposalsTestSuite) TestPrepareProposalEdgeCases() {
panicLane2,
}

chainLanes := []blocksdkmoduletypes.Lane{
{
Id: panicLane.Name(),
MaxBlockSpace: panicLane.GetMaxBlockSpace(),
Order: 1,
},
{
Id: panicLane2.Name(),
MaxBlockSpace: panicLane2.GetMaxBlockSpace(),
Order: 2,
},
{
Id: defaultLane.Name(),
MaxBlockSpace: defaultLane.GetMaxBlockSpace(),
Order: 0,
},
}

mempool, err := block.NewLanedMempool(
log.NewNopLogger(),
lanes,
mocks.NewMockLaneFetcher(func() (blocksdkmoduletypes.Lane, error) {
return blocksdkmoduletypes.Lane{}, nil
}, func() []blocksdkmoduletypes.Lane {
return chainLanes
}),
)
s.Require().NoError(err)

Expand Down
26 changes: 3 additions & 23 deletions abci/checktx/check_tx_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,9 @@ import (
"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"
)

type CheckTxTestSuite struct {
Expand Down Expand Up @@ -62,9 +60,7 @@ func (s *CheckTxTestSuite) TestCheckTxMempoolParity() {
}

mevLane := s.InitLane(math.LegacyOneDec(), txs)
mempool, err := block.NewLanedMempool(s.Ctx.Logger(), []block.Lane{mevLane}, moduleLaneFetcher{
mevLane,
})
mempool, err := block.NewLanedMempool(s.Ctx.Logger(), []block.Lane{mevLane})
s.Require().NoError(err)

cacheDecoder, err := utils.NewDefaultCacheTxDecoder(s.EncCfg.TxConfig.TxDecoder())
Expand Down Expand Up @@ -133,9 +129,7 @@ func (s *CheckTxTestSuite) TestRemovalOnRecheckTx() {
s.Require().NoError(err)

mevLane := s.InitLane(math.LegacyOneDec(), nil)
mempool, err := block.NewLanedMempool(s.Ctx.Logger(), []block.Lane{mevLane}, moduleLaneFetcher{
mevLane,
})
mempool, err := block.NewLanedMempool(s.Ctx.Logger(), []block.Lane{mevLane})
s.Require().NoError(err)

cacheDecoder, err := utils.NewDefaultCacheTxDecoder(s.EncCfg.TxConfig.TxDecoder())
Expand Down Expand Up @@ -193,9 +187,7 @@ func (s *CheckTxTestSuite) TestMEVCheckTxHandler() {
txs := map[sdk.Tx]bool{}

mevLane := s.InitLane(math.LegacyOneDec(), txs)
mempool, err := block.NewLanedMempool(s.Ctx.Logger(), []block.Lane{mevLane}, moduleLaneFetcher{
mevLane,
})
mempool, err := block.NewLanedMempool(s.Ctx.Logger(), []block.Lane{mevLane})
s.Require().NoError(err)

ba := &baseApp{
Expand Down Expand Up @@ -378,15 +370,3 @@ func (baseApp) GetConsensusParams(ctx sdk.Context) cmtproto.ConsensusParams {
func (ba *baseApp) ChainID() string {
return ba.ctx.ChainID()
}

type moduleLaneFetcher struct {
lane *mev.MEVLane
}

func (mlf moduleLaneFetcher) GetLane(sdk.Context, string) (lane blocksdktypes.Lane, err error) {
return blocksdktypes.Lane{}, nil
}

func (mlf moduleLaneFetcher) GetLanes(sdk.Context) []blocksdktypes.Lane {
return nil
}
20 changes: 0 additions & 20 deletions abci/utils_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ import (
"encoding/hex"
"fmt"

blocksdkmoduletypes "github.com/skip-mev/block-sdk/v2/x/blocksdk/types"

"cosmossdk.io/log"
"cosmossdk.io/math"
sdk "github.com/cosmos/cosmos-sdk/types"
Expand Down Expand Up @@ -147,27 +145,9 @@ func (s *ProposalsTestSuite) setUpPanicLane(name string, maxBlockSpace math.Lega
}

func (s *ProposalsTestSuite) setUpProposalHandlers(lanes []block.Lane) *abci.ProposalHandler {
blocksdkLanes := make([]blocksdkmoduletypes.Lane, len(lanes))
for i, lane := range lanes {
blocksdkLanes[i] = blocksdkmoduletypes.Lane{
Id: lane.Name(),
MaxBlockSpace: lane.GetMaxBlockSpace(),
Order: uint64(i),
}
}

laneFetcher := NewMockLaneFetcher(
func() (blocksdkmoduletypes.Lane, error) {
return blocksdkmoduletypes.Lane{}, nil
},
func() []blocksdkmoduletypes.Lane {
return blocksdkLanes
})

mempool, err := block.NewLanedMempool(
log.NewNopLogger(),
lanes,
laneFetcher,
)
s.Require().NoError(err)

Expand Down
Loading
Loading