Merge pull request #535 from iulianpascalau/fix/race-mock-conn-stream

Fixed race conditions in mock package mock_stream and mock_conn

p2p/net/mock/mock_conn.go

@@ -121,11 +121,7 @@ func (c *conn) NewStream() (inet.Stream, error) {
 }
 
 func (c *conn) GetStreams() []inet.Stream {
-	var out []inet.Stream
-	for e := c.streams.Front(); e != nil; e = e.Next() {
-		out = append(out, e.Value.(*stream))
-	}
-	return out
+	return c.allStreams()
 }
 
 // LocalMultiaddr is the Multiaddr on this side

p2p/net/mock/mock_stream.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"io"
 	"net"
+	"sync/atomic"
 	"time"
 
 	inet "github.com/libp2p/go-libp2p-net"
@@ -24,7 +25,7 @@ type stream struct {
 
 	writeErr error
 
-	protocol protocol.ID
+	protocol atomic.Value
 	stat     inet.Stat
 }
 
@@ -70,15 +71,17 @@ func (s *stream) Write(p []byte) (n int, err error) {
 }
 
 func (s *stream) Protocol() protocol.ID {
-	return s.protocol
+	// Ignore type error. It means that the protocol is unset.
+	p, _ := s.protocol.Load().(protocol.ID)
+	return p
 }
 
 func (s *stream) Stat() inet.Stat {
 	return s.stat
 }
 
 func (s *stream) SetProtocol(proto protocol.ID) {
-	s.protocol = proto
+	s.protocol.Store(proto)
 }
 
 func (s *stream) Close() error {