dex: redesign p2p network topology

- Let p2p server support direct connection and group connection.
- Introduce node meta table to maintain IP of all nodes in node set,
  in memory and let nodes in the network can sync this table.
- Let peerSet able to manage direct connections to notary set and dkg set.

The mechanism to refresh the network topology when configuration round
change is not done yet.

1 files changed, 86 insertions, 106 deletions

diff --git a/p2p/server_test.go b/p2p/server_test.go
index b46240722..8bd113791 100644
--- a/p2p/server_test.go
+++ b/p2p/server_test.go
@@ -27,7 +27,6 @@ import (
 
 	"github.com/dexon-foundation/dexon/crypto"
 	"github.com/dexon-foundation/dexon/log"
-	"github.com/dexon-foundation/dexon/p2p/discover"
 	"github.com/dexon-foundation/dexon/p2p/enode"
 	"github.com/dexon-foundation/dexon/p2p/enr"
 	"golang.org/x/crypto/sha3"
@@ -173,14 +172,10 @@ func TestServerDial(t *testing.T) {
 			}
 
 			// Test AddTrustedPeer/RemoveTrustedPeer and changing Trusted flags
-			// Test AddNotaryPeer/RemoveTrustedPeer and changing Notary flags.
 			// Particularly for race conditions on changing the flag state.
 			if peer := srv.Peers()[0]; peer.Info().Network.Trusted {
 				t.Errorf("peer is trusted prematurely: %v", peer)
 			}
-			if peer := srv.Peers()[0]; peer.Info().Network.Notary {
-				t.Errorf("peer is notary prematurely: %v", peer)
-			}
 			done := make(chan bool)
 			go func() {
 				srv.AddTrustedPeer(node)
@@ -192,14 +187,6 @@ func TestServerDial(t *testing.T) {
 					t.Errorf("peer is trusted after RemoveTrustedPeer: %v", peer)
 				}
 
-				srv.AddNotaryPeer(node)
-				if peer := srv.Peers()[0]; !peer.Info().Network.Notary {
-					t.Errorf("peer is not notary after AddNotaryPeer: %v", peer)
-				}
-				srv.RemoveNotaryPeer(node)
-				if peer := srv.Peers()[0]; peer.Info().Network.Notary {
-					t.Errorf("peer is notary after RemoveNotaryPeer: %v", peer)
-				}
 				done <- true
 			}()
 			// Trigger potential race conditions
@@ -216,70 +203,89 @@ func TestServerDial(t *testing.T) {
 	}
 }
 
