refac(gcr/s,c) remove network/dialer
remove dialer from GCR client
Brian Tiger Chow committed
Jan 27, 2015 at 23:51 UTC
a88621aeb14e3eadfc8b80562a8f8562061df3ae
2 files changed
+3
-8
routing/grandcentral/client.go
+1
-4
@@ -6,7 +6,6 @@ import (
6
7
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
8
proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
9
- inet "github.com/jbenet/go-ipfs/p2p/net"
9
peer "github.com/jbenet/go-ipfs/p2p/peer"
10
routing "github.com/jbenet/go-ipfs/routing"
11
pb "github.com/jbenet/go-ipfs/routing/dht/pb"
@@ -23,14 +22,12 @@ var ErrTODO = errors.New("TODO")
22
type Client struct {
23
peerstore peer.Peerstore
24
proxy proxy.Proxy
26
- dialer inet.Network
25
local peer.ID
26
}
27
28
// TODO take in datastore/cache
31
-func NewClient(d inet.Network, px proxy.Proxy, ps peer.Peerstore, local peer.ID) (*Client, error) {
29
+func NewClient(px proxy.Proxy, ps peer.Peerstore, local peer.ID) (*Client, error) {
30
return &Client{
33
- dialer: d,
31
proxy: px,
32
local: local,
33
peerstore: ps,
routing/grandcentral/server.go
+2
-4
@@ -4,7 +4,6 @@ import (
4
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
5
proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
6
datastore "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
7
- inet "github.com/jbenet/go-ipfs/p2p/net"
7
peer "github.com/jbenet/go-ipfs/p2p/peer"
8
dhtpb "github.com/jbenet/go-ipfs/routing/dht/pb"
9
proxy "github.com/jbenet/go-ipfs/routing/grandcentral/proxy"
@@ -16,14 +15,13 @@ import (
15
type Server struct {
16
local peer.ID
17
datastore datastore.ThreadSafeDatastore
19
- dialer inet.Network
18
peerstore peer.Peerstore
19
*proxy.Loopback // so server can be injected into client
20
}
21
22
// NewServer creates a new GrandCentral routing Server
25
-func NewServer(ds datastore.ThreadSafeDatastore, d inet.Network, ps peer.Peerstore, local peer.ID) (*Server, error) {
26
- s := &Server{local, ds, d, ps, nil}
23
+func NewServer(ds datastore.ThreadSafeDatastore, ps peer.Peerstore, local peer.ID) (*Server, error) {
24
+ s := &Server{local, ds, ps, nil}
25
s.Loopback = &proxy.Loopback{
26
Handler: s,
27
Local: local,