Merge branch 'release' into hotfix/clientErrorSource

bindings/client.go

@@ -18,6 +18,7 @@ import (
 	"gitlab.com/elixxir/crypto/contact"
 	"gitlab.com/elixxir/primitives/states"
 	"gitlab.com/xx_network/primitives/id"
+	"gitlab.com/xx_network/primitives/netTime"
 	"sync"
 	"time"
 )
@@ -229,9 +230,9 @@ func (c *Client) StopNetworkFollower(timeoutMS int) error {
 // WaitForNewtwork will block until either the network is healthy or the
 // passed timeout. It will return true if the network is healthy
 func (c *Client) WaitForNetwork(timeoutMS int) bool {
-	start := time.Now()
+	start := netTime.Now()
 	timeout := time.Duration(timeoutMS) * time.Millisecond
-	for time.Now().Sub(start) < timeout {
+	for netTime.Now().Sub(start) < timeout {
 		if c.api.GetHealth().IsHealthy() {
 			return true
 		}

network/follow.go

@@ -100,20 +100,17 @@ func (m *manager) follow(report interfaces.ClientErrorReport, rng csprng.Source,
 		jww.DEBUG.Printf("Executing poll for %v(%s) range: %s-%s(%s) from %s",
 			identity.EphId.Int64(), identity.Source, identity.StartRequest,
 			identity.EndRequest, identity.EndRequest.Sub(identity.StartRequest), host.GetId())
-		result, err := comms.SendPoll(host, &pollReq)
+		return comms.SendPoll(host, &pollReq)
+	})
 	if err != nil {
 		if report != nil {
 			report(
 				"NetworkFollower",
-					fmt.Sprintf("Failed to poll network, \"%s\", Gateway: %s", err.Error(), host.String()),
+				fmt.Sprintf("Failed to poll network, \"%s\":", err.Error()),
 				fmt.Sprintf("%+v", err),
 			)
 		}
-			jww.ERROR.Printf("Unable to poll %s for NDF: %+v", host, err)
-		}
-		return result, err
-	})
-	if err != nil {
+		jww.ERROR.Printf("Unable to poll gateways: %+v", err)
 		return
 	}
 

network/gateway/hostPool.go

@@ -22,6 +22,7 @@ import (
 	"gitlab.com/xx_network/comms/connect"
 	"gitlab.com/xx_network/primitives/id"
 	"gitlab.com/xx_network/primitives/ndf"
+	"golang.org/x/net/context"
 	"io"
 	"math"
 	"strings"
@@ -30,7 +31,7 @@ import (
 )
 
 // List of errors that initiate a Host replacement
-var errorsList = []string{"context deadline exceeded", "connection refused", "host disconnected",
+var errorsList = []string{context.DeadlineExceeded.Error(), "connection refused", "host disconnected",
 	"transport is closing", "all SubConns are in TransientFailure", "Last try to connect",
 	ndf.NO_NDF, "Host is in cool down"}