Reorged imports from jbenet/go-ipfs to ipfs/go-ipfs

- Modified Godeps/Godeps.json by hand
- [TEST] Updated welcome docs hash to sharness
- [TEST] Updated contact doc
- [TEST] disabled breaking test (t0080-repo refs local)

bitswap.go

@@ -7,22 +7,22 @@ import (
 	"sync"
 	"time"
 
-	process "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess"
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
-	blocks "github.com/jbenet/go-ipfs/blocks"
-	blockstore "github.com/jbenet/go-ipfs/blocks/blockstore"
-	exchange "github.com/jbenet/go-ipfs/exchange"
-	decision "github.com/jbenet/go-ipfs/exchange/bitswap/decision"
-	bsmsg "github.com/jbenet/go-ipfs/exchange/bitswap/message"
-	bsnet "github.com/jbenet/go-ipfs/exchange/bitswap/network"
-	notifications "github.com/jbenet/go-ipfs/exchange/bitswap/notifications"
-	wantlist "github.com/jbenet/go-ipfs/exchange/bitswap/wantlist"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
-	"github.com/jbenet/go-ipfs/thirdparty/delay"
-	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
-	u "github.com/jbenet/go-ipfs/util"
-	errors "github.com/jbenet/go-ipfs/util/debugerror"
-	pset "github.com/jbenet/go-ipfs/util/peerset" // TODO move this to peerstore
+	process "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	blocks "github.com/ipfs/go-ipfs/blocks"
+	blockstore "github.com/ipfs/go-ipfs/blocks/blockstore"
+	exchange "github.com/ipfs/go-ipfs/exchange"
+	decision "github.com/ipfs/go-ipfs/exchange/bitswap/decision"
+	bsmsg "github.com/ipfs/go-ipfs/exchange/bitswap/message"
+	bsnet "github.com/ipfs/go-ipfs/exchange/bitswap/network"
+	notifications "github.com/ipfs/go-ipfs/exchange/bitswap/notifications"
+	wantlist "github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	"github.com/ipfs/go-ipfs/thirdparty/delay"
+	eventlog "github.com/ipfs/go-ipfs/thirdparty/eventlog"
+	u "github.com/ipfs/go-ipfs/util"
+	errors "github.com/ipfs/go-ipfs/util/debugerror"
+	pset "github.com/ipfs/go-ipfs/util/peerset" // TODO move this to peerstore
 )
 
 var log = eventlog.Logger("bitswap")

bitswap_test.go

@@ -6,16 +6,16 @@ import (
 	"testing"
 	"time"
 
-	detectrace "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-detect-race"
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
-
-	blocks "github.com/jbenet/go-ipfs/blocks"
-	blocksutil "github.com/jbenet/go-ipfs/blocks/blocksutil"
-	tn "github.com/jbenet/go-ipfs/exchange/bitswap/testnet"
-	p2ptestutil "github.com/jbenet/go-ipfs/p2p/test/util"
-	mockrouting "github.com/jbenet/go-ipfs/routing/mock"
-	delay "github.com/jbenet/go-ipfs/thirdparty/delay"
-	u "github.com/jbenet/go-ipfs/util"
+	detectrace "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-detect-race"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+
+	blocks "github.com/ipfs/go-ipfs/blocks"
+	blocksutil "github.com/ipfs/go-ipfs/blocks/blocksutil"
+	tn "github.com/ipfs/go-ipfs/exchange/bitswap/testnet"
+	p2ptestutil "github.com/ipfs/go-ipfs/p2p/test/util"
+	mockrouting "github.com/ipfs/go-ipfs/routing/mock"
+	delay "github.com/ipfs/go-ipfs/thirdparty/delay"
+	u "github.com/ipfs/go-ipfs/util"
 )
 
 // FIXME the tests are really sensitive to the network delay. fix them to work

decision/bench_test.go

@@ -4,10 +4,10 @@ import (
 	"math"
 	"testing"
 
-	"github.com/jbenet/go-ipfs/exchange/bitswap/wantlist"
-	"github.com/jbenet/go-ipfs/p2p/peer"
-	"github.com/jbenet/go-ipfs/util"
-	"github.com/jbenet/go-ipfs/util/testutil"
+	"github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
+	"github.com/ipfs/go-ipfs/p2p/peer"
+	"github.com/ipfs/go-ipfs/util"
+	"github.com/ipfs/go-ipfs/util/testutil"
 )
 
 // FWIW: At the time of this commit, including a timestamp in task increases

