From cf24bb0e89c81e044e7f7f2fcb99fc7fefc78655 Mon Sep 17 00:00:00 2001
From: Matthias Radestock <matthias.radestock@gmail.com>
Date: Wed, 3 Feb 2016 11:56:50 +0000
Subject: [PATCH] remove weaveapi.NewClientWithResolver cruft

---
 api/weaveapi.go | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/api/weaveapi.go b/api/weaveapi.go
index 505aac18..b49a2969 100644
--- a/api/weaveapi.go
+++ b/api/weaveapi.go
@@ -19,19 +19,10 @@ const (
 
 type Client struct {
 	baseURL string
-	resolve func() (string, error)
 }
 
 func (client *Client) httpVerb(verb string, url string, values url.Values) (string, error) {
-	baseURL := client.baseURL
-	if client.resolve != nil {
-		addr, err := client.resolve()
-		if err != nil {
-			return "", err
-		}
-		baseURL = fmt.Sprintf("http://%s:%d", addr, WeaveHTTPPort)
-	}
-	url = baseURL + url
+	url = client.baseURL + url
 	Log.Debugf("weave %s to %s with %v", verb, url, values)
 	var body io.Reader
 	if values != nil {
@@ -81,10 +72,6 @@ func NewClient(addr string) *Client {
 	return &Client{baseURL: fmt.Sprintf("http://%s:%s", host, port)}
 }
 
-func NewClientWithResolver(resolver func() (string, error)) *Client {
-	return &Client{resolve: resolver}
-}
-
 func (client *Client) Connect(remote string) error {
 	_, err := client.httpVerb("POST", "/connect", url.Values{"peer": {remote}})
 	return err