diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2016-04-15 19:44:36 +0800 |
|---|---|---|
| committer | Péter Szilágyi <peterke@gmail.com> | 2016-04-15 19:44:36 +0800 |
| commit | 5c17b2f5211ec98a87140c874483681de4e34391 (patch) | |
| tree | 8bd84be7b7b0051d918ec229f8a3de6a0397dd2b /whisper/whisper.go | |
| parent | fdc5a7dc1a1764c63190a649f70296cbdbc0abe1 (diff) | |
| parent | 3a5bdef962ece873791ab838480892fd75110af1 (diff) | |
| download | dexon-5c17b2f5211ec98a87140c874483681de4e34391.tar dexon-5c17b2f5211ec98a87140c874483681de4e34391.tar.gz dexon-5c17b2f5211ec98a87140c874483681de4e34391.tar.bz2 dexon-5c17b2f5211ec98a87140c874483681de4e34391.tar.lz dexon-5c17b2f5211ec98a87140c874483681de4e34391.tar.xz dexon-5c17b2f5211ec98a87140c874483681de4e34391.tar.zst dexon-5c17b2f5211ec98a87140c874483681de4e34391.zip | |
Merge pull request #2460 from fjl/whisper-expiration-test-delay
whisper: deflake Test*MessageExpiration
Diffstat (limited to 'whisper/whisper.go')
| -rw-r--r-- | whisper/whisper.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/whisper/whisper.go b/whisper/whisper.go index e5f686e43..0a49c1000 100644 --- a/whisper/whisper.go +++ b/whisper/whisper.go @@ -255,7 +255,7 @@ func (self *Whisper) add(envelope *Envelope) error { defer self.poolMu.Unlock() // short circuit when a received envelope has already expired - if envelope.Expiry <= uint32(time.Now().Unix()) { + if envelope.Expiry < uint32(time.Now().Unix()) { return nil } @@ -278,7 +278,6 @@ func (self *Whisper) add(envelope *Envelope) error { go self.postEvent(envelope) } glog.V(logger.Detail).Infof("cached whisper envelope %x\n", envelope) - return nil } |