fix races in testnet

ConnectTo can be called concurrently from within bitswap.

License: MIT
Signed-off-by: Steven Allen <[email protected]>

Author: Stebalien

exchange/bitswap/testnet/virtual.go

@@ -3,6 +3,7 @@ package bitswap
 import (
 	"context"
 	"errors"
+	"sync"
 
 	bsmsg "github.com/ipfs/go-ipfs/exchange/bitswap/message"
 	bsnet "github.com/ipfs/go-ipfs/exchange/bitswap/network"
@@ -29,13 +30,17 @@ func VirtualNetwork(rs mockrouting.Server, d delay.D) Network {
 }
 
 type network struct {
+	mu            sync.Mutex
 	clients       map[peer.ID]bsnet.Receiver
 	routingserver mockrouting.Server
 	delay         delay.D
 	conns         map[string]struct{}
 }
 
 func (n *network) Adapter(p testutil.Identity) bsnet.BitSwapNetwork {
+	n.mu.Lock()
+	defer n.mu.Unlock()
+
 	client := &networkClient{
 		local:   p.ID(),
 		network: n,
@@ -46,6 +51,9 @@ func (n *network) Adapter(p testutil.Identity) bsnet.BitSwapNetwork {
 }
 
 func (n *network) HasPeer(p peer.ID) bool {
+	n.mu.Lock()
+	defer n.mu.Unlock()
+
 	_, found := n.clients[p]
 	return found
 }
@@ -58,6 +66,9 @@ func (n *network) SendMessage(
 	to peer.ID,
 	message bsmsg.BitSwapMessage) error {
 
+	n.mu.Lock()
+	defer n.mu.Unlock()
+
 	receiver, ok := n.clients[to]
 	if !ok {
 		return errors.New("Cannot locate peer on network")
@@ -161,18 +172,26 @@ func (nc *networkClient) SetDelegate(r bsnet.Receiver) {
 }
 
 func (nc *networkClient) ConnectTo(_ context.Context, p peer.ID) error {
-	if !nc.network.HasPeer(p) {
+	nc.network.mu.Lock()
+
+	otherClient, ok := nc.network.clients[p]
+	if !ok {
+		nc.network.mu.Unlock()
 		return errors.New("no such peer in network")
 	}
+
 	tag := tagForPeers(nc.local, p)
 	if _, ok := nc.network.conns[tag]; ok {
+		nc.network.mu.Unlock()
 		log.Warning("ALREADY CONNECTED TO PEER (is this a reconnect? test lib needs fixing)")
 		return nil
 	}
 	nc.network.conns[tag] = struct{}{}
+	nc.network.mu.Unlock()
+
 	// TODO: add handling for disconnects
 
-	nc.network.clients[p].PeerConnected(nc.local)
+	otherClient.PeerConnected(nc.local)
 	nc.Receiver.PeerConnected(p)
 	return nil
 }