From a571eeb7a4cb8c62c70a9c5e31501300a06fab5f Mon Sep 17 00:00:00 2001 From: Adam Babik Date: Tue, 28 Aug 2018 10:49:08 +0200 Subject: [PATCH] add patch 0036-fix-whisper-expire-loop (#1175) --- .../patches/geth/0036-fix-whisper-expire-loop.patch | 13 +++++++++++++ .../go-ethereum/whisper/whisperv6/whisper.go | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 _assets/patches/geth/0036-fix-whisper-expire-loop.patch diff --git a/_assets/patches/geth/0036-fix-whisper-expire-loop.patch b/_assets/patches/geth/0036-fix-whisper-expire-loop.patch new file mode 100644 index 000000000..cf9593818 --- /dev/null +++ b/_assets/patches/geth/0036-fix-whisper-expire-loop.patch @@ -0,0 +1,13 @@ +diff --git a/whisper/whisperv6/whisper.go b/whisper/whisperv6/whisper.go +index 48bbca3c..482457cb 100644 +--- a/whisper/whisperv6/whisper.go ++++ b/whisper/whisperv6/whisper.go +@@ -1060,7 +1060,7 @@ func (whisper *Whisper) expire() { + whisper.stats.messagesCleared++ + whisper.stats.memoryCleared += sz + whisper.stats.memoryUsed -= sz +- return true ++ return false + }) + whisper.expirations[expiry].Clear() + delete(whisper.expirations, expiry) diff --git a/vendor/github.com/ethereum/go-ethereum/whisper/whisperv6/whisper.go b/vendor/github.com/ethereum/go-ethereum/whisper/whisperv6/whisper.go index 529f07bea..bb1ea2d2c 100644 --- a/vendor/github.com/ethereum/go-ethereum/whisper/whisperv6/whisper.go +++ b/vendor/github.com/ethereum/go-ethereum/whisper/whisperv6/whisper.go @@ -1085,7 +1085,7 @@ func (whisper *Whisper) expire() { whisper.stats.messagesCleared++ whisper.stats.memoryCleared += sz whisper.stats.memoryUsed -= sz - return true + return false }) whisper.expirations[expiry].Clear() delete(whisper.expirations, expiry)