use a context when opening streams

libp2p · Dec 17, 2020 · 973870b · 973870b
1 parent 3155ff3
commit 973870b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/p2p/net/mock/mock_conn.go b/p2p/net/mock/mock_conn.go
@@ -2,6 +2,7 @@ package mocknet
 
 import (
 	"container/list"
+	"context"
 	"strconv"
 	"sync"
 	"sync/atomic"
@@ -151,7 +152,7 @@ func (c *conn) openStream() *stream {
 	return sl
 }
 
-func (c *conn) NewStream() (network.Stream, error) {
+func (c *conn) NewStream(context.Context) (network.Stream, error) {
 	log.Debugf("Conn.NewStreamWithProtocol: %s --> %s", c.local, c.remote)
 
 	s := c.openStream()

diff --git a/p2p/net/mock/mock_notif_test.go b/p2p/net/mock/mock_notif_test.go
@@ -98,7 +98,7 @@ func TestNotifications(t *testing.T) {
 	for _, s := range nets {
 		conns := s.Conns()
 		for _, c := range conns {
-			st1, err := c.NewStream()
+			st1, err := c.NewStream(context.Background())
 			if err != nil {
 				t.Error(err)
 				continue

diff --git a/p2p/net/mock/mock_peernet.go b/p2p/net/mock/mock_peernet.go
@@ -339,7 +339,7 @@ func (pn *peernet) NewStream(ctx context.Context, p peer.ID) (network.Stream, er
 	if err != nil {
 		return nil, err
 	}
-	return c.NewStream()
+	return c.NewStream(ctx)
 }
 
 // SetStreamHandler sets the new stream handler on the Network.

diff --git a/p2p/protocol/identify/id.go b/p2p/protocol/identify/id.go
@@ -349,7 +349,7 @@ func (ids *IDService) identifyConn(c network.Conn, signal chan struct{}) {
 		}
 	}()
 
-	s, err = c.NewStream()
+	s, err = c.NewStream(context.Background())
 	if err != nil {
 		log.Debugw("error opening identify stream", "error", err)
 		// the connection is probably already closed if we hit this.