connect swarm context to network
Juan Batiz-Benet committed
Dec 16, 2014 at 15:04 UTC
78c0802f97709e736075efd21ccce6035abdf411
5 files changed
+5
-10
net/net.go
+1
-5
@@ -4,7 +4,6 @@ package net
4
import (
5
swarm "github.com/jbenet/go-ipfs/net/swarm2"
6
peer "github.com/jbenet/go-ipfs/peer"
7
- util "github.com/jbenet/go-ipfs/util"
7
8
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
9
ctxgroup "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup"
@@ -117,10 +116,7 @@ func NewNetwork(ctx context.Context, listen []ma.Multiaddr, local peer.Peer,
116
// DialPeer attempts to establish a connection to a given peer.
117
// Respects the context.
118
func (n *network) DialPeer(ctx context.Context, p peer.Peer) error {
120
- err := util.ContextDo(ctx, func() error {
121
- _, err := n.swarm.Dial(p)
122
- return err
123
- })
119
+ _, err := n.swarm.Dial(ctx, p)
120
return err
121
}
122
net/swarm2/simul_test.go
+1
-1
@@ -30,7 +30,7 @@ func TestSimultOpen(t *testing.T) {
30
cp := testutil.NewPeerWithID(dst.ID())
31
cp.AddAddress(dst.Addresses()[0])
32
33
- if _, err := s.Dial(cp); err != nil {
33
+ if _, err := s.Dial(ctx, cp); err != nil {
34
t.Fatal("error swarm dialing to peer", err)
35
}
36
wg.Done()
net/swarm2/swarm.go
+1
-1
@@ -90,7 +90,7 @@ func (s *Swarm) NewStreamWithPeer(p peer.Peer) (*Stream, error) {
90
// if we have no connections, try connecting.
91
if len(s.ConnectionsToPeer(p)) == 0 {
92
log.Debug("Swarm: NewStreamWithPeer no connections. Attempting to connect...")
93
- if _, err := s.Dial(p); err != nil {
93
+ if _, err := s.Dial(context.Background(), p); err != nil {
94
return nil, err
95
}
96
}
net/swarm2/swarm_dial.go
+1
-2
@@ -17,8 +17,7 @@ import (
17
// the connection will happen over. Swarm can use whichever it choses.
18
// This allows us to use various transport protocols, do NAT traversal/relay,
19
// etc. to achive connection.
20
-func (s *Swarm) Dial(p peer.Peer) (*Conn, error) {
21
- ctx := context.TODO()
20
+func (s *Swarm) Dial(ctx context.Context, p peer.Peer) (*Conn, error) {
21
22
if p.ID().Equal(s.local.ID()) {
23
return nil, errors.New("Attempted connection to self!")
net/swarm2/swarm_test.go
+1
-1
@@ -108,7 +108,7 @@ func SubtestSwarm(t *testing.T, addrs []string, MsgNum int) {
108
cp.AddAddress(dst.Addresses()[0])
109
110
log.Infof("SWARM TEST: %s dialing %s", s.local, dst)
111
- if _, err := s.Dial(cp); err != nil {
111
+ if _, err := s.Dial(ctx, cp); err != nil {
112
t.Fatal("error swarm dialing to peer", err)
113
}
114
log.Infof("SWARM TEST: %s connected to %s", s.local, dst)