network: fix data race in simulation.NewBzzInProc (ethersphere#1762)

Author: janos

network/retrieval/retrieve_test.go

@@ -318,13 +318,8 @@ func newBzzRetrieveWithLocalstore(ctx *adapters.ServiceContext, bucket *sync.Map
 		return nil, nil, err
 	}
 
-	var kad *network.Kademlia
-	if kv, ok := bucket.Load(simulation.BucketKeyKademlia); ok {
-		kad = kv.(*network.Kademlia)
-	} else {
-		kad = network.NewKademlia(addr.Over(), network.NewKadParams())
-		bucket.Store(simulation.BucketKeyKademlia, kad)
-	}
+	k, _ := bucket.LoadOrStore(simulation.BucketKeyKademlia, network.NewKademlia(addr.Over(), network.NewKadParams()))
+	kad := k.(*network.Kademlia)
 
 	netStore := storage.NewNetStore(localStore, kad.BaseAddr(), n.ID())
 	lnetStore := storage.NewLNetStore(netStore)

network/simulation/simulation.go

@@ -107,15 +107,9 @@ func NewBzzInProc(services map[string]ServiceFunc) (s *Simulation) {
 		hp := network.NewHiveParams()
 		hp.KeepAliveInterval = time.Duration(200) * time.Millisecond
 		hp.Discovery = false
-		var kad *network.Kademlia
-
-		// check if another kademlia already exists and load it if necessary - we dont want two independent copies of it
-		if kv, ok := bucket.Load(BucketKeyKademlia); ok {
-			kad = kv.(*network.Kademlia)
-		} else {
-			kad = network.NewKademlia(addr.Over(), network.NewKadParams())
-			bucket.Store(BucketKeyKademlia, kad)
-		}
+
+		k, _ := bucket.LoadOrStore(BucketKeyKademlia, network.NewKademlia(addr.Over(), network.NewKadParams()))
+		kad := k.(*network.Kademlia)
 
 		config := &network.BzzConfig{
 			OverlayAddr:  addr.Over(),

network/stream/v2/common_test.go

@@ -117,15 +117,9 @@ func newSyncSimServiceFunc(o *SyncSimServiceOptions) func(ctx *adapters.ServiceC
 			return nil, nil, err
 		}
 
-		var kad *network.Kademlia
-
 		// check if another kademlia already exists and load it if necessary - we dont want two independent copies of it
-		if kv, ok := bucket.Load(simulation.BucketKeyKademlia); ok {
-			kad = kv.(*network.Kademlia)
-		} else {
-			kad = network.NewKademlia(addr.Over(), network.NewKadParams())
-			bucket.Store(simulation.BucketKeyKademlia, kad)
-		}
+		k, _ := bucket.LoadOrStore(simulation.BucketKeyKademlia, network.NewKademlia(addr.Over(), network.NewKadParams()))
+		kad := k.(*network.Kademlia)
 
 		netStore := storage.NewNetStore(localStore, kad.BaseAddr(), n.ID())
 		lnetStore := storage.NewLNetStore(netStore)