mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-01-10 06:57:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes after Ethan's review

Browse Source
This commit is contained in:
Anton Kaliaev
2019-02-06 09:40:53 +04:00
parent 0a4dfa9920
commit 8de0ffc965
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mempool/mempool.go
View File

@@ -159,6 +159,7 @@ type Mempool struct {
preCheck PreCheckFunc
postCheck PostCheckFunc
// Atomic integers
txsTotalBytes int64 // see TxsTotalBytes
// Keep a cache of already-seen txs.
@@ -329,11 +330,15 @@ func (mem *Mempool) CheckTx(tx types.Tx, cb func(*abci.Response)) (err error) {
// use defer to unlock mutex because application (*local client*) might panic
defer mem.proxyMtx.Unlock()
if mem.Size() >= mem.config.Size ||
int64(len(tx))+mem.TxsTotalBytes() > mem.config.MaxTxsTotalBytes {
var (
memSize = mem.Size()
txsTotalBytes = mem.TxsTotalBytes()
)
if memSize >= mem.config.Size ||
int64(len(tx))+txsTotalBytes > mem.config.MaxTxsTotalBytes {
return ErrMempoolIsFull{
mem.Size(), mem.config.Size,
mem.TxsTotalBytes(), mem.config.MaxTxsTotalBytes}
memSize, mem.config.Size,
txsTotalBytes, mem.config.MaxTxsTotalBytes}
}
// The size of the corresponding amino-encoded TxMessage