diff options
| author | Felix Lange <fjl@twurst.com> | 2016-10-10 22:19:05 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-10 22:19:05 +0800 |
| commit | 5a6008e004a6611d7a478495d083eaf26e52c5f1 (patch) | |
| tree | 9986a1f364306b8a09234125d623d99b4c56d098 /eth/sync.go | |
| parent | 4fced0972d9bf2802cb9c3eb16cedc79c9dd60a1 (diff) | |
| parent | abaa56fea59f38fcea4fb6a7537074dbe845cf51 (diff) | |
| download | go-tangerine-1.4.17.tar go-tangerine-1.4.17.tar.gz go-tangerine-1.4.17.tar.bz2 go-tangerine-1.4.17.tar.lz go-tangerine-1.4.17.tar.xz go-tangerine-1.4.17.tar.zst go-tangerine-1.4.17.zip | |
Merge pull request #3116 from fjl/release/1.4v1.4.17
Backport TxPool limits to release/1.4
Diffstat (limited to 'eth/sync.go')
| -rw-r--r-- | eth/sync.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/eth/sync.go b/eth/sync.go index e0418d4d8..c78f98b40 100644 --- a/eth/sync.go +++ b/eth/sync.go @@ -45,7 +45,10 @@ type txsync struct { // syncTransactions starts sending all currently pending transactions to the given peer. func (pm *ProtocolManager) syncTransactions(p *peer) { - txs := pm.txpool.GetTransactions() + var txs types.Transactions + for _, batch := range pm.txpool.Pending() { + txs = append(txs, batch...) + } if len(txs) == 0 { return } |