From 66c38b75aa8d6326f0d2e967d2ea45ba29ff8a28 Mon Sep 17 00:00:00 2001
From: Asim <asim@chuhnk.me>
Date: Mon, 1 Aug 2016 16:31:27 +0100
Subject: [PATCH] Name timeout rather than deadline

---
 transport/http_transport.go      | 24 ++++++++++++------------
 transport/http_transport_test.go |  4 ++--
 transport/options.go             | 10 +++++-----
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/transport/http_transport.go b/transport/http_transport.go
index 796502a5..54257c64 100644
--- a/transport/http_transport.go
+++ b/transport/http_transport.go
@@ -146,9 +146,9 @@ func (h *httpTransportClient) Send(m *Message) error {
 	}
 	h.Unlock()
 
-	// set deadline if its greater than 0
-	if h.ht.opts.Deadline > time.Duration(0) {
-		h.conn.SetDeadline(time.Now().Add(h.ht.opts.Deadline))
+	// set timeout if its greater than 0
+	if h.ht.opts.Timeout > time.Duration(0) {
+		h.conn.SetDeadline(time.Now().Add(h.ht.opts.Timeout))
 	}
 
 	return req.Write(h.conn)
@@ -170,9 +170,9 @@ func (h *httpTransportClient) Recv(m *Message) error {
 		return io.EOF
 	}
 
-	// set deadline if its greater than 0
-	if h.ht.opts.Deadline > time.Duration(0) {
-		h.conn.SetDeadline(time.Now().Add(h.ht.opts.Deadline))
+	// set timeout if its greater than 0
+	if h.ht.opts.Timeout > time.Duration(0) {
+		h.conn.SetDeadline(time.Now().Add(h.ht.opts.Timeout))
 	}
 
 	rsp, err := http.ReadResponse(h.buff, r)
@@ -224,9 +224,9 @@ func (h *httpTransportSocket) Recv(m *Message) error {
 		return errors.New("message passed in is nil")
 	}
 
-	// set deadline if its greater than 0
-	if h.ht.opts.Deadline > time.Duration(0) {
-		h.conn.SetDeadline(time.Now().Add(h.ht.opts.Deadline))
+	// set timeout if its greater than 0
+	if h.ht.opts.Timeout > time.Duration(0) {
+		h.conn.SetDeadline(time.Now().Add(h.ht.opts.Timeout))
 	}
 
 	r, err := http.ReadRequest(h.buff)
@@ -288,9 +288,9 @@ func (h *httpTransportSocket) Send(m *Message) error {
 	default:
 	}
 
-	// set deadline if its greater than 0
-	if h.ht.opts.Deadline > time.Duration(0) {
-		h.conn.SetDeadline(time.Now().Add(h.ht.opts.Deadline))
+	// set timeout if its greater than 0
+	if h.ht.opts.Timeout > time.Duration(0) {
+		h.conn.SetDeadline(time.Now().Add(h.ht.opts.Timeout))
 	}
 
 	return rsp.Write(h.conn)
diff --git a/transport/http_transport_test.go b/transport/http_transport_test.go
index de5f9b73..135007c6 100644
--- a/transport/http_transport_test.go
+++ b/transport/http_transport_test.go
@@ -178,8 +178,8 @@ func TestHTTPTransportError(t *testing.T) {
 	close(done)
 }
 
-func TestHTTPTransportDeadline(t *testing.T) {
-	tr := NewTransport(Deadline(time.Millisecond * 100))
+func TestHTTPTransportTimeout(t *testing.T) {
+	tr := NewTransport(Timeout(time.Millisecond * 100))
 
 	l, err := tr.Listen(":0")
 	if err != nil {
diff --git a/transport/options.go b/transport/options.go
index f0ef62e3..de5ee039 100644
--- a/transport/options.go
+++ b/transport/options.go
@@ -11,8 +11,8 @@ type Options struct {
 	Addrs     []string
 	Secure    bool
 	TLSConfig *tls.Config
-	// Deadline sets the time to wait to Send/Recv
-	Deadline time.Duration
+	// Timeout sets the timeout for Send/Recv
+	Timeout time.Duration
 	// Other options for implementations of the interface
 	// can be stored in a context
 	Context context.Context
@@ -46,10 +46,10 @@ func Addrs(addrs ...string) Option {
 	}
 }
 
-// Deadline sets the time to wait for Send/Recv execution
-func Deadline(t time.Duration) Option {
+// Timeout sets the timeout for Send/Recv execution
+func Timeout(t time.Duration) Option {
 	return func(o *Options) {
-		o.Deadline = t
+		o.Timeout = t
 	}
 }