From e57278df4f366e3200f1ce41724f911e0b52f5ea Mon Sep 17 00:00:00 2001
From: Juan Leni <lenijuan@gmail.com>
Date: Tue, 19 Mar 2019 11:48:32 +0100
Subject: [PATCH] addressing comments

---
 privval/signer_dialer_endpoint.go             | 48 +++++++++----------
 .../internal/test_harness.go                  |  2 +-
 .../internal/test_harness_test.go             |  2 +-
 3 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/privval/signer_dialer_endpoint.go b/privval/signer_dialer_endpoint.go
index 7afa71972..43b077686 100644
--- a/privval/signer_dialer_endpoint.go
+++ b/privval/signer_dialer_endpoint.go
@@ -214,35 +214,31 @@ func (ss *SignerDialerEndpoint) serviceLoop() {
 	for {
 		select {
 		default:
-			{
-				ss.Logger.Debug("Try connect", "retries", retries, "max", ss.maxConnRetries)
+			ss.Logger.Debug("Try connect", "retries", retries, "max", ss.maxConnRetries)
 
-				if retries > ss.maxConnRetries {
-					ss.Logger.Error("Maximum retries reached", "retries", retries)
-					return
-				}
-
-				if ss.conn == nil {
-					ss.conn, err = ss.dialer()
-					if err != nil {
-						ss.Logger.Info("Try connect", "err", err)
-						ss.conn = nil // Explicitly set to nil because dialer returns an interface (https://golang.org/doc/faq#nil_error)
-						retries++
-
-						// Wait between retries
-						time.Sleep(ss.retryWait)
-						continue
-					}
-				}
-
-				retries = 0
-				ss.handleRequest()
-			}
-
-		case <-ss.stopCh:
-			{
+			if retries > ss.maxConnRetries {
+				ss.Logger.Error("Maximum retries reached", "retries", retries)
 				return
 			}
+
+			if ss.conn == nil {
+				ss.conn, err = ss.dialer()
+				if err != nil {
+					ss.Logger.Info("Try connect", "err", err)
+					ss.conn = nil // Explicitly set to nil because dialer returns an interface (https://golang.org/doc/faq#nil_error)
+					retries++
+
+					// Wait between retries
+					time.Sleep(ss.retryWait)
+					continue
+				}
+			}
+
+			retries = 0
+			ss.handleRequest()
+
+		case <-ss.stopCh:
+			return
 		}
 	}
 }
diff --git a/tools/tm-signer-harness/internal/test_harness.go b/tools/tm-signer-harness/internal/test_harness.go
index 68f20fdaf..c51b5bfb8 100644
--- a/tools/tm-signer-harness/internal/test_harness.go
+++ b/tools/tm-signer-harness/internal/test_harness.go
@@ -144,7 +144,7 @@ func (th *TestHarness) Run() {
 	for acceptRetries := th.acceptRetries; acceptRetries > 0; acceptRetries-- {
 		th.logger.Info("Attempting to accept incoming connection", "acceptRetries", acceptRetries)
 
-		if err := th.signerClient.WaitForConnection(2 * time.Second); err != nil {
+		if err := th.signerClient.WaitForConnection(10 * time.Millisecond); err != nil {
 			// if it wasn't a timeout error
 			if _, ok := err.(timeoutError); !ok {
 				th.logger.Error("Failed to start listener", "err", err)
diff --git a/tools/tm-signer-harness/internal/test_harness_test.go b/tools/tm-signer-harness/internal/test_harness_test.go
index d8ae36c14..296b6d9c4 100644
--- a/tools/tm-signer-harness/internal/test_harness_test.go
+++ b/tools/tm-signer-harness/internal/test_harness_test.go
@@ -73,7 +73,7 @@ const (
 )
 
 func TestRemoteSignerTestHarnessMaxAcceptRetriesReached(t *testing.T) {
-	cfg := makeConfig(t, 200, 2)
+	cfg := makeConfig(t, 1, 2)
 	defer cleanup(cfg)
 
 	th, err := NewTestHarness(log.TestingLogger(), cfg)