diff --git a/consensus/mempool_test.go b/consensus/mempool_test.go index 4b26e0d7a..ca40d65f3 100644 --- a/consensus/mempool_test.go +++ b/consensus/mempool_test.go @@ -2,7 +2,6 @@ package consensus import ( "context" - "encoding/binary" "fmt" "os" "testing" @@ -150,23 +149,25 @@ func TestMempoolRmBadTx(t *testing.T) { require.NoError(t, err) // increment the counter by 1 - txBytes := make([]byte, 8) - binary.BigEndian.PutUint64(txBytes, uint64(0)) - - res, err := app.FinalizeBlock(context.Background(), &abci.RequestFinalizeBlock{Txs: [][]byte{kvstore.NewTx("key", "value")}}) + txBytes := kvstore.NewTx("key", "value") + res, err := app.FinalizeBlock(context.Background(), &abci.RequestFinalizeBlock{Txs: [][]byte{txBytes}}) require.NoError(t, err) assert.False(t, res.TxResults[0].IsErr()) assert.True(t, len(res.AgreedAppData) > 0) + _, err = app.Commit(context.Background(), &abci.RequestCommit{}) + require.NoError(t, err) + emptyMempoolCh := make(chan struct{}) checkTxRespCh := make(chan struct{}) go func() { // Try to send the tx through the mempool. // CheckTx should not err, but the app should return a bad abci code // and the tx should get removed from the pool - err := assertMempool(cs.txNotifier).CheckTx(txBytes, func(r *abci.ResponseCheckTx) { + invalidTx := []byte("invalidTx") + err := assertMempool(cs.txNotifier).CheckTx(invalidTx, func(r *abci.ResponseCheckTx) { if r.Code != kvstore.CodeTypeInvalidTxFormat { - t.Errorf("expected checktx to return bad nonce, got %v", r) + t.Errorf("expected checktx to return invalid format, got %v", r) return } checkTxRespCh <- struct{}{} @@ -178,7 +179,7 @@ func TestMempoolRmBadTx(t *testing.T) { // check for the tx for { - txs := assertMempool(cs.txNotifier).ReapMaxBytesMaxGas(int64(len(txBytes)), -1) + txs := assertMempool(cs.txNotifier).ReapMaxBytesMaxGas(int64(len(invalidTx)), -1) if len(txs) == 0 { emptyMempoolCh <- struct{}{} return