Skip to content

Commit 1d2a795

Browse files
GAtom22tac0turtlejulienrbrt
authored
fix(mempool): use no-op mempool as default (#19970)
Co-authored-by: Marko <marko@baricevic.me> Co-authored-by: Julien Robert <julien@rbrt.fr>
1 parent 2af3cf2 commit 1d2a795

File tree

6 files changed

+12
-11
lines changed

6 files changed

+12
-11
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ Every module contains its own CHANGELOG.md. Please refer to the module you are i
108108
* (crypto) [#19691](https://github.com/cosmos/cosmos-sdk/pull/19691) Fix tx sign doesn't throw an error when incorrect Ledger is used.
109109
* [#19833](https://github.com/cosmos/cosmos-sdk/pull/19833) Fix some places in which we call Remove inside a Walk.
110110
* [#19851](https://github.com/cosmos/cosmos-sdk/pull/19851) Fix some places in which we call Remove inside a Walk (x/staking and x/gov).
111+
* (baseapp) [#19970](https://github.com/cosmos/cosmos-sdk/pull/19970) Fix default config values to use no-op mempool as default.
111112

112113
### API Breaking Changes
113114

baseapp/abci_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1404,7 +1404,7 @@ func TestPrecommiterCalledWithDeliverState(t *testing.T) {
14041404

14051405
func TestABCI_Proposal_HappyPath(t *testing.T) {
14061406
anteKey := []byte("ante-key")
1407-
pool := mempool.NewSenderNonceMempool()
1407+
pool := mempool.NewSenderNonceMempool(mempool.SenderNonceMaxTxOpt(5000))
14081408
anteOpt := func(bapp *baseapp.BaseApp) {
14091409
bapp.SetAnteHandler(anteHandlerTxTest(t, capKey1, anteKey))
14101410
}
@@ -1582,7 +1582,7 @@ func TestABCI_Proposals_WithVE(t *testing.T) {
15821582

15831583
func TestABCI_PrepareProposal_ReachedMaxBytes(t *testing.T) {
15841584
anteKey := []byte("ante-key")
1585-
pool := mempool.NewSenderNonceMempool()
1585+
pool := mempool.NewSenderNonceMempool(mempool.SenderNonceMaxTxOpt(5000))
15861586
anteOpt := func(bapp *baseapp.BaseApp) {
15871587
bapp.SetAnteHandler(anteHandlerTxTest(t, capKey1, anteKey))
15881588
}
@@ -1612,7 +1612,7 @@ func TestABCI_PrepareProposal_ReachedMaxBytes(t *testing.T) {
16121612

16131613
func TestABCI_PrepareProposal_BadEncoding(t *testing.T) {
16141614
anteKey := []byte("ante-key")
1615-
pool := mempool.NewSenderNonceMempool()
1615+
pool := mempool.NewSenderNonceMempool(mempool.SenderNonceMaxTxOpt(5000))
16161616
anteOpt := func(bapp *baseapp.BaseApp) {
16171617
bapp.SetAnteHandler(anteHandlerTxTest(t, capKey1, anteKey))
16181618
}
@@ -1639,7 +1639,7 @@ func TestABCI_PrepareProposal_BadEncoding(t *testing.T) {
16391639
}
16401640

16411641
func TestABCI_PrepareProposal_OverGasUnderBytes(t *testing.T) {
1642-
pool := mempool.NewSenderNonceMempool()
1642+
pool := mempool.NewSenderNonceMempool(mempool.SenderNonceMaxTxOpt(5000))
16431643
suite := NewBaseAppSuite(t, baseapp.SetMempool(pool))
16441644
baseapptestutil.RegisterCounterServer(suite.baseApp.MsgServiceRouter(), NoopCounterServerImpl{})
16451645

@@ -1680,7 +1680,7 @@ func TestABCI_PrepareProposal_OverGasUnderBytes(t *testing.T) {
16801680
}
16811681

16821682
func TestABCI_PrepareProposal_MaxGas(t *testing.T) {
1683-
pool := mempool.NewSenderNonceMempool()
1683+
pool := mempool.NewSenderNonceMempool(mempool.SenderNonceMaxTxOpt(5000))
16841684
suite := NewBaseAppSuite(t, baseapp.SetMempool(pool))
16851685
baseapptestutil.RegisterCounterServer(suite.baseApp.MsgServiceRouter(), NoopCounterServerImpl{})
16861686

@@ -1719,7 +1719,7 @@ func TestABCI_PrepareProposal_MaxGas(t *testing.T) {
17191719

17201720
func TestABCI_PrepareProposal_Failures(t *testing.T) {
17211721
anteKey := []byte("ante-key")
1722-
pool := mempool.NewSenderNonceMempool()
1722+
pool := mempool.NewSenderNonceMempool(mempool.SenderNonceMaxTxOpt(5000))
17231723
anteOpt := func(bapp *baseapp.BaseApp) {
17241724
bapp.SetAnteHandler(anteHandlerTxTest(t, capKey1, anteKey))
17251725
}

server/config/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ func DefaultConfig() *Config {
263263
},
264264
},
265265
Mempool: MempoolConfig{
266-
MaxTxs: 5_000,
266+
MaxTxs: -1,
267267
},
268268
}
269269
}

types/mempool/mempool_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ type MempoolTestSuite struct {
211211

212212
func (s *MempoolTestSuite) resetMempool() {
213213
s.iterations = 0
214-
s.mempool = mempool.NewSenderNonceMempool()
214+
s.mempool = mempool.NewSenderNonceMempool(mempool.SenderNonceMaxTxOpt(5000))
215215
}
216216

217217
func (s *MempoolTestSuite) SetupTest() {

types/mempool/sender_nonce.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ var (
2020
_ Iterator = (*senderNonceMempoolIterator)(nil)
2121
)
2222

23-
var DefaultMaxTx = 0
23+
var DefaultMaxTx = -1
2424

2525
// SenderNonceMempool is a mempool that prioritizes transactions within a sender
2626
// by nonce, the lowest first, but selects a random sender on each iteration.

types/mempool/sender_nonce_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ func (s *MempoolTestSuite) TestTxOrder() {
114114
}
115115
for i, tt := range tests {
116116
t.Run(fmt.Sprintf("case %d", i), func(t *testing.T) {
117-
pool := mempool.NewSenderNonceMempool(mempool.SenderNonceSeedOpt(tt.seed))
117+
pool := mempool.NewSenderNonceMempool(mempool.SenderNonceMaxTxOpt(5000), mempool.SenderNonceSeedOpt(tt.seed))
118118
// create test txs and insert into mempool
119119
for i, ts := range tt.txs {
120120
tx := testTx{id: i, priority: int64(ts.p), nonce: uint64(ts.n), address: ts.a}
@@ -172,7 +172,7 @@ func (s *MempoolTestSuite) TestTxNotFoundOnSender() {
172172
t := s.T()
173173
ctx := sdk.NewContext(nil, false, log.NewNopLogger())
174174
accounts := simtypes.RandomAccounts(rand.New(rand.NewSource(0)), 1)
175-
mp := mempool.NewSenderNonceMempool()
175+
mp := mempool.NewSenderNonceMempool(mempool.SenderNonceMaxTxOpt(5000))
176176

177177
txSender := testTx{
178178
nonce: 0,

0 commit comments

Comments
 (0)