From 237e594a8f3c48580fa5f194f3afe02694f60d28 Mon Sep 17 00:00:00 2001 From: Brian Tiger Chow Date: Wed, 24 Dec 2014 09:26:53 -0500 Subject: [PATCH] don't link when creating network client. rely on caller --- epictest/addcat_test.go | 3 ++- exchange/bitswap/testnet/peernet.go | 4 ---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/epictest/addcat_test.go b/epictest/addcat_test.go index 51bdc706f..e34b37295 100644 --- a/epictest/addcat_test.go +++ b/epictest/addcat_test.go @@ -95,7 +95,8 @@ func AddCatBytes(data []byte, conf Config) error { // defer mn.Close() FIXME does mocknet require clean-up mn.SetLinkDefaults(mocknet.LinkOptions{ Latency: conf.NetworkLatency, - Bandwidth: math.MaxInt32, // TODO add to conf + // TODO add to conf. This is tricky because we want 0 values to be functional. + Bandwidth: math.MaxInt32, }) dhtNetwork := mockrouting.NewDHTNetwork(mn) net, err := tn.StreamNet(ctx, mn, dhtNetwork) diff --git a/exchange/bitswap/testnet/peernet.go b/exchange/bitswap/testnet/peernet.go index ef4f3d503..4db254560 100644 --- a/exchange/bitswap/testnet/peernet.go +++ b/exchange/bitswap/testnet/peernet.go @@ -20,14 +20,10 @@ func StreamNet(ctx context.Context, net mockpeernet.Mocknet, rs mockrouting.Serv } func (pn *peernet) Adapter(p testutil.Peer) bsnet.BitSwapNetwork { - peers := pn.Mocknet.Peers() client, err := pn.Mocknet.AddPeer(p.PrivateKey(), p.Address()) if err != nil { panic(err.Error()) } - for _, other := range peers { - pn.Mocknet.LinkPeers(p.ID(), other) - } routing := pn.routingserver.ClientWithDatastore(context.TODO(), p, ds.NewMapDatastore()) return bsnet.NewFromIpfsNetwork(client, routing) }