core/mock: use mock routing
this fixes a failing ipns test which didnt have a "working" routing system
Juan Batiz-Benet committed
Jan 4, 2015 at 16:05 UTC
b599e28b88f84645644ea06ef7e154ce69287c64
1 file changed
+9
-15
core/mock.go
+9
-15
@@ -10,11 +10,10 @@ import (
10
"github.com/jbenet/go-ipfs/exchange/offline"
11
mdag "github.com/jbenet/go-ipfs/merkledag"
12
nsys "github.com/jbenet/go-ipfs/namesys"
13
- ci "github.com/jbenet/go-ipfs/p2p/crypto"
13
mocknet "github.com/jbenet/go-ipfs/p2p/net/mock"
14
peer "github.com/jbenet/go-ipfs/p2p/peer"
15
path "github.com/jbenet/go-ipfs/path"
17
- dht "github.com/jbenet/go-ipfs/routing/dht"
16
+ mockrouting "github.com/jbenet/go-ipfs/routing/mock"
17
ds2 "github.com/jbenet/go-ipfs/util/datastore2"
18
testutil "github.com/jbenet/go-ipfs/util/testutil"
19
)
@@ -29,23 +28,19 @@ func NewMockNode() (*IpfsNode, error) {
28
nd := new(IpfsNode)
29
30
// Generate Identity
32
- sk, pk, err := ci.GenerateKeyPair(ci.RSA, 1024)
33
- if err != nil {
34
- return nil, err
35
- }
36
-
37
- p, err := peer.IDFromPublicKey(pk)
31
+ ident, err := testutil.RandIdentity()
32
if err != nil {
33
return nil, err
34
}
35
36
+ p := ident.ID()
37
nd.Identity = p
43
- nd.PrivateKey = sk
38
+ nd.PrivateKey = ident.PrivateKey()
39
nd.Peerstore = peer.NewPeerstore()
45
- nd.Peerstore.AddPrivKey(p, sk)
46
- nd.Peerstore.AddPubKey(p, pk)
40
+ nd.Peerstore.AddPrivKey(p, ident.PrivateKey())
41
+ nd.Peerstore.AddPubKey(p, ident.PublicKey())
42
48
- nd.PeerHost, err = mocknet.New(ctx).AddPeer(sk, testutil.RandLocalTCPAddress()) // effectively offline
43
+ nd.PeerHost, err = mocknet.New(ctx).AddPeer(ident.PrivateKey(), ident.Address()) // effectively offline
44
if err != nil {
45
return nil, err
46
}
@@ -55,8 +50,7 @@ func NewMockNode() (*IpfsNode, error) {
50
nd.Datastore = ds2.CloserWrap(syncds.MutexWrap(dstore))
51
52
// Routing
58
- dht := dht.NewDHT(ctx, nd.PeerHost, nd.Datastore)
59
- nd.Routing = dht
53
+ nd.Routing = mockrouting.NewServer().Client(ident)
54
55
// Bitswap
56
bstore := blockstore.NewBlockstore(nd.Datastore)
@@ -68,7 +62,7 @@ func NewMockNode() (*IpfsNode, error) {
62
nd.DAG = mdag.NewDAGService(bserv)
63
64
// Namespace resolver
71
- nd.Namesys = nsys.NewNameSystem(dht)
65
+ nd.Namesys = nsys.NewNameSystem(nd.Routing)
66
67
// Path resolver
68
nd.Resolver = &path.Resolver{DAG: nd.DAG}