From 4f909d0be4bfe4cf0d89812e9cf0ae3c7ba695eb Mon Sep 17 00:00:00 2001
From: Asim <asim@chuhnk.me>
Date: Thu, 21 May 2015 19:28:57 +0100
Subject: [PATCH] Declare option not options

---
 client/client.go     | 8 +++++++-
 client/rpc_client.go | 2 +-
 server/rpc_server.go | 2 +-
 server/server.go     | 8 +++++++-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/client/client.go b/client/client.go
index 8d145a30..6a048d87 100644
--- a/client/client.go
+++ b/client/client.go
@@ -16,12 +16,18 @@ type options struct {
 	transport transport.Transport
 }
 
-type Options func(*options)
+type Option func(*options)
 
 var (
 	DefaultClient Client = NewRpcClient()
 )
 
+func Transport(t transport.Transport) Option {
+	return func(o *options) {
+		o.transport = t
+	}
+}
+
 func Call(request Request, response interface{}) error {
 	return DefaultClient.Call(request, response)
 }
diff --git a/client/rpc_client.go b/client/rpc_client.go
index 9d65ebde..3a2d579d 100644
--- a/client/rpc_client.go
+++ b/client/rpc_client.go
@@ -167,7 +167,7 @@ func (r *RpcClient) NewJsonRequest(service, method string, request interface{})
 	return newRpcRequest(service, method, request, "application/json")
 }
 
-func NewRpcClient(opt ...Options) *RpcClient {
+func NewRpcClient(opt ...Option) *RpcClient {
 	var opts options
 
 	for _, o := range opt {
diff --git a/server/rpc_server.go b/server/rpc_server.go
index 7e57b0ca..4f45d1b2 100644
--- a/server/rpc_server.go
+++ b/server/rpc_server.go
@@ -123,7 +123,7 @@ func (s *RpcServer) Stop() error {
 	return <-ch
 }
 
-func NewRpcServer(address string, opt ...Options) *RpcServer {
+func NewRpcServer(address string, opt ...Option) *RpcServer {
 	var opts options
 
 	for _, o := range opt {
diff --git a/server/server.go b/server/server.go
index fd973ea1..1f75008f 100644
--- a/server/server.go
+++ b/server/server.go
@@ -27,7 +27,7 @@ type options struct {
 	transport transport.Transport
 }
 
-type Options func(*options)
+type Option func(*options)
 
 var (
 	Address       string
@@ -36,6 +36,12 @@ var (
 	DefaultServer Server
 )
 
+func Transport(t transport.Transport) Option {
+	return func(o *options) {
+		o.transport = t
+	}
+}
+
 func Init() error {
 	defer log.Flush()