From 55e87184e73e920f3365e9bc8013eec0ff596b0c Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Fri, 6 Oct 2017 16:02:30 +0200
Subject: [PATCH] whisper/whisperv5: gofmt -w -s

---
 whisper/whisperv5/api.go          |  2 +-
 whisper/whisperv5/config.go       |  2 --
 whisper/whisperv5/filter.go       |  2 +-
 whisper/whisperv5/filter_test.go  | 22 +++++++++++-----------
 whisper/whisperv5/whisper_test.go |  2 +-
 5 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/whisper/whisperv5/api.go b/whisper/whisperv5/api.go
index ec22f0d1d0..96c4b0e6c4 100644
--- a/whisper/whisperv5/api.go
+++ b/whisper/whisperv5/api.go
@@ -104,7 +104,7 @@ func (api *PublicWhisperAPI) Info(ctx context.Context) Info {
 	stats := api.w.Stats()
 	return Info{
 		Memory:         stats.memoryUsed,
-		Messages:        len(api.w.messageQueue) + len(api.w.p2pMsgQueue),
+		Messages:       len(api.w.messageQueue) + len(api.w.p2pMsgQueue),
 		MinPow:         api.w.MinPow(),
 		MaxMessageSize: api.w.MaxMessageSize(),
 	}
diff --git a/whisper/whisperv5/config.go b/whisper/whisperv5/config.go
index 290bf8962b..fcc2307046 100644
--- a/whisper/whisperv5/config.go
+++ b/whisper/whisperv5/config.go
@@ -25,5 +25,3 @@ var DefaultConfig = Config{
 	MaxMessageSize:     DefaultMaxMessageSize,
 	MinimumAcceptedPOW: DefaultMinimumPoW,
 }
-
-var ()
diff --git a/whisper/whisperv5/filter.go b/whisper/whisperv5/filter.go
index 81c4c9a65c..b5e893e0ff 100644
--- a/whisper/whisperv5/filter.go
+++ b/whisper/whisperv5/filter.go
@@ -70,7 +70,7 @@ func (fs *Filters) Install(watcher *Filter) (string, error) {
 	}
 
 	if watcher.expectsSymmetricEncryption() {
-		watcher.SymKeyHash = crypto.Keccak256Hash(watcher.KeySym);
+		watcher.SymKeyHash = crypto.Keccak256Hash(watcher.KeySym)
 	}
 
 	fs.watchers[id] = watcher
diff --git a/whisper/whisperv5/filter_test.go b/whisper/whisperv5/filter_test.go
index 8c868c66a4..bd35e7f20f 100644
--- a/whisper/whisperv5/filter_test.go
+++ b/whisper/whisperv5/filter_test.go
@@ -149,7 +149,7 @@ func TestInstallSymKeyGeneratesHash(t *testing.T) {
 	_, err := filters.Install(filter)
 
 	if err != nil {
-		t.Fatalf("Error installing the filter: %s", err);
+		t.Fatalf("Error installing the filter: %s", err)
 	}
 
 	for i, b := range filter.SymKeyHash {
@@ -174,30 +174,30 @@ func TestInstallIdenticalFilters(t *testing.T) {
 		PoW:      filter1.PoW,
 		AllowP2P: filter1.AllowP2P,
 		Messages: make(map[common.Hash]*ReceivedMessage),
-	};
+	}
 
 	_, err := filters.Install(filter1)
 
 	if err != nil {
-		t.Fatalf("Error installing the first filter with seed %d: %s", seed, err);
+		t.Fatalf("Error installing the first filter with seed %d: %s", seed, err)
 	}
 
 	_, err = filters.Install(filter2)
 
 	if err != nil {
-		t.Fatalf("Error installing the second filter with seed %d: %s", seed, err);
+		t.Fatalf("Error installing the second filter with seed %d: %s", seed, err)
 	}
 
 	params, err := generateMessageParams()
 	if err != nil {
-		t.Fatalf("Error generating message parameters with seed %d: %s", seed, err);
+		t.Fatalf("Error generating message parameters with seed %d: %s", seed, err)
 	}
 
 	params.KeySym = filter1.KeySym
 	params.Topic = BytesToTopic(filter1.Topics[0])
 
-	filter1.Src = &params.Src.PublicKey;
-	filter2.Src = &params.Src.PublicKey;
+	filter1.Src = &params.Src.PublicKey
+	filter2.Src = &params.Src.PublicKey
 
 	sentMessage, err := NewSentMessage(params)
 	if err != nil {
@@ -212,19 +212,19 @@ func TestInstallIdenticalFilters(t *testing.T) {
 		t.Fatalf("failed to Open with filter1")
 	}
 
-	if ! filter1.MatchEnvelope(env) {
+	if !filter1.MatchEnvelope(env) {
 		t.Fatalf("failed matching with the first filter")
 	}
 
-	if ! filter2.MatchEnvelope(env) {
+	if !filter2.MatchEnvelope(env) {
 		t.Fatalf("failed matching with the first filter")
 	}
 
-	if ! filter1.MatchMessage(msg) {
+	if !filter1.MatchMessage(msg) {
 		t.Fatalf("failed matching with the second filter")
 	}
 
-	if ! filter2.MatchMessage(msg) {
+	if !filter2.MatchMessage(msg) {
 		t.Fatalf("failed matching with the second filter")
 	}
 }
diff --git a/whisper/whisperv5/whisper_test.go b/whisper/whisperv5/whisper_test.go
index f18752c8c5..8af085292a 100644
--- a/whisper/whisperv5/whisper_test.go
+++ b/whisper/whisperv5/whisper_test.go
@@ -650,7 +650,7 @@ func TestSymmetricSendCycle(t *testing.T) {
 		PoW:      filter1.PoW,
 		AllowP2P: filter1.AllowP2P,
 		Messages: make(map[common.Hash]*ReceivedMessage),
-	};
+	}
 
 	params, err := generateMessageParams()
 	if err != nil {