From 736e75697d631b2e80a51d898f9cb5fe36b01679 Mon Sep 17 00:00:00 2001
From: Guillaume Ballet <gballet@gmail.com>
Date: Fri, 1 Dec 2017 10:50:09 +0100
Subject: [PATCH] whisper: make the header size a constant

---
 whisper/whisperv6/doc.go      | 2 ++
 whisper/whisperv6/envelope.go | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/whisper/whisperv6/doc.go b/whisper/whisperv6/doc.go
index 6ff378b23e..64925ba48b 100644
--- a/whisper/whisperv6/doc.go
+++ b/whisper/whisperv6/doc.go
@@ -67,6 +67,8 @@ const (
 
 	DefaultTTL     = 50 // seconds
 	SynchAllowance = 10 // seconds
+
+	EnvelopeHeaderLength = 20
 )
 
 type unknownVersionError uint64
diff --git a/whisper/whisperv6/envelope.go b/whisper/whisperv6/envelope.go
index e7d0f1f858..26d2c2af12 100644
--- a/whisper/whisperv6/envelope.go
+++ b/whisper/whisperv6/envelope.go
@@ -50,7 +50,7 @@ type Envelope struct {
 
 // size returns the size of envelope as it is sent (i.e. public fields only)
 func (e *Envelope) size() int {
-	return 20 + len(e.Version) + len(e.Data)
+	return EnvelopeHeaderLength + len(e.Version) + len(e.Data)
 }
 
 // rlpWithoutNonce returns the RLP encoded envelope contents, except the nonce.