From 1ab59094ebb3030a846c76fcb3c51b7b3fb61a0b Mon Sep 17 00:00:00 2001
From: Scott Finlay <ynori7@yahoo.com>
Date: Mon, 7 Nov 2016 17:46:12 +0100
Subject: [PATCH] Fixing return value and gofmt

---
 client/options.go    | 10 +++++-----
 client/rpc_client.go |  3 +--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/client/options.go b/client/options.go
index da89c237..0f53c8db 100644
--- a/client/options.go
+++ b/client/options.go
@@ -75,11 +75,11 @@ func newOptions(options ...Option) Options {
 	opts := Options{
 		Codecs: make(map[string]codec.NewCodec),
 		CallOptions: CallOptions{
-			Backoff:          DefaultBackoff,
-			Retry:            DefaultRetry,
-			Retries:          DefaultRetries,
-			RequestTimeout:   DefaultRequestTimeout,
-			DialTimeout:      transport.DefaultDialTimeout,
+			Backoff:        DefaultBackoff,
+			Retry:          DefaultRetry,
+			Retries:        DefaultRetries,
+			RequestTimeout: DefaultRequestTimeout,
+			DialTimeout:    transport.DefaultDialTimeout,
 		},
 		PoolSize: DefaultPoolSize,
 		PoolTTL:  DefaultPoolTTL,
diff --git a/client/rpc_client.go b/client/rpc_client.go
index 1d6b743f..861ddc53 100644
--- a/client/rpc_client.go
+++ b/client/rpc_client.go
@@ -309,7 +309,6 @@ func (r *rpcClient) Call(ctx context.Context, request Request, response interfac
 				return err
 			}
 
-
 			gerr = err
 		}
 	}
@@ -421,7 +420,7 @@ func (r *rpcClient) Stream(ctx context.Context, request Request, opts ...CallOpt
 				return nil, rsp.err
 			}
 
-			grr = err
+			grr = rsp.err
 		}
 	}