Refactor are combine the phonebook implementations

agreement/gossip/networkFull_test.go

@@ -60,9 +60,9 @@ func spinNetwork(t *testing.T, nodesCount int) ([]*networkImpl, []*messageCounte
 	start := time.Now()
 	nodesAddresses := []string{}
 	gossipNodes := []network.GossipNode{}
-	phonebooks := make([]*network.ThreadsafePhonebook, nodesCount)
+	phonebooks := make([]network.Phonebook, nodesCount)
 	for nodeIdx := 0; nodeIdx < nodesCount; nodeIdx++ {
-		phonebooks[nodeIdx] = network.MakeThreadsafePhonebook(cfg.ConnectionsRateLimitingCount,
+		phonebooks[nodeIdx] = network.MakePhonebook(cfg.ConnectionsRateLimitingCount,
 			time.Duration(cfg.ConnectionsRateLimitingWindowSeconds)*time.Second)
 		gossipNode, err := network.NewWebsocketGossipNode(log.With("node", nodeIdx), cfg, phonebooks[nodeIdx], "go-test-agreement-network-genesis", config.Devtestnet)
 		if err != nil {
@@ -78,7 +78,7 @@ func spinNetwork(t *testing.T, nodesCount int) ([]*networkImpl, []*messageCounte
 	for nodeIdx, gossipNode := range gossipNodes {
 		others := []string{}
 		others = append(others, nodesAddresses[nodeIdx+1:]...)
-		phonebooks[nodeIdx].ReplacePeerList(others)
+		phonebooks[nodeIdx].ReplacePeerList(others, "")
 		log.Debugf("phonebook[%d] %#v", nodeIdx, others)
 		gossipNode.RequestConnectOutgoing(false, nil) // no disconnect.
 	}

cmd/netdummy/main.go

@@ -47,9 +47,9 @@ func main() {
 	log.SetLevel(logging.Debug)
 	log.SetOutput(os.Stderr)
 
-	addrs := network.MakeArrayPhonebook(conf.ConnectionsRateLimitingCount,
+	addrs := network.MakePhonebook(conf.ConnectionsRateLimitingCount,
 		time.Duration(conf.ConnectionsRateLimitingWindowSeconds)*time.Second)
-	addrs.Entries.ReplacePeerList([]string{*serverAddress})
+	addrs.ReplacePeerList([]string{*serverAddress}, conf.DNSBootstrapID)
 
 	var nodes []network.GossipNode
 	for i := 0; i < *numClients; i++ {

network/dialer.go

@@ -30,14 +30,14 @@ type netDialer interface {
 
 // Dialer establish tcp-level connection with the destination
 type Dialer struct {
-	phonebook   *MultiPhonebook
+	phonebook   Phonebook
 	innerDialer netDialer
 	resolver    *net.Resolver
 }
 
 // makeRateLimitingDialer creates a rate limiting dialer that would limit the connections
 // according to the entries in the phonebook.
-func makeRateLimitingDialer(phonebook *MultiPhonebook, resolver *dnssec.Resolver) Dialer {
+func makeRateLimitingDialer(phonebook Phonebook, resolver *dnssec.Resolver) Dialer {
 	var innerDialer netDialer = &net.Dialer{
 		Timeout:   30 * time.Second,
 		KeepAlive: 30 * time.Second,