Unverified Commit 1b921d21 authored by Steven Allen's avatar Steven Allen Committed by GitHub

Merge pull request #134 from ipfs/dep/remove-testutil-dep

dep: remove dep on libp2p/go-testutil
parents 82704bb0 da10fb8e
......@@ -22,8 +22,8 @@ import (
delay "github.com/ipfs/go-ipfs-delay"
mockrouting "github.com/ipfs/go-ipfs-routing/mock"
p2ptestutil "github.com/libp2p/go-libp2p-netutil"
tu "github.com/libp2p/go-testutil"
travis "github.com/libp2p/go-testutil/ci/travis"
travis "github.com/libp2p/go-libp2p-testing/ci/travis"
tu "github.com/libp2p/go-libp2p-testing/etc"
)
// FIXME the tests are really sensitive to the network delay. fix them to work
......
......@@ -11,7 +11,7 @@ import (
blocks "github.com/ipfs/go-block-format"
cid "github.com/ipfs/go-cid"
blocksutil "github.com/ipfs/go-ipfs-blocksutil"
tu "github.com/libp2p/go-testutil"
tu "github.com/libp2p/go-libp2p-testing/etc"
)
func TestBasicSessions(t *testing.T) {
......
......@@ -16,7 +16,7 @@ import (
dssync "github.com/ipfs/go-datastore/sync"
blockstore "github.com/ipfs/go-ipfs-blockstore"
peer "github.com/libp2p/go-libp2p-core/peer"
testutil "github.com/libp2p/go-testutil"
testutil "github.com/libp2p/go-libp2p-core/test"
)
type fakePeerTagger struct {
......
......@@ -14,7 +14,7 @@ import (
delay "github.com/ipfs/go-ipfs-delay"
peer "github.com/libp2p/go-libp2p-core/peer"
p2ptestutil "github.com/libp2p/go-libp2p-netutil"
testutil "github.com/libp2p/go-testutil"
tnet "github.com/libp2p/go-libp2p-testing/net"
)
// NewTestInstanceGenerator generates a new InstanceGenerator for the given
......@@ -96,7 +96,7 @@ func (i *Instance) SetBlockstoreLatency(t time.Duration) time.Duration {
// NB: It's easy make mistakes by providing the same peer ID to two different
// instances. To safeguard, use the InstanceGenerator to generate instances. It's
// just a much better idea.
func NewInstance(ctx context.Context, net tn.Network, p testutil.Identity, options ...bitswap.Option) Instance {
func NewInstance(ctx context.Context, net tn.Network, p tnet.Identity, options ...bitswap.Option) Instance {
bsdelay := delay.Fixed(0)
adapter := net.Adapter(p)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment