protected context building

connect/auth.go

@@ -44,7 +44,7 @@ func (c *ProtoComms) clientHandshake(host *Host) (err error) {
 
 	// Set up the context
 	client := pb.NewGenericClient(host.connection)
-	ctx, cancel := MessagingContext(host.GetSendTimeout())
+	ctx, cancel := host.GetMessagingContext()
 	defer cancel()
 
 	// Send the token request message
@@ -75,7 +75,7 @@ func (c *ProtoComms) clientHandshake(host *Host) (err error) {
 	}
 
 	// Set up the context
-	ctx, cancel = MessagingContext(host.GetSendTimeout())
+	ctx, cancel = host.GetMessagingContext()
 	defer cancel()
 
 	// Send the authenticate token message

connect/context.go

@@ -17,8 +17,8 @@ import (
 	"time"
 )
 
-// MessagingContext builds a context for connections and message sending with the given timeout
-func MessagingContext(waitingPeriod time.Duration) (context.Context, context.CancelFunc) {
+// newContext builds a context for connections and message sending with the given timeout
+func newContext(waitingPeriod time.Duration) (context.Context, context.CancelFunc) {
 	jww.DEBUG.Printf("Timing out in: %s", waitingPeriod)
 	ctx, cancel := context.WithTimeout(context.Background(),
 		waitingPeriod)

connect/host.go

@@ -10,6 +10,7 @@
 package connect
 
 import (
+	"context"
 	"fmt"
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
@@ -167,9 +168,9 @@ func (h *Host) Connected() (bool, uint64) {
 	return h.isAlive() && !h.authenticationRequired(), h.connectionCount
 }
 
-// GetSendTimeout returns the timeout for message sending
-func (h *Host) GetSendTimeout() time.Duration {
-	return h.params.SendTimeout
+// GetMessagingContext returns a context object for message sending configured according to HostParams
+func (h *Host) GetMessagingContext() (context.Context, context.CancelFunc) {
+	return newContext(h.params.SendTimeout)
 }
 
 // GetId returns the id of the host
@@ -375,7 +376,7 @@ func (h *Host) connectHelper() (err error) {
 		if backoffTime > 15000 {
 			backoffTime = 15000
 		}
-		ctx, cancel := MessagingContext(time.Duration(backoffTime) * time.Millisecond)
+		ctx, cancel := newContext(time.Duration(backoffTime) * time.Millisecond)
 
 		// Create the connection
 		h.connection, err = grpc.DialContext(ctx, h.GetAddress(),

interconnect/consensusClient.go

@@ -26,7 +26,7 @@ func (c *CMixServer) GetNdf(host *connect.Host,
 	// Create the Send Function
 	f := func(conn *grpc.ClientConn) (*any.Any, error) {
 		// Set up the context
-		ctx, cancel := connect.MessagingContext(host.GetSendTimeout())
+		ctx, cancel := host.GetMessagingContext()
 		defer cancel()
 		//Format to authenticated message type
 		// Send the message