From a85aa9b5da2f778f9b6e9bdb167089f7d8a47df7 Mon Sep 17 00:00:00 2001
From: Brian Tiger Chow <brian.holderchow@gmail.com>
Date: Tue, 23 Dec 2014 18:02:56 -0500
Subject: [PATCH] refactor: rename testutil func

---
 net/backpressure/backpressure_test.go |  2 +-
 net/conn/dial_test.go                 |  8 ++++----
 net/id_test.go                        |  2 +-
 net/swarm/swarm_test.go               |  2 +-
 util/testutil/gen.go                  | 22 ++++++++++++++-------
 util/testutil/peer.go                 | 28 +++++++--------------------
 6 files changed, 29 insertions(+), 35 deletions(-)

diff --git a/net/backpressure/backpressure_test.go b/net/backpressure/backpressure_test.go
index 4dd29d167..7a8593ee4 100644
--- a/net/backpressure/backpressure_test.go
+++ b/net/backpressure/backpressure_test.go
@@ -18,7 +18,7 @@ import (
 var log = eventlog.Logger("backpressure")
 
 func GenNetwork(t *testing.T, ctx context.Context) (inet.Network, error) {
-	p := testutil.RandPeerNetParams(t)
+	p := testutil.RandPeerNetParamsOrFatal(t)
 	ps := peer.NewPeerstore()
 	ps.AddAddress(p.ID, p.Addr)
 	ps.AddPubKey(p.ID, p.PubKey)
diff --git a/net/conn/dial_test.go b/net/conn/dial_test.go
index 125eb6425..bf24ab09a 100644
--- a/net/conn/dial_test.go
+++ b/net/conn/dial_test.go
@@ -49,8 +49,8 @@ func setupSingleConn(t *testing.T, ctx context.Context) (a, b Conn, p1, p2 tu.Pe
 
 func setupConn(t *testing.T, ctx context.Context, secure bool) (a, b Conn, p1, p2 tu.PeerNetParams) {
 
-	p1 = tu.RandPeerNetParams(t)
-	p2 = tu.RandPeerNetParams(t)
+	p1 = tu.RandPeerNetParamsOrFatal(t)
+	p2 = tu.RandPeerNetParamsOrFatal(t)
 	laddr := p1.Addr
 
 	key1 := p1.PrivKey
@@ -95,8 +95,8 @@ func setupConn(t *testing.T, ctx context.Context, secure bool) (a, b Conn, p1, p
 func testDialer(t *testing.T, secure bool) {
 	// t.Skip("Skipping in favor of another test")
 
-	p1 := tu.RandPeerNetParams(t)
-	p2 := tu.RandPeerNetParams(t)
+	p1 := tu.RandPeerNetParamsOrFatal(t)
+	p2 := tu.RandPeerNetParamsOrFatal(t)
 
 	key1 := p1.PrivKey
 	key2 := p2.PrivKey
diff --git a/net/id_test.go b/net/id_test.go
index 70ae10e45..524616a2d 100644
--- a/net/id_test.go
+++ b/net/id_test.go
@@ -14,7 +14,7 @@ import (
 )
 
 func GenNetwork(t *testing.T, ctx context.Context) inet.Network {
-	p := testutil.RandPeerNetParams(t)
+	p := testutil.RandPeerNetParamsOrFatal(t)
 	ps := peer.NewPeerstore()
 	ps.AddAddress(p.ID, p.Addr)
 	ps.AddPubKey(p.ID, p.PubKey)
diff --git a/net/swarm/swarm_test.go b/net/swarm/swarm_test.go
index 3d692a064..dd89b2443 100644
--- a/net/swarm/swarm_test.go
+++ b/net/swarm/swarm_test.go
@@ -51,7 +51,7 @@ func makeSwarms(ctx context.Context, t *testing.T, num int) ([]*Swarm, []testuti
 	peersnp := make([]testutil.PeerNetParams, 0, num)
 
 	for i := 0; i < num; i++ {
-		localnp := testutil.RandPeerNetParams(t)
+		localnp := testutil.RandPeerNetParamsOrFatal(t)
 		peersnp = append(peersnp, localnp)
 
 		peerstore := peer.NewPeerstore()
diff --git a/util/testutil/gen.go b/util/testutil/gen.go
index a8b832084..59dd862a8 100644
--- a/util/testutil/gen.go
+++ b/util/testutil/gen.go
@@ -107,21 +107,29 @@ func (p *PeerNetParams) checkKeys() error {
 	return nil // ok. move along.
 }
 
-func RandPeerNetParams(t *testing.T) (p PeerNetParams) {
+func RandPeerNetParamsOrFatal(t *testing.T) PeerNetParams {
+	p, err := RandPeerNetParams()
+	if err != nil {
+		t.Fatal(err)
+		return PeerNetParams{} // TODO return nil
+	}
+	return *p
+}
+
+func RandPeerNetParams() (*PeerNetParams, error) {
+	var p PeerNetParams
 	var err error
 	p.Addr = RandLocalTCPAddress()
 	p.PrivKey, p.PubKey, err = ci.GenerateKeyPair(ci.RSA, 512)
 	if err != nil {
-		t.Fatal(err)
+		return nil, err
 	}
-
 	p.ID, err = peer.IDFromPublicKey(p.PubKey)
 	if err != nil {
-		t.Fatal(err)
+		return nil, err
 	}
-
 	if err := p.checkKeys(); err != nil {
-		t.Fatal(err)
+		return nil, err
 	}
-	return p
+	return &p, nil
 }
diff --git a/util/testutil/peer.go b/util/testutil/peer.go
index 75bd4f34a..e74e43c2b 100644
--- a/util/testutil/peer.go
+++ b/util/testutil/peer.go
@@ -1,38 +1,24 @@
 package testutil
 
 import (
-	"testing"
-
 	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
 	ci "github.com/jbenet/go-ipfs/crypto"
-	ipfspeer "github.com/jbenet/go-ipfs/peer"
+	peer "github.com/jbenet/go-ipfs/peer"
 )
 
 type Peer interface {
 	Address() ma.Multiaddr
-	ID() ipfspeer.ID
+	ID() peer.ID
 	PrivateKey() ci.PrivKey
 	PublicKey() ci.PubKey
 }
 
-func RandPeer(t *testing.T) Peer {
-	p := RandPeerNetParams(t)
-	var err error
-	p.Addr = RandLocalTCPAddress()
-	p.PrivKey, p.PubKey, err = ci.GenerateKeyPair(ci.RSA, 512)
+func RandPeer() (Peer, error) {
+	p, err := RandPeerNetParams()
 	if err != nil {
-		t.Fatal(err)
+		return nil, err
 	}
-
-	p.ID, err = ipfspeer.IDFromPublicKey(p.PubKey)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if err := p.checkKeys(); err != nil {
-		t.Fatal(err)
-	}
-	return &testpeer{p}
+	return &testpeer{*p}, nil
 }
 
 // peer is a temporary shim to delay binding of PeerNetParams.
@@ -40,7 +26,7 @@ type testpeer struct {
 	PeerNetParams
 }
 
-func (p *testpeer) ID() ipfspeer.ID {
+func (p *testpeer) ID() peer.ID {
 	return p.PeerNetParams.ID
 }