From 0ef270c25ccc2c806afa332e8793ce034819a453 Mon Sep 17 00:00:00 2001
From: Brian Waldon <bcwaldon@gmail.com>
Date: Fri, 31 Oct 2014 10:59:39 -0700
Subject: [PATCH] client: pass httpActionDo into New[Discovery]KeysAPI

---
 client/keys.go         | 27 ++++++++++-----------------
 discovery/discovery.go |  5 +++--
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/client/keys.go b/client/keys.go
index e80d5a180..fa3ed3cd5 100644
--- a/client/keys.go
+++ b/client/keys.go
@@ -41,27 +41,20 @@ var (
 	ErrKeyExists   = errors.New("client: key already exists")
 )
 
-func NewKeysAPI(tr *http.Transport, eps []string, to time.Duration) (KeysAPI, error) {
-	return newHTTPKeysAPIWithPrefix(tr, eps, to, DefaultV2KeysPrefix)
-}
-
-func NewDiscoveryKeysAPI(tr *http.Transport, eps []string, to time.Duration) (KeysAPI, error) {
-	return newHTTPKeysAPIWithPrefix(tr, eps, to, "")
-}
-
-func newHTTPKeysAPIWithPrefix(tr *http.Transport, eps []string, to time.Duration, prefix string) (*httpKeysAPI, error) {
-	c, err := NewHTTPClient(tr, eps)
-	if err != nil {
-		return nil, err
-	}
-
-	kAPI := httpKeysAPI{
+func NewKeysAPI(c httpActionDo, to time.Duration) KeysAPI {
+	return &httpKeysAPI{
 		client:  c,
-		prefix:  prefix,
+		prefix:  DefaultV2KeysPrefix,
 		timeout: to,
 	}
+}
 
-	return &kAPI, nil
+func NewDiscoveryKeysAPI(c httpActionDo, to time.Duration) KeysAPI {
+	return &httpKeysAPI{
+		client:  c,
+		prefix:  "",
+		timeout: to,
+	}
 }
 
 type KeysAPI interface {
diff --git a/discovery/discovery.go b/discovery/discovery.go
index b16f38713..95745b590 100644
--- a/discovery/discovery.go
+++ b/discovery/discovery.go
@@ -106,15 +106,16 @@ func New(durl string, id types.ID, config string) (Discoverer, error) {
 	if err != nil {
 		return nil, err
 	}
-	c, err := client.NewDiscoveryKeysAPI(&http.Transport{Proxy: pf}, []string{u.String()}, client.DefaultRequestTimeout)
+	c, err := client.NewHTTPClient(&http.Transport{Proxy: pf}, []string{u.String()})
 	if err != nil {
 		return nil, err
 	}
+	dc := client.NewDiscoveryKeysAPI(c, client.DefaultRequestTimeout)
 	return &discovery{
 		cluster: token,
 		id:      id,
 		config:  config,
-		c:       c,
+		c:       dc,
 		url:     u,
 		clock:   clockwork.NewRealClock(),
 	}, nil