From a422d195bc785051ad650d2aa546e71ffd44d63e Mon Sep 17 00:00:00 2001
From: lash <dev@holbrook.no>
Date: Fri, 26 Jan 2018 07:35:00 +0100
Subject: [PATCH] swarm/api, swarm/network: Delint + nil chan err in
 protocoltester

---
 swarm/api/http/server.go       | 1 -
 swarm/network/protocol_test.go | 6 +++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/swarm/api/http/server.go b/swarm/api/http/server.go
index 0dcc4e0fca..d4c4728079 100644
--- a/swarm/api/http/server.go
+++ b/swarm/api/http/server.go
@@ -422,7 +422,6 @@ func (s *Server) translateResourceError(w http.ResponseWriter, r *Request, supEr
 	}
 
 	s.Error(w, r, defaultErr)
-	return
 }
 
 // HandleGet handles a GET request to
diff --git a/swarm/network/protocol_test.go b/swarm/network/protocol_test.go
index e8ec4ebc37..2cc55e02ce 100644
--- a/swarm/network/protocol_test.go
+++ b/swarm/network/protocol_test.go
@@ -82,7 +82,11 @@ func newBzzBaseTester(t *testing.T, n int, addr *BzzAddr, spec *protocols.Spec,
 	cs := make(map[string]chan bool)
 
 	srv := func(p *bzzPeer) error {
-		defer close(cs[p.ID().String()])
+		defer func() {
+			if cs[p.ID().String()] != nil {
+				close(cs[p.ID().String()])
+			}
+		}()
 		return run(p)
 	}