-// TestNotaryPeer checks that the node is added to and remove from static when
-// AddNotaryPeer and RemoveNotaryPeer is called.
-func TestNotaryPeer(t *testing.T) {
-	var (
-		returned    = make(chan struct{})
-		add, remove = make(chan *discover.Node), make(chan *discover.Node)
-		tg          = taskgen{
-			newFunc: func(running int, peers map[discover.NodeID]*Peer) []task {
-				return []task{}
-			},
-			doneFunc: func(t task) {},
-			addFunc: func(n *discover.Node) {
-				add <- n
-			},
-			removeFunc: func(n *discover.Node) {
-				remove <- n
-			},
-		}
-	)
-
+func TestServerPeerConnFlag(t *testing.T) {
 	srv := &Server{
-		Config:       Config{MaxPeers: 10},
-		quit:         make(chan struct{}),
-		ntab:         fakeTable{},
-		addnotary:    make(chan *discover.Node),
-		removenotary: make(chan *discover.Node),
-		running:      true,
-		log:          log.New(),
+		Config: Config{
+			PrivateKey: newkey(),
+			MaxPeers:   10,
+			NoDial:     true,
+		},
 	}
-	srv.loopWG.Add(1)
-	go func() {
-		srv.run(tg)
-		close(returned)
-	}()
+	if err := srv.Start(); err != nil {
+		t.Fatalf("could not start: %v", err)
+	}
+	defer srv.Stop()
 
-	notaryID := randomID()
-	go srv.AddNotaryPeer(&discover.Node{ID: notaryID})
+	// inject a peer
+	key := newkey()
+	id := enode.PubkeyToIDV4(&key.PublicKey)
+	node := newNode(id, nil)
+	fd, _ := net.Pipe()
+	c := &conn{
+		node:      node,
+		fd:        fd,
+		transport: newTestTransport(&key.PublicKey, fd),
+		flags:     inboundConn,
+		cont:      make(chan error),
+	}
+	if err := srv.checkpoint(c, srv.addpeer); err != nil {
+		t.Fatalf("could not add conn: %v", err)
+	}
 
-	select {
-	case n := <-add:
-		if n.ID != notaryID {
-			t.Errorf("node ID mismatched: got %s, want %s",
-				n.ID.String(), notaryID.String())
-		}
-	case <-time.After(1 * time.Second):
-		t.Error("add static is not called within one second")
+	srv.AddTrustedPeer(node)
+	srv.Peers() // leverage this function to ensure trusted peer is added
+	if c.flags != (inboundConn | trustedConn) {
+		t.Errorf("flags mismatch: got %d, want %d",
+			c.flags, (inboundConn | trustedConn))
 	}
 
-	go srv.RemoveNotaryPeer(&discover.Node{ID: notaryID})
-	select {
-	case n := <-remove:
-		if n.ID != notaryID {
-			t.Errorf("node ID mismatched: got %s, want %s",
-				n.ID.String(), notaryID.String())
-		}
-	case <-time.After(1 * time.Second):
-		t.Error("remove static is not called within one second")
+	srv.AddDirectPeer(node)
+	srv.Peers() // leverage this function to ensure trusted peer is added
+	if c.flags != (inboundConn | trustedConn | directDialedConn) {
+		t.Errorf("flags mismatch: got %d, want %d",
+			c.flags, (inboundConn | trustedConn | directDialedConn))
 	}
 
-	srv.Stop()
-	select {
-	case <-returned:
-	case <-time.After(500 * time.Millisecond):
-		t.Error("Server.run did not return within 500ms")
+	srv.AddGroup("g1", []*enode.Node{node}, 1)
+	srv.Peers() // leverage this function to ensure trusted peer is added
+	if c.flags != (inboundConn | trustedConn | directDialedConn | groupDialedConn) {
+		t.Errorf("flags mismatch: got %d, want %d",
+			c.flags, (inboundConn | trustedConn | directDialedConn | groupDialedConn))
+	}
+
+	srv.AddGroup("g2", []*enode.Node{node}, 1)
+	srv.Peers() // leverage this function to ensure trusted peer is added
+	if c.flags != (inboundConn | trustedConn | directDialedConn | groupDialedConn) {
+		t.Errorf("flags mismatch: got %d, want %d",
+			c.flags, (inboundConn | trustedConn | directDialedConn | groupDialedConn))
+	}
+
+	srv.RemoveTrustedPeer(node)
+	srv.Peers() // leverage this function to ensure trusted peer is added
+	if c.flags != (inboundConn | directDialedConn | groupDialedConn) {
+		t.Errorf("flags mismatch: got %d, want %d",
+			c.flags, (inboundConn | directDialedConn | directDialedConn))
+	}
+
+	srv.RemoveDirectPeer(node)
+	srv.Peers() // leverage this function to ensure trusted peer is added
+	if c.flags != (inboundConn | groupDialedConn) {
+		t.Errorf("flags mismatch: got %d, want %d",
+			c.flags, (inboundConn | directDialedConn))
+	}
+
+	srv.RemoveGroup("g1")
+	srv.Peers() // leverage this function to ensure trusted peer is added
+	if c.flags != (inboundConn | groupDialedConn) {
+		t.Errorf("flags mismatch: got %d, want %d",
+			c.flags, (inboundConn | directDialedConn))
+	}
+
+	srv.RemoveGroup("g2")
+	srv.Peers() // leverage this function to ensure trusted peer is added
+	if c.flags != inboundConn {
+		t.Errorf("flags mismatch: got %d, want %d",
+			c.flags, inboundConn)
 	}
 }
 
@@ -407,9 +413,6 @@ func TestServerManyTasks(t *testing.T) {
 type taskgen struct {
 	newFunc  func(running int, peers map[enode.ID]*Peer) []task
 	doneFunc func(task)
-
-	addFunc    func(*discover.Node)
-	removeFunc func(*discover.Node)
 }
 
 func (tg taskgen) newTasks(running int, peers map[enode.ID]*Peer, now time.Time) []task {
@@ -418,11 +421,17 @@ func (tg taskgen) newTasks(running int, peers map[enode.ID]*Peer, now time.Time)
 func (tg taskgen) taskDone(t task, now time.Time) {
 	tg.doneFunc(t)
 }
-func (tg taskgen) addStatic(n *enode.Node) {
-	tg.addFunc(n)
+func (tg taskgen) addStatic(*enode.Node) {
+}
+func (tg taskgen) removeStatic(*enode.Node) {
 }
-func (tg taskgen) removeStatic(n *enode.Node) {
-	tg.removeFunc(n)
+func (tg taskgen) addDirect(*enode.Node) {
+}
+func (tg taskgen) removeDirect(*enode.Node) {
+}
+func (tg taskgen) addGroup(*dialGroup) {
+}
+func (tg taskgen) removeGroup(*dialGroup) {
 }
 
 type testTask struct {
@@ -436,11 +445,10 @@ func (t *testTask) Do(srv *Server) {
 
 // This test checks that connections are disconnected
 // just after the encryption handshake when the server is
-// at capacity. Trusted and Notary connections should still be accepted.
+// at capacity. Trusted connections should still be accepted.
 func TestServerAtCap(t *testing.T) {
 	trustedNode := newkey()
 	trustedID := enode.PubkeyToIDV4(&trustedNode.PublicKey)
-	notaryID := randomID()
 	srv := &Server{
 		Config: Config{
 			PrivateKey:   newkey(),
@@ -453,7 +461,6 @@ func TestServerAtCap(t *testing.T) {
 		t.Fatalf("could not start: %v", err)
 	}
 	defer srv.Stop()
-	srv.AddNotaryPeer(&discover.Node{ID: notaryID})
 
 	newconn := func(id enode.ID) *conn {
 		fd, _ := net.Pipe()
@@ -484,15 +491,6 @@ func TestServerAtCap(t *testing.T) {
 		t.Error("Server did not set trusted flag")
 	}
 
-	// Try inserting a notary connection.
-	c = newconn(notaryID)
-	if err := srv.checkpoint(c, srv.posthandshake); err != nil {
-		t.Error("unexpected error for notary conn @posthandshake:", err)
-	}
-	if !c.is(notaryConn) {
-		t.Error("Server did not set notary flag")
-	}
-
 	// Remove from trusted set and try again
 	srv.RemoveTrustedPeer(newNode(trustedID, nil))
 	c = newconn(trustedID)
@@ -509,24 +507,6 @@ func TestServerAtCap(t *testing.T) {
 	if !c.is(trustedConn) {
 		t.Error("Server did not set trusted flag")
 	}
-
-	// Remove from notary set and try again
-	srv.RemoveNotaryPeer(&discover.Node{ID: notaryID})
-	c = newconn(notaryID)
-	if err := srv.checkpoint(c, srv.posthandshake); err != DiscTooManyPeers {
-		t.Error("wrong error for insert:", err)
-	}
-
-	// Add anotherID to notary set and try again
-	anotherNotaryID := randomID()
-	srv.AddNotaryPeer(&discover.Node{ID: anotherNotaryID})
-	c = newconn(anotherNotaryID)
-	if err := srv.checkpoint(c, srv.posthandshake); err != nil {
-		t.Error("unexpected error for notary conn @posthandshake:", err)
-	}
-	if !c.is(notaryConn) {
-		t.Error("Server did not set notary flag")
-	}
 }
 
 func TestServerPeerLimits(t *testing.T) {