From b599e28b88f84645644ea06ef7e154ce69287c64 Mon Sep 17 00:00:00 2001
From: Juan Batiz-Benet <juan@benet.ai>
Date: Sun, 4 Jan 2015 16:05:15 -0800
Subject: [PATCH] core/mock: use mock routing

this fixes a failing ipns test which didnt have
a "working" routing system
---
 core/mock.go | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/core/mock.go b/core/mock.go
index b448b2517..e4c15540b 100644
--- a/core/mock.go
+++ b/core/mock.go
@@ -10,11 +10,10 @@ import (
 	"github.com/jbenet/go-ipfs/exchange/offline"
 	mdag "github.com/jbenet/go-ipfs/merkledag"
 	nsys "github.com/jbenet/go-ipfs/namesys"
-	ci "github.com/jbenet/go-ipfs/p2p/crypto"
 	mocknet "github.com/jbenet/go-ipfs/p2p/net/mock"
 	peer "github.com/jbenet/go-ipfs/p2p/peer"
 	path "github.com/jbenet/go-ipfs/path"
-	dht "github.com/jbenet/go-ipfs/routing/dht"
+	mockrouting "github.com/jbenet/go-ipfs/routing/mock"
 	ds2 "github.com/jbenet/go-ipfs/util/datastore2"
 	testutil "github.com/jbenet/go-ipfs/util/testutil"
 )
@@ -29,23 +28,19 @@ func NewMockNode() (*IpfsNode, error) {
 	nd := new(IpfsNode)
 
 	// Generate Identity
-	sk, pk, err := ci.GenerateKeyPair(ci.RSA, 1024)
-	if err != nil {
-		return nil, err
-	}
-
-	p, err := peer.IDFromPublicKey(pk)
+	ident, err := testutil.RandIdentity()
 	if err != nil {
 		return nil, err
 	}
 
+	p := ident.ID()
 	nd.Identity = p
-	nd.PrivateKey = sk
+	nd.PrivateKey = ident.PrivateKey()
 	nd.Peerstore = peer.NewPeerstore()
-	nd.Peerstore.AddPrivKey(p, sk)
-	nd.Peerstore.AddPubKey(p, pk)
+	nd.Peerstore.AddPrivKey(p, ident.PrivateKey())
+	nd.Peerstore.AddPubKey(p, ident.PublicKey())
 
-	nd.PeerHost, err = mocknet.New(ctx).AddPeer(sk, testutil.RandLocalTCPAddress()) // effectively offline
+	nd.PeerHost, err = mocknet.New(ctx).AddPeer(ident.PrivateKey(), ident.Address()) // effectively offline
 	if err != nil {
 		return nil, err
 	}
@@ -55,8 +50,7 @@ func NewMockNode() (*IpfsNode, error) {
 	nd.Datastore = ds2.CloserWrap(syncds.MutexWrap(dstore))
 
 	// Routing
-	dht := dht.NewDHT(ctx, nd.PeerHost, nd.Datastore)
-	nd.Routing = dht
+	nd.Routing = mockrouting.NewServer().Client(ident)
 
 	// Bitswap
 	bstore := blockstore.NewBlockstore(nd.Datastore)
@@ -68,7 +62,7 @@ func NewMockNode() (*IpfsNode, error) {
 	nd.DAG = mdag.NewDAGService(bserv)
 
 	// Namespace resolver
-	nd.Namesys = nsys.NewNameSystem(dht)
+	nd.Namesys = nsys.NewNameSystem(nd.Routing)
 
 	// Path resolver
 	nd.Resolver = &path.Resolver{DAG: nd.DAG}