decision/engine.go

@@ -4,12 +4,12 @@ package decision
 import (
 	"sync"
 
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
-	bstore "github.com/jbenet/go-ipfs/blocks/blockstore"
-	bsmsg "github.com/jbenet/go-ipfs/exchange/bitswap/message"
-	wl "github.com/jbenet/go-ipfs/exchange/bitswap/wantlist"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
-	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	bstore "github.com/ipfs/go-ipfs/blocks/blockstore"
+	bsmsg "github.com/ipfs/go-ipfs/exchange/bitswap/message"
+	wl "github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	eventlog "github.com/ipfs/go-ipfs/thirdparty/eventlog"
 )
 
 // TODO consider taking responsibility for other types of requests. For

decision/engine_test.go

@@ -8,14 +8,14 @@ import (
 	"sync"
 	"testing"
 
-	ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
-	dssync "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync"
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
-	blocks "github.com/jbenet/go-ipfs/blocks"
-	blockstore "github.com/jbenet/go-ipfs/blocks/blockstore"
-	message "github.com/jbenet/go-ipfs/exchange/bitswap/message"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
-	testutil "github.com/jbenet/go-ipfs/util/testutil"
+	ds "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
+	dssync "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	blocks "github.com/ipfs/go-ipfs/blocks"
+	blockstore "github.com/ipfs/go-ipfs/blocks/blockstore"
+	message "github.com/ipfs/go-ipfs/exchange/bitswap/message"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	testutil "github.com/ipfs/go-ipfs/util/testutil"
 )
 
 type peerAndEngine struct {

decision/ledger.go

@@ -3,9 +3,9 @@ package decision
 import (
 	"time"
 
-	wl "github.com/jbenet/go-ipfs/exchange/bitswap/wantlist"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
-	u "github.com/jbenet/go-ipfs/util"
+	wl "github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	u "github.com/ipfs/go-ipfs/util"
 )
 
 // keySet is just a convenient alias for maps of keys, where we only care

decision/peer_request_queue.go

@@ -4,10 +4,10 @@ import (
 	"sync"
 	"time"
 
-	wantlist "github.com/jbenet/go-ipfs/exchange/bitswap/wantlist"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
-	pq "github.com/jbenet/go-ipfs/thirdparty/pq"
-	u "github.com/jbenet/go-ipfs/util"
+	wantlist "github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	pq "github.com/ipfs/go-ipfs/thirdparty/pq"
+	u "github.com/ipfs/go-ipfs/util"
 )
 
 type peerRequestQueue interface {

decision/peer_request_queue_test.go

@@ -7,9 +7,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/jbenet/go-ipfs/exchange/bitswap/wantlist"
-	"github.com/jbenet/go-ipfs/util"
-	"github.com/jbenet/go-ipfs/util/testutil"
+	"github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
+	"github.com/ipfs/go-ipfs/util"
+	"github.com/ipfs/go-ipfs/util/testutil"
 )
 
 func TestPushPop(t *testing.T) {

message/internal/pb/message.pb.go

@@ -13,7 +13,7 @@ It has these top-level messages:
 */
 package bitswap_message_pb
 
-import proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
+import proto "github.com/ipfs/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
 import math "math"
 
 // Reference imports to suppress errors if they are not otherwise used.

message/message.go

@@ -3,14 +3,14 @@ package message
 import (
 	"io"
 
-	blocks "github.com/jbenet/go-ipfs/blocks"
-	pb "github.com/jbenet/go-ipfs/exchange/bitswap/message/internal/pb"
-	wantlist "github.com/jbenet/go-ipfs/exchange/bitswap/wantlist"
-	inet "github.com/jbenet/go-ipfs/p2p/net"
-	u "github.com/jbenet/go-ipfs/util"
-
-	ggio "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/io"
-	proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
+	blocks "github.com/ipfs/go-ipfs/blocks"
+	pb "github.com/ipfs/go-ipfs/exchange/bitswap/message/internal/pb"
+	wantlist "github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
+	inet "github.com/ipfs/go-ipfs/p2p/net"
+	u "github.com/ipfs/go-ipfs/util"
+
+	ggio "github.com/ipfs/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/io"
+	proto "github.com/ipfs/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
 )
 
 // TODO move message.go into the bitswap package

message/message_test.go

@@ -4,11 +4,11 @@ import (
 	"bytes"
 	"testing"
 
-	proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
+	proto "github.com/ipfs/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
 
-	blocks "github.com/jbenet/go-ipfs/blocks"
-	pb "github.com/jbenet/go-ipfs/exchange/bitswap/message/internal/pb"
-	u "github.com/jbenet/go-ipfs/util"
+	blocks "github.com/ipfs/go-ipfs/blocks"
+	pb "github.com/ipfs/go-ipfs/exchange/bitswap/message/internal/pb"
+	u "github.com/ipfs/go-ipfs/util"
 )
 
 func TestAppendWanted(t *testing.T) {

network/interface.go

 package network
 
 import (
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
-	bsmsg "github.com/jbenet/go-ipfs/exchange/bitswap/message"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
-	protocol "github.com/jbenet/go-ipfs/p2p/protocol"
-	u "github.com/jbenet/go-ipfs/util"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	bsmsg "github.com/ipfs/go-ipfs/exchange/bitswap/message"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	protocol "github.com/ipfs/go-ipfs/p2p/protocol"
+	u "github.com/ipfs/go-ipfs/util"
 )
 
 var ProtocolBitswap protocol.ID = "/ipfs/bitswap"

network/ipfs_impl.go

 package network
 
 import (
-	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
-	bsmsg "github.com/jbenet/go-ipfs/exchange/bitswap/message"
-	host "github.com/jbenet/go-ipfs/p2p/host"
-	inet "github.com/jbenet/go-ipfs/p2p/net"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
-	routing "github.com/jbenet/go-ipfs/routing"
-	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
-	util "github.com/jbenet/go-ipfs/util"
+	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	bsmsg "github.com/ipfs/go-ipfs/exchange/bitswap/message"
+	host "github.com/ipfs/go-ipfs/p2p/host"
+	inet "github.com/ipfs/go-ipfs/p2p/net"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	routing "github.com/ipfs/go-ipfs/routing"
+	eventlog "github.com/ipfs/go-ipfs/thirdparty/eventlog"
+	util "github.com/ipfs/go-ipfs/util"
 )
 
 var log = eventlog.Logger("bitswap_network")

notifications/notifications.go

 package notifications
 
 import (
-	pubsub "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/briantigerchow/pubsub"
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
-	blocks "github.com/jbenet/go-ipfs/blocks"
-	u "github.com/jbenet/go-ipfs/util"
+	pubsub "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/briantigerchow/pubsub"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	blocks "github.com/ipfs/go-ipfs/blocks"
+	u "github.com/ipfs/go-ipfs/util"
 )
 
 const bufferSize = 16

notifications/notifications_test.go

@@ -5,10 +5,10 @@ import (
 	"testing"
 	"time"
 
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
-	blocks "github.com/jbenet/go-ipfs/blocks"
-	blocksutil "github.com/jbenet/go-ipfs/blocks/blocksutil"
-	"github.com/jbenet/go-ipfs/util"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	blocks "github.com/ipfs/go-ipfs/blocks"
+	blocksutil "github.com/ipfs/go-ipfs/blocks/blocksutil"
+	"github.com/ipfs/go-ipfs/util"
 )
 
 func TestDuplicates(t *testing.T) {

stat.go

 package bitswap
 
 import (
-	u "github.com/jbenet/go-ipfs/util"
+	u "github.com/ipfs/go-ipfs/util"
 	"sort"
 )
 

testnet/interface.go

 package bitswap
 
 import (
-	bsnet "github.com/jbenet/go-ipfs/exchange/bitswap/network"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
-	"github.com/jbenet/go-ipfs/util/testutil"
+	bsnet "github.com/ipfs/go-ipfs/exchange/bitswap/network"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	"github.com/ipfs/go-ipfs/util/testutil"
 )
 
 type Network interface {

testnet/network_test.go

@@ -4,14 +4,14 @@ import (
 	"sync"
 	"testing"
 
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
-	blocks "github.com/jbenet/go-ipfs/blocks"
-	bsmsg "github.com/jbenet/go-ipfs/exchange/bitswap/message"
-	bsnet "github.com/jbenet/go-ipfs/exchange/bitswap/network"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
-	mockrouting "github.com/jbenet/go-ipfs/routing/mock"
-	delay "github.com/jbenet/go-ipfs/thirdparty/delay"
-	testutil "github.com/jbenet/go-ipfs/util/testutil"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	blocks "github.com/ipfs/go-ipfs/blocks"
+	bsmsg "github.com/ipfs/go-ipfs/exchange/bitswap/message"
+	bsnet "github.com/ipfs/go-ipfs/exchange/bitswap/network"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	mockrouting "github.com/ipfs/go-ipfs/routing/mock"
+	delay "github.com/ipfs/go-ipfs/thirdparty/delay"
+	testutil "github.com/ipfs/go-ipfs/util/testutil"
 )
 
 func TestSendRequestToCooperativePeer(t *testing.T) {

testnet/peernet.go

 package bitswap
 
 import (
-	ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
-	bsnet "github.com/jbenet/go-ipfs/exchange/bitswap/network"
-	mockpeernet "github.com/jbenet/go-ipfs/p2p/net/mock"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
-	mockrouting "github.com/jbenet/go-ipfs/routing/mock"
-	testutil "github.com/jbenet/go-ipfs/util/testutil"
+	ds "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	bsnet "github.com/ipfs/go-ipfs/exchange/bitswap/network"
+	mockpeernet "github.com/ipfs/go-ipfs/p2p/net/mock"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	mockrouting "github.com/ipfs/go-ipfs/routing/mock"
+	testutil "github.com/ipfs/go-ipfs/util/testutil"
 )
 
 type peernet struct {

testnet/virtual.go

@@ -3,15 +3,15 @@ package bitswap
 import (
 	"errors"
 
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
-	bsmsg "github.com/jbenet/go-ipfs/exchange/bitswap/message"
-	bsnet "github.com/jbenet/go-ipfs/exchange/bitswap/network"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
-	routing "github.com/jbenet/go-ipfs/routing"
-	mockrouting "github.com/jbenet/go-ipfs/routing/mock"
-	delay "github.com/jbenet/go-ipfs/thirdparty/delay"
-	util "github.com/jbenet/go-ipfs/util"
-	testutil "github.com/jbenet/go-ipfs/util/testutil"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	bsmsg "github.com/ipfs/go-ipfs/exchange/bitswap/message"
+	bsnet "github.com/ipfs/go-ipfs/exchange/bitswap/network"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	routing "github.com/ipfs/go-ipfs/routing"
+	mockrouting "github.com/ipfs/go-ipfs/routing/mock"
+	delay "github.com/ipfs/go-ipfs/thirdparty/delay"
+	util "github.com/ipfs/go-ipfs/util"
+	testutil "github.com/ipfs/go-ipfs/util/testutil"
 )
 
 func VirtualNetwork(rs mockrouting.Server, d delay.D) Network {

testutils.go

@@ -3,17 +3,17 @@ package bitswap
 import (
 	"time"
 
-	ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
-	ds_sync "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync"
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
-	blockstore "github.com/jbenet/go-ipfs/blocks/blockstore"
-	exchange "github.com/jbenet/go-ipfs/exchange"
-	tn "github.com/jbenet/go-ipfs/exchange/bitswap/testnet"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
-	p2ptestutil "github.com/jbenet/go-ipfs/p2p/test/util"
-	delay "github.com/jbenet/go-ipfs/thirdparty/delay"
-	datastore2 "github.com/jbenet/go-ipfs/util/datastore2"
-	testutil "github.com/jbenet/go-ipfs/util/testutil"
+	ds "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
+	ds_sync "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	blockstore "github.com/ipfs/go-ipfs/blocks/blockstore"
+	exchange "github.com/ipfs/go-ipfs/exchange"
+	tn "github.com/ipfs/go-ipfs/exchange/bitswap/testnet"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	p2ptestutil "github.com/ipfs/go-ipfs/p2p/test/util"
+	delay "github.com/ipfs/go-ipfs/thirdparty/delay"
+	datastore2 "github.com/ipfs/go-ipfs/util/datastore2"
+	testutil "github.com/ipfs/go-ipfs/util/testutil"
 )
 
 // WARNING: this uses RandTestBogusIdentity DO NOT USE for NON TESTS!

wantlist/wantlist.go

@@ -3,7 +3,7 @@
 package wantlist
 
 import (
-	u "github.com/jbenet/go-ipfs/util"
+	u "github.com/ipfs/go-ipfs/util"
 	"sort"
 	"sync"
 )

workers.go

@@ -3,10 +3,10 @@ package bitswap
 import (
 	"time"
 
-	inflect "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/chuckpreslar/inflect"
-	process "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess"
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
-	u "github.com/jbenet/go-ipfs/util"
+	inflect "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/chuckpreslar/inflect"
+	process "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	u "github.com/ipfs/go-ipfs/util"
 )
 
 func (bs *Bitswap) startWorkers(px process.Process, ctx context.Context) {