testutil vastly simplified peer

This commit is contained in:
Juan Batiz-Benet 2014-12-19 12:34:09 -08:00
parent fc10d6937d
commit d5c37aefdf
2 changed files with 4 additions and 56 deletions

View File

@ -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

View File

@ -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)
}