refactor(dht) remove extraneous return value
License: MIT Signed-off-by: Brian Tiger Chow <brian@perfmode.com>
Brian Tiger Chow committed
Dec 8, 2014 at 04:07 UTC
b799ddef58eb196d56dcaf871148c4c3ba09d157
3 files changed
+21
-30
core/core.go
+1
-1
@@ -283,7 +283,7 @@ func initConnections(ctx context.Context, bootstrap []*config.BootstrapPeer, pst
283
}
284
npeer.AddAddress(maddr)
285
286
- if _, err = route.Connect(ctx, npeer); err != nil {
286
+ if err := route.Connect(ctx, npeer); err != nil {
287
log.Criticalf("Bootstrapping error: %v", err)
288
continue
289
}
routing/dht/dht.go
+4
-13
@@ -97,32 +97,23 @@ func NewDHT(ctx context.Context, p peer.Peer, ps peer.Peerstore, dialer inet.Dia
97
}
98
99
// Connect to a new peer at the given address, ping and add to the routing table
100
-func (dht *IpfsDHT) Connect(ctx context.Context, npeer peer.Peer) (peer.Peer, error) {
101
- // TODO(jbenet,whyrusleeping)
102
- //
103
- // Connect should take in a Peer (with ID). In a sense, we shouldn't be
104
- // allowing connections to random multiaddrs without knowing who we're
105
- // speaking to (i.e. peer.ID). In terms of moving around simple addresses
106
- // -- instead of an (ID, Addr) pair -- we can use:
107
- //
108
- // /ip4/10.20.30.40/tcp/1234/ipfs/Qxhxxchxzcncxnzcnxzcxzm
109
- //
100
+func (dht *IpfsDHT) Connect(ctx context.Context, npeer peer.Peer) error {
101
err := dht.dialer.DialPeer(ctx, npeer)
102
if err != nil {
112
- return nil, err
103
+ return err
104
}
105
106
// Ping new peer to register in their routing table
107
// NOTE: this should be done better...
108
err = dht.Ping(ctx, npeer)
109
if err != nil {
119
- return nil, fmt.Errorf("failed to ping newly connected peer: %s\n", err)
110
+ return fmt.Errorf("failed to ping newly connected peer: %s\n", err)
111
}
112
log.Event(ctx, "connect", dht.self, npeer)
113
114
dht.Update(ctx, npeer)
115
125
- return npeer, nil
116
+ return nil
117
}
118
119
// HandleMessage implements the inet.Handler interface.
routing/dht/dht_test.go
+16
-16
@@ -101,7 +101,7 @@ func TestPing(t *testing.T) {
101
defer dhtA.dialer.(inet.Network).Close()
102
defer dhtB.dialer.(inet.Network).Close()
103
104
- _, err = dhtA.Connect(ctx, peerB)
104
+ err = dhtA.Connect(ctx, peerB)
105
if err != nil {
106
t.Fatal(err)
107
}
@@ -151,7 +151,7 @@ func TestValueGetSet(t *testing.T) {
151
defer dhtA.dialer.(inet.Network).Close()
152
defer dhtB.dialer.(inet.Network).Close()
153
154
- _, err = dhtA.Connect(ctx, peerB)
154
+ err = dhtA.Connect(ctx, peerB)
155
if err != nil {
156
t.Fatal(err)
157
}
@@ -194,17 +194,17 @@ func TestProvides(t *testing.T) {
194
}
195
}()
196
197
- _, err := dhts[0].Connect(ctx, peers[1])
197
+ err := dhts[0].Connect(ctx, peers[1])
198
if err != nil {
199
t.Fatal(err)
200
}
201
202
- _, err = dhts[1].Connect(ctx, peers[2])
202
+ err = dhts[1].Connect(ctx, peers[2])
203
if err != nil {
204
t.Fatal(err)
205
}
206
207
- _, err = dhts[1].Connect(ctx, peers[3])
207
+ err = dhts[1].Connect(ctx, peers[3])
208
if err != nil {
209
t.Fatal(err)
210
}
@@ -256,17 +256,17 @@ func TestProvidesAsync(t *testing.T) {
256
}
257
}()
258
259
- _, err := dhts[0].Connect(ctx, peers[1])
259
+ err := dhts[0].Connect(ctx, peers[1])
260
if err != nil {
261
t.Fatal(err)
262
}
263
264
- _, err = dhts[1].Connect(ctx, peers[2])
264
+ err = dhts[1].Connect(ctx, peers[2])
265
if err != nil {
266
t.Fatal(err)
267
}
268
269
- _, err = dhts[1].Connect(ctx, peers[3])
269
+ err = dhts[1].Connect(ctx, peers[3])
270
if err != nil {
271
t.Fatal(err)
272
}
@@ -321,17 +321,17 @@ func TestLayeredGet(t *testing.T) {
321
}
322
}()
323
324
- _, err := dhts[0].Connect(ctx, peers[1])
324
+ err := dhts[0].Connect(ctx, peers[1])
325
if err != nil {
326
t.Fatalf("Failed to connect: %s", err)
327
}
328
329
- _, err = dhts[1].Connect(ctx, peers[2])
329
+ err = dhts[1].Connect(ctx, peers[2])
330
if err != nil {
331
t.Fatal(err)
332
}
333
334
- _, err = dhts[1].Connect(ctx, peers[3])
334
+ err = dhts[1].Connect(ctx, peers[3])
335
if err != nil {
336
t.Fatal(err)
337
}
@@ -376,17 +376,17 @@ func TestFindPeer(t *testing.T) {
376
}
377
}()
378
379
- _, err := dhts[0].Connect(ctx, peers[1])
379
+ err := dhts[0].Connect(ctx, peers[1])
380
if err != nil {
381
t.Fatal(err)
382
}
383
384
- _, err = dhts[1].Connect(ctx, peers[2])
384
+ err = dhts[1].Connect(ctx, peers[2])
385
if err != nil {
386
t.Fatal(err)
387
}
388
389
- _, err = dhts[1].Connect(ctx, peers[3])
389
+ err = dhts[1].Connect(ctx, peers[3])
390
if err != nil {
391
t.Fatal(err)
392
}
@@ -435,14 +435,14 @@ func TestConnectCollision(t *testing.T) {
435
436
done := make(chan struct{})
437
go func() {
438
- _, err := dhtA.Connect(ctx, peerB)
438
+ err := dhtA.Connect(ctx, peerB)
439
if err != nil {
440
t.Fatal(err)
441
}
442
done <- struct{}{}
443
}()
444
go func() {
445
- _, err := dhtB.Connect(ctx, peerA)
445
+ err := dhtB.Connect(ctx, peerA)
446
if err != nil {
447
t.Fatal(err)
448
}