continue wading through tests

This commit is contained in:
Callum Waters
2022-09-29 15:56:33 +02:00
parent 178ea47b56
commit b5fa9b11d2
11 changed files with 122 additions and 126 deletions
+2 -2
View File
@@ -37,7 +37,7 @@ func TestCacheAfterUpdate(t *testing.T) {
for tcIndex, tc := range tests {
for i := 0; i < tc.numTxsToCreate; i++ {
tx := kvstore.NewTx(fmt.Sprintf("%d", i), "value")
err := mp.CheckTx(tx, func (resp *abci.ResponseCheckTx) {
err := mp.CheckTx(tx, func(resp *abci.ResponseCheckTx) {
require.False(t, resp.IsErr())
}, mempool.TxInfo{})
require.NoError(t, err)
@@ -53,7 +53,7 @@ func TestCacheAfterUpdate(t *testing.T) {
for _, v := range tc.reAddIndices {
tx := kvstore.NewTx(fmt.Sprintf("%d", v), "value")
_ = mp.CheckTx(tx, func (resp *abci.ResponseCheckTx) {
_ = mp.CheckTx(tx, func(resp *abci.ResponseCheckTx) {
require.False(t, resp.IsErr())
}, mempool.TxInfo{})
}
+8 -8
View File
@@ -208,7 +208,7 @@ func TestMempoolUpdate(t *testing.T) {
// 1. Adds valid txs to the cache
{
tx1 := kvstore.NewTxFromId(1)
tx1 := kvstore.NewTxFromID(1)
err := mp.Update(1, []types.Tx{tx1}, abciResponses(1, abci.CodeTypeOK), nil, nil)
require.NoError(t, err)
err = mp.CheckTx(tx1, nil, mempool.TxInfo{})
@@ -219,7 +219,7 @@ func TestMempoolUpdate(t *testing.T) {
// 2. Removes valid txs from the mempool
{
tx2 := kvstore.NewTxFromId(2)
tx2 := kvstore.NewTxFromID(2)
err := mp.CheckTx(tx2, nil, mempool.TxInfo{})
require.NoError(t, err)
err = mp.Update(1, []types.Tx{tx2}, abciResponses(1, abci.CodeTypeOK), nil, nil)
@@ -229,7 +229,7 @@ func TestMempoolUpdate(t *testing.T) {
// 3. Removes invalid transactions from the cache and the mempool (if present)
{
tx3 := kvstore.NewTxFromId(3)
tx3 := kvstore.NewTxFromID(3)
err := mp.CheckTx(tx3, nil, mempool.TxInfo{})
require.NoError(t, err)
err = mp.Update(1, []types.Tx{tx3}, abciResponses(1, 1), nil, nil)
@@ -411,9 +411,9 @@ func TestSerialReap(t *testing.T) {
}
updateRange := func(start, end int) {
txs := make(types.Txs, end - start)
txs := make(types.Txs, end-start)
for i := start; i < end; i++ {
txs[i - start] = kvstore.NewTx(fmt.Sprintf("%d", i), "true")
txs[i-start] = kvstore.NewTx(fmt.Sprintf("%d", i), "true")
}
if err := mp.Update(0, txs, abciResponses(len(txs), abci.CodeTypeOK), nil, nil); err != nil {
t.Error(err)
@@ -422,9 +422,9 @@ func TestSerialReap(t *testing.T) {
commitRange := func(start, end int) {
// Deliver some txs in a block
txs := make([][]byte, end - start)
txs := make([][]byte, end-start)
for i := start; i < end; i++ {
txs[i - start] = kvstore.NewTx(fmt.Sprintf("%d", i), "true")
txs[i-start] = kvstore.NewTx(fmt.Sprintf("%d", i), "true")
}
res, err := appConnCon.FinalizeBlock(context.Background(), &abci.RequestFinalizeBlock{Txs: txs})
@@ -560,7 +560,7 @@ func TestMempoolTxsBytes(t *testing.T) {
mp.Flush()
assert.EqualValues(t, 0, mp.SizeBytes())
// 5. ErrMempoolIsFull is returned when/if MaxTxsBytes limit is reached.
tx3 := kvstore.NewRandomTx(100)
err = mp.CheckTx(tx3, nil, mempool.TxInfo{})
+2 -2
View File
@@ -170,7 +170,7 @@ func TestReactor_MaxTxBytes(t *testing.T) {
// Broadcast a tx, which has the max size
// => ensure it's received by the second reactor.
tx1 := kvstore.NewRandomTx(config.Mempool.MaxTxBytes)
err := reactors[0].mempool.CheckTx(tx1, func (resp *abci.ResponseCheckTx) {
err := reactors[0].mempool.CheckTx(tx1, func(resp *abci.ResponseCheckTx) {
require.False(t, resp.IsErr())
}, mempool.TxInfo{SenderID: mempool.UnknownPeerID})
require.NoError(t, err)
@@ -182,7 +182,7 @@ func TestReactor_MaxTxBytes(t *testing.T) {
// Broadcast a tx, which is beyond the max size
// => ensure it's not sent
tx2 := kvstore.NewRandomTx(config.Mempool.MaxTxBytes + 1)
err = reactors[0].mempool.CheckTx(tx2, func (resp *abci.ResponseCheckTx) {
err = reactors[0].mempool.CheckTx(tx2, func(resp *abci.ResponseCheckTx) {
require.False(t, resp.IsErr())
}, mempool.TxInfo{SenderID: mempool.UnknownPeerID})
require.Error(t, err)
+3 -3
View File
@@ -120,7 +120,7 @@ func checkTxs(t *testing.T, txmp *TxMempool, numTxs int, peerID uint16) []testTx
tx: []byte(fmt.Sprintf("sender-%d-%d=%d", i, peerID, priority)),
priority: priority,
}
require.NoError(t, txmp.CheckTx(txs[i].tx, func (resp *abci.ResponseCheckTx) {
require.NoError(t, txmp.CheckTx(txs[i].tx, func(resp *abci.ResponseCheckTx) {
require.False(t, resp.IsErr(), txs[i].tx)
}, txInfo))
}
@@ -405,13 +405,13 @@ func TestTxMempool_CheckTxExceedsMaxSize(t *testing.T) {
txmp := setup(t, 0)
rng := rand.New(rand.NewSource(time.Now().UnixNano()))
tx := kvstore.NewRandomTx(txmp.config.MaxTxBytes+1)
tx := kvstore.NewRandomTx(txmp.config.MaxTxBytes + 1)
_, err := rng.Read(tx)
require.NoError(t, err)
require.Error(t, txmp.CheckTx(tx, nil, mempool.TxInfo{SenderID: 0}))
tx = kvstore.NewRandomTx(txmp.config.MaxTxBytes-1)
tx = kvstore.NewRandomTx(txmp.config.MaxTxBytes - 1)
_, err = rng.Read(tx)
require.NoError(t, err)