p2p, dex: rework connection management (#183)

* p2p, dex: rework connection management
* dex: refresh our node record periodically
* dex: don't send new record event if no new record

1 files changed, 0 insertions, 90 deletions

diff --git a/p2p/server_test.go b/p2p/server_test.go
index 8bd113791..734b2a8c1 100644
--- a/p2p/server_test.go
+++ b/p2p/server_test.go
@@ -203,92 +203,6 @@ func TestServerDial(t *testing.T) {
 	}
 }
 
-func TestServerPeerConnFlag(t *testing.T) {
-	srv := &Server{
-		Config: Config{
-			PrivateKey: newkey(),
-			MaxPeers:   10,
-			NoDial:     true,
-		},
-	}
-	if err := srv.Start(); err != nil {
-		t.Fatalf("could not start: %v", err)
-	}
-	defer srv.Stop()
-
-	// 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)
-	}
-
-	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))
-	}
-
-	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.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)
-	}
-}
-
 // This test checks that tasks generated by dialstate are
 // actually executed and taskdone is called for them.
 func TestServerTaskScheduling(t *testing.T) {
@@ -429,10 +343,6 @@ 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 {
 	index  int