Implementing new proxy.Dialer interface

client.go

@@ -128,14 +128,15 @@ func (client *Client) Dial(network, addr string) (net.Conn, error) {
 
 // Close closes the cilent, in particular closing the underlying connection
 // pool.
-func (client *Client) Close() {
+func (client *Client) Close() error {
 	if client.connPool != nil {
 		// We stop the connPool on a goroutine so as not to wait for Stop to finish
 		go client.connPool.Stop()
 	}
 	if client.masquerades != nil {
 		go client.masquerades.stop()
 	}
+	return nil
 }
 
 // HttpClientUsing creates a simple domain-fronted HTTP client using the

domainfronted_test.go

@@ -8,7 +8,7 @@ import (
 	"testing"
 
 	"github.com/getlantern/keyman"
-	"github.com/getlantern/proxytest"
+	"github.com/getlantern/proxy"
 	"github.com/getlantern/testify/assert"
 )
 
@@ -49,7 +49,7 @@ func TestUnit(t *testing.T) {
 	})
 	defer client.Close()
 
-	proxytest.Go(t, client.Dial)
+	proxy.Test(t, client)
 }
 
 // TestIntegration tests against existing domain-fronted servers running on