From 63c7741fb9fb19dc2c3e95ea622f947c30cb9c7a Mon Sep 17 00:00:00 2001
From: rht <rhtbot@gmail.com>
Date: Fri, 28 Aug 2015 17:39:05 +0700
Subject: [PATCH] Refactor FullMeshLinked and ConnectAll()

License: MIT
Signed-off-by: rht <rhtbot@gmail.com>
---
 p2p/net/mock/interface.go       |  1 +
 p2p/net/mock/mock.go            | 10 ++--------
 p2p/net/mock/mock_net.go        |  2 +-
 p2p/net/mock/mock_notif_test.go | 13 +++----------
 4 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/p2p/net/mock/interface.go b/p2p/net/mock/interface.go
index a984d865a..44f4d4c90 100644
--- a/p2p/net/mock/interface.go
+++ b/p2p/net/mock/interface.go
@@ -60,6 +60,7 @@ type Mocknet interface {
 	DisconnectPeers(peer.ID, peer.ID) error
 	DisconnectNets(inet.Network, inet.Network) error
 	LinkAll() error
+	ConnectAllButSelf() error
 }
 
 // LinkOptions are used to change aspects of the links.
diff --git a/p2p/net/mock/mock.go b/p2p/net/mock/mock.go
index 89447d3f3..611ef8e0a 100644
--- a/p2p/net/mock/mock.go
+++ b/p2p/net/mock/mock.go
@@ -28,14 +28,8 @@ func FullMeshLinked(ctx context.Context, n int) (Mocknet, error) {
 		return nil, err
 	}
 
-	nets := m.Nets()
-	for _, n1 := range nets {
-		for _, n2 := range nets {
-			// yes, even self.
-			if _, err := m.LinkNets(n1, n2); err != nil {
-				return nil, err
-			}
-		}
+	if err := m.LinkAll(); err != nil {
+		return nil, err
 	}
 
 	return m, nil
diff --git a/p2p/net/mock/mock_net.go b/p2p/net/mock/mock_net.go
index 45e6f8450..6260a783f 100644
--- a/p2p/net/mock/mock_net.go
+++ b/p2p/net/mock/mock_net.go
@@ -296,7 +296,7 @@ func (mn *mocknet) removeLink(l *link) {
 	delete(*mn.linksMapGet(n2.peer, n1.peer), l)
 }
 
-func (mn *mocknet) ConnectAll() error {
+func (mn *mocknet) ConnectAllButSelf() error {
 	nets := mn.Nets()
 	for _, n1 := range nets {
 		for _, n2 := range nets {
diff --git a/p2p/net/mock/mock_notif_test.go b/p2p/net/mock/mock_notif_test.go
index f7a3ddb8a..92a415f16 100644
--- a/p2p/net/mock/mock_notif_test.go
+++ b/p2p/net/mock/mock_notif_test.go
@@ -28,16 +28,9 @@ func TestNotifications(t *testing.T) {
 		notifiees[i] = n
 	}
 
-	// connect all
-	for _, n1 := range nets {
-		for _, n2 := range nets {
-			if n1 == n2 {
-				continue
-			}
-			if _, err := mn.ConnectNets(n1, n2); err != nil {
-				t.Fatal(err)
-			}
-		}
+	// connect all but self
+	if err := mn.ConnectAllButSelf(); err != nil {
+		t.Fatal(err)
 	}
 
 	// test everyone got the correct connection opened calls