Refactor Mocknet FullMeshLinked and FullMeshConnected

License: MIT Signed-off-by: rht <[email protected]>
ipfs · Aug 28, 2015 · ef0bf10 · ef0bf10
1 parent b55cf12
commit ef0bf10
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 26 deletions.
diff --git 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
+ ConnectAll() error
 }
 
 // LinkOptions are used to change aspects of the links.

diff --git a/p2p/net/mock/mock.go b/p2p/net/mock/mock.go
@@ -28,16 +28,9 @@ 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
 }
 
@@ -50,14 +43,8 @@ func FullMeshConnected(ctx context.Context, n int) (Mocknet, error) {
  return nil, err
  }
 
- nets := m.Nets()
- for _, n1 := range nets {
- for _, n2 := range nets {
- if _, err := m.ConnectNets(n1, n2); err != nil {
- return nil, err
- }
- }
+ if err := m.ConnectAll(); err != nil {
+ return nil, err
  }
-
  return m, nil
 }
diff --git a/p2p/net/mock/mock_notif_test.go b/p2p/net/mock/mock_notif_test.go
@@ -29,15 +29,8 @@ func TestNotifications(t *testing.T) {
  }
 
  // 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)
- }
- }
+ if err := mn.ConnectAll(); err != nil {
+ t.Fatal(err)
  }
 
  // test everyone got the correct connection opened calls