From d5c37aefdf9f9c32957784685bdd433fbe2ff98c Mon Sep 17 00:00:00 2001
From: Juan Batiz-Benet <juan@benet.ai>
Date: Fri, 19 Dec 2014 12:34:09 -0800
Subject: [PATCH] testutil vastly simplified peer

---
 util/testutil/gen.go  | 42 ++++--------------------------------------
 util/testutil/mock.go | 18 ------------------
 2 files changed, 4 insertions(+), 56 deletions(-)
 delete mode 100644 util/testutil/mock.go

diff --git a/util/testutil/gen.go b/util/testutil/gen.go
index c59826961..267ab74c3 100644
--- a/util/testutil/gen.go
+++ b/util/testutil/gen.go
@@ -1,55 +1,21 @@
 package testutil
 
 import (
-	crand "crypto/rand"
 	"fmt"
 	"math/rand"
 
 	ci "github.com/jbenet/go-ipfs/crypto"
 	peer "github.com/jbenet/go-ipfs/peer"
-	u "github.com/jbenet/go-ipfs/util"
 
 	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
 )
 
-func RandPeer() peer.Peer {
-	id := make([]byte, 16)
-	crand.Read(id)
-	mhid := u.Hash(id)
-	return NewPeerWithID(peer.ID(mhid))
-}
-
-func PeerWithNewKeys() (peer.Peer, error) {
-	sk, pk, err := ci.GenerateKeyPair(ci.RSA, 512)
+func RandPeerID() (peer.ID, error) {
+	_, pk, err := ci.GenerateKeyPair(ci.RSA, 512)
 	if err != nil {
-		return nil, err
+		return "", err
 	}
-
-	return NewPeerWithKeyPair(sk, pk)
-}
-
-func PeerWithKeysAndStringAddress(addr string) (peer.Peer, error) {
-	maddr, err := ma.NewMultiaddr(addr)
-	if err != nil {
-		return nil, err
-	}
-
-	return PeerWithKeysAndAddress(maddr)
-}
-
-func PeerWithKeysAndAddress(maddr ma.Multiaddr) (peer.Peer, error) {
-	sk, pk, err := ci.GenerateKeyPair(ci.RSA, 512)
-	if err != nil {
-		return nil, err
-	}
-
-	p, err := NewPeerWithKeyPair(sk, pk)
-	if err != nil {
-		return nil, err
-	}
-
-	p.AddAddress(maddr)
-	return p, nil
+	return peer.IDFromPublicKey(pk)
 }
 
 // RandLocalTCPAddress returns a random multiaddr. it suppresses errors
diff --git a/util/testutil/mock.go b/util/testutil/mock.go
deleted file mode 100644
index 1c5d4ded2..000000000
--- a/util/testutil/mock.go
+++ /dev/null
@@ -1,18 +0,0 @@
-package testutil
-
-import (
-	ic "github.com/jbenet/go-ipfs/crypto"
-	peer "github.com/jbenet/go-ipfs/peer"
-)
-
-func NewPeerWithKeyPair(sk ic.PrivKey, pk ic.PubKey) (peer.Peer, error) {
-	return peer.NewPeerstore().WithKeyPair(sk, pk)
-}
-
-func NewPeerWithID(id peer.ID) peer.Peer {
-	return peer.NewPeerstore().WithID(id)
-}
-
-func NewPeerWithIDString(id string) peer.Peer {
-	return peer.NewPeerstore().WithIDString(id)
-}