From 196af01707a5f9193367a32091bd5cb602fe4b6c Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Tue, 8 Mar 2016 00:43:39 -0500 Subject: [PATCH] maxTxs=-1 for Reap to return empty --- mempool/mempool.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mempool/mempool.go b/mempool/mempool.go index 46e71f4e8..0fab674bf 100644 --- a/mempool/mempool.go +++ b/mempool/mempool.go @@ -201,10 +201,12 @@ func (mem *Mempool) Reap(maxTxs int) []types.Tx { return txs } -// maxTxs: 0 means uncapped +// maxTxs: 0 means uncapped, -1 means none func (mem *Mempool) collectTxs(maxTxs int) []types.Tx { if maxTxs == 0 { maxTxs = mem.txs.Len() + } else if maxTxs < 0 { + return []types.Tx{} } txs := make([]types.Tx, 0, MinInt(mem.txs.Len(), maxTxs)) for e := mem.txs.Front(); e != nil && len(txs) < maxTxs; e = e.Next() {