Merge pull request #272 from holisticode/swarm-network-rewrite-syncer

swarm: migrated overlay sim to network rewrite

p2p/simulations/mocker.go

@@ -103,7 +103,13 @@ func startStop(net *Network, quit chan struct{}, nodeCount int) {
 func probabilistic(net *Network, quit chan struct{}, nodeCount int) {
 	nodes, err := connectNodesInRing(net, nodeCount)
 	if err != nil {
-		panic("Could not startup node network for mocker")
+		select {
+		case <-quit:
+			//error may be due to abortion of mocking; so the quit channel is closed
+			return
+		default:
+			panic("Could not startup node network for mocker")
+		}
 	}
 	for {
 		select {
@@ -144,7 +150,7 @@ func probabilistic(net *Network, quit chan struct{}, nodeCount int) {
 			log.Debug(fmt.Sprintf("node %v shutting down", nodes[i]))
 			err := net.Stop(nodes[i])
 			if err != nil {
-				log.Error(fmt.Sprintf("Error stopping node %s", nodes[i]))
+				log.Error("Error stopping node", "node", nodes[i])
 				wg.Done()
 				continue
 			}
@@ -152,7 +158,7 @@ func probabilistic(net *Network, quit chan struct{}, nodeCount int) {
 				time.Sleep(randWait)
 				err := net.Start(id)
 				if err != nil {
-					log.Error(fmt.Sprintf("Error starting node %s", id))
+					log.Error("Error starting node", "node", id)
 				}
 				wg.Done()
 			}(nodes[i])
@@ -169,7 +175,7 @@ func connectNodesInRing(net *Network, nodeCount int) ([]discover.NodeID, error)
 		conf := adapters.RandomNodeConfig()
 		node, err := net.NewNodeWithConfig(conf)
 		if err != nil {
-			log.Error("Error creating a node! %s", err)
+			log.Error("Error creating a node!", "err", err)
 			return nil, err
 		}
 		ids[i] = node.ID()
@@ -177,7 +183,7 @@ func connectNodesInRing(net *Network, nodeCount int) ([]discover.NodeID, error)
 
 	for _, id := range ids {
 		if err := net.Start(id); err != nil {
-			log.Error("Error starting a node! %s", err)
+			log.Error("Error starting a node!", "err", err)
 			return nil, err
 		}
 		log.Debug(fmt.Sprintf("node %v starting up", id))
@@ -185,7 +191,7 @@ func connectNodesInRing(net *Network, nodeCount int) ([]discover.NodeID, error)
 	for i, id := range ids {
 		peerID := ids[(i+1)%len(ids)]
 		if err := net.Connect(id, peerID); err != nil {
-			log.Error("Error connecting a node to a peer! %s", err)
+			log.Error("Error connecting a node to a peer!", "err", err)
 			return nil, err
 		}
 	}

swarm/network/simulations/overlay.go

@@ -7,8 +7,6 @@ package main
 
 import (
 	"flag"
-	"fmt"
-	"math/rand"
 	"net/http"
 	"os"
 	"runtime"
@@ -72,162 +70,23 @@ func (s *Simulation) NewService(ctx *adapters.ServiceContext) (node.Service, err
 	return network.NewBzz(config, kad, store, nil, nil), nil
 }
 
-func createMockers() map[string]*simulations.MockerConfig {
-	configs := make(map[string]*simulations.MockerConfig)
-
-	defaultCfg := simulations.DefaultMockerConfig()
-	defaultCfg.ID = "start-stop"
-	defaultCfg.Description = "Starts and Stops nodes in go routines"
-	defaultCfg.Mocker = startStopMocker
-
-	bootNetworkCfg := simulations.DefaultMockerConfig()
-	bootNetworkCfg.ID = "bootNet"
-	bootNetworkCfg.Description = "Only boots up all nodes in the config"
-	bootNetworkCfg.Mocker = bootMocker
-
-	randomNodesCfg := simulations.DefaultMockerConfig()
-	randomNodesCfg.ID = "randomNodes"
-	randomNodesCfg.Description = "Boots nodes and then starts and stops some picking randomly"
-	randomNodesCfg.Mocker = randomMocker
-
-	configs[defaultCfg.ID] = defaultCfg
-	configs[bootNetworkCfg.ID] = bootNetworkCfg
-	configs[randomNodesCfg.ID] = randomNodesCfg
-
-	return configs
-}
-
-func setupMocker(net *simulations.Network) []discover.NodeID {
-	nodeCount := 30
-	ids := make([]discover.NodeID, nodeCount)
-	for i := 0; i < nodeCount; i++ {
-		node, err := net.NewNode()
-		if err != nil {
-			panic(err.Error())
-		}
-		ids[i] = node.ID()
-	}
-
-	for _, id := range ids {
-		if err := net.Start(id); err != nil {
-			panic(err.Error())
-		}
-	}
-	for i, id := range ids {
-		log.Trace(fmt.Sprintf("setup mocker: register a peer on node %x", id[:4]))
-		var peerID discover.NodeID
-		if i == 0 {
-			peerID = ids[len(ids)-1]
-		} else {
-			peerID = ids[i-1]
-		}
-		ch := make(chan network.OverlayAddr)
-		go func() {
-			defer close(ch)
-			ch <- network.NewAddrFromNodeID(peerID)
-		}()
-		log.Trace(fmt.Sprintf("%x registers peer %x", id[:4], peerID[:4]))
-		if err := net.GetNode(id).Node.(*adapters.SimNode).Services()[0].(*network.Bzz).Hive.Register(ch); err != nil {
-			panic(err.Error())
-		}
-	}
-
-	return ids
-}
-
-func bootMocker(net *simulations.Network) {
-	setupMocker(net)
-}
-
-func randomMocker(net *simulations.Network) {
-	ids := setupMocker(net)
-
-	for {
-		var lowid, highid int
-		var wg sync.WaitGroup
-		randWait := rand.Intn(5000) + 1000
-		rand1 := rand.Intn(9)
-		rand2 := rand.Intn(9)
-		if rand1 < rand2 {
-			lowid = rand1
-			highid = rand2
-		} else if rand1 > rand2 {
-			highid = rand1
-			lowid = rand2
-		} else {
-			if rand1 == 0 {
-				rand2 = 9
-			} else if rand1 == 9 {
-				rand1 = 0
-			}
-			lowid = rand1
-			highid = rand2
-		}
-		var steps = highid - lowid
-		wg.Add(steps)
-		for i := lowid; i < highid; i++ {
-			log.Info(fmt.Sprintf("node %v shutting down", ids[i]))
-			net.Stop(ids[i])
-			go func(id discover.NodeID) {
-				time.Sleep(time.Duration(randWait) * time.Millisecond)
-				net.Start(id)
-				wg.Done()
-			}(ids[i])
-			time.Sleep(time.Duration(randWait) * time.Millisecond)
-		}
-		wg.Wait()
-	}
-}
-
-func startStopMocker(net *simulations.Network) {
-	ids := setupMocker(net)
-
-	for range time.Tick(10 * time.Second) {
-		id := ids[rand.Intn(len(ids))]
-		go func() {
-			log.Error("stopping node", "id", id)
-			if err := net.Stop(id); err != nil {
-				log.Error("error stopping node", "id", id, "err", err)
-				return
-			}
-
-			time.Sleep(3 * time.Second)
-
-			log.Error("starting node", "id", id)
-			if err := net.Start(id); err != nil {
-				log.Error("error starting node", "id", id, "err", err)
-				return
-			}
-		}()
-	}
-}
-
 // var server
 func main() {
 	flag.Parse()
 
 	runtime.GOMAXPROCS(runtime.NumCPU())
 
-	log.Root().SetHandler(log.LvlFilterHandler(log.LvlTrace, log.StreamHandler(os.Stderr, log.TerminalFormat(false))))
+	log.Root().SetHandler(log.LvlFilterHandler(log.LvlInfo, log.StreamHandler(os.Stderr, log.TerminalFormat(false))))
 
 	s := NewSimulation()
 	services := adapters.Services{
 		"overlay": s.NewService,
 	}
 	adapter := adapters.NewSimAdapter(services)
-
 	network := simulations.NewNetwork(adapter, &simulations.NetworkConfig{
 		DefaultService: "overlay",
 	})
 
-	mockers := createMockers()
-
-	config := simulations.ServerConfig{
-		DefaultMockerID: "randomNodes",
-		// DefaultMockerID: "bootNet",
-		Mockers: mockers,
-	}
-
 	log.Info("starting simulation server on 0.0.0.0:8888...")
-	http.ListenAndServe(":8888", simulations.NewServer(network, config))
+	http.ListenAndServe(":8888", simulations.NewServer(network))
 }