better peer gen
Juan Batiz-Benet committed
Oct 16, 2014 at 07:18 UTC
ccaa490c913654218a9fc50adc88b1fe69cac01e
1 file changed
+7
-9
net/swarm/swarm_test.go
+7
-9
@@ -13,7 +13,6 @@ import (
13
14
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
15
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
16
- mh "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
16
)
17
18
func pong(ctx context.Context, swarm *Swarm) {
@@ -30,35 +29,34 @@ func pong(ctx context.Context, swarm *Swarm) {
29
}
30
}
31
33
-func setupPeer(t *testing.T, id string, addr string) *peer.Peer {
32
+func setupPeer(t *testing.T, addr string) *peer.Peer {
33
tcp, err := ma.NewMultiaddr(addr)
34
if err != nil {
35
t.Fatal(err)
36
}
37
39
- mh, err := mh.FromHexString(id)
38
+ sk, pk, err := ci.GenerateKeyPair(ci.RSA, 512)
39
if err != nil {
40
t.Fatal(err)
41
}
42
44
- p := &peer.Peer{ID: peer.ID(mh)}
45
-
46
- sk, pk, err := ci.GenerateKeyPair(ci.RSA, 512)
43
+ id, err := peer.IDFromPubKey(pk)
44
if err != nil {
45
t.Fatal(err)
46
}
47
+
48
+ p := &peer.Peer{ID: id}
49
p.PrivKey = sk
50
p.PubKey = pk
52
-
51
p.AddAddress(tcp)
54
- return p
52
+ return p, nil
53
}
54
55
func makeSwarms(ctx context.Context, t *testing.T, peers map[string]string) []*Swarm {
56
swarms := []*Swarm{}
57
58
for key, addr := range peers {
61
- local := setupPeer(t, key, addr)
59
+ local := setupPeer(t, addr)
60
peerstore := peer.NewPeerstore()
61
swarm, err := NewSwarm(ctx, local, peerstore)
62
if err != nil {