WIP

p2p/peer/peer_test.go

@@ -6,12 +6,12 @@ import (
 	"strings"
 	"testing"
 
+	u "github.com/ipfs/go-ipfs-util"
 	ic "github.com/ipfs/go-libp2p/p2p/crypto"
 	. "github.com/ipfs/go-libp2p/p2p/peer"
 	tu "github.com/ipfs/go-libp2p/testutil"
-	u "gx/QmQA79FfVsUnGkH3TgKDqcDkupfjqLSJ6EYwDuDDZK8nhD/go-ipfs-util"
 
-	b58 "gx/QmNsoHoCVhgXcv1Yg45jtkMgimxorTAN36fV9AQMFXHHAQ/go-base58"
+	b58 "github.com/jbenet/go-base58"
 )
 
 var gen1 keyset // generated

p2p/peer/peerstore.go

@@ -9,7 +9,7 @@ import (
 
 	//ds "github.com/jbenet/go-datastore"
 	//dssync "github.com/jbenet/go-datastore/sync"
-	ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr"
+	ma "github.com/jbenet/go-multiaddr"
 )
 
 const (

p2p/peer/queue/distance.go

@@ -6,7 +6,7 @@ import (
 	"sync"
 
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
-	ks "gx/QmThbzo9oBE7FAVmgjp3xYv5Yra81uB7KXbrTei47gWT6o/go-keyspace"
+	ks "github.com/whyrusleeping/go-keyspace"
 )
 
 // peerMetric tracks a peer and its distance to something else.

p2p/peer/queue/queue_test.go

@@ -6,10 +6,10 @@ import (
 	"testing"
 	"time"
 
+	u "github.com/ipfs/go-ipfs-util"
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
-	u "gx/QmQA79FfVsUnGkH3TgKDqcDkupfjqLSJ6EYwDuDDZK8nhD/go-ipfs-util"
 
-	context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
+	context "golang.org/x/net/context"
 )
 
 func TestQueue(t *testing.T) {

p2p/peer/queue/sync.go

@@ -2,8 +2,8 @@ package queue
 
 import (
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
-	context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
-	logging "gx/QmfZZB1aVXWA4kaR5R4e9NifERT366TTCSagkfhmAbYLsu/go-log"
+	logging "github.com/ipfs/go-log"
+	context "golang.org/x/net/context"
 )
 
 var log = logging.Logger("peerqueue")

p2p/protocol/identify/id.go

@@ -4,11 +4,11 @@ import (
 	"strings"
 	"sync"
 
-	ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr"
-	context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
-	ggio "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/io"
-	semver "gx/QmcrrEpx3VMUbrbgVroH3YiYyUS5c4YAykzyPJWKspUYLa/go-semver/semver"
-	msmux "gx/QmdrbcnPVM2FnZQQM7p2GU91XhpuyYyd1tzPouEyh1phyD/go-multistream"
+	semver "github.com/coreos/go-semver/semver"
+	ggio "github.com/gogo/protobuf/io"
+	ma "github.com/jbenet/go-multiaddr"
+	msmux "github.com/whyrusleeping/go-multistream"
+	context "golang.org/x/net/context"
 
 	host "github.com/ipfs/go-libp2p/p2p/host"
 	mstream "github.com/ipfs/go-libp2p/p2p/metrics/stream"
@@ -17,7 +17,7 @@ import (
 	pb "github.com/ipfs/go-libp2p/p2p/protocol/identify/pb"
 
 	lgbl "github.com/ipfs/go-libp2p/loggables"
-	logging "gx/QmfZZB1aVXWA4kaR5R4e9NifERT366TTCSagkfhmAbYLsu/go-log"
+	logging "github.com/ipfs/go-log"
 )
 
 var log = logging.Logger("net/identify")

p2p/protocol/identify/id_test.go

@@ -9,8 +9,8 @@ import (
 	identify "github.com/ipfs/go-libp2p/p2p/protocol/identify"
 	testutil "github.com/ipfs/go-libp2p/p2p/test/util"
 
-	ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr"
-	context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
+	ma "github.com/jbenet/go-multiaddr"
+	context "golang.org/x/net/context"
 )
 
 func subtestIDService(t *testing.T, postDialWait time.Duration) {

p2p/protocol/identify/obsaddr.go

@@ -6,7 +6,7 @@ import (
 
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
 
-	ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr"
+	ma "github.com/jbenet/go-multiaddr"
 )
 
 // ObservedAddr is an entry for an address reported by our peers.

p2p/protocol/identify/obsaddr_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr"
+	ma "github.com/jbenet/go-multiaddr"
 )
 
 // TestObsAddrSet

p2p/protocol/identify/pb/identify.pb.go

@@ -13,7 +13,7 @@ It has these top-level messages:
 */
 package identify_pb
 
-import proto "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/proto"
+import proto "github.com/gogo/protobuf/proto"
 import math "math"
 
 // Reference imports to suppress errors if they are not otherwise used.

p2p/protocol/ping/ping.go

@@ -6,13 +6,13 @@ import (
 	"io"
 	"time"
 
-	u "gx/QmQA79FfVsUnGkH3TgKDqcDkupfjqLSJ6EYwDuDDZK8nhD/go-ipfs-util"
-	context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
+	u "github.com/ipfs/go-ipfs-util"
+	context "golang.org/x/net/context"
 
 	host "github.com/ipfs/go-libp2p/p2p/host"
 	inet "github.com/ipfs/go-libp2p/p2p/net"
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
-	logging "gx/QmfZZB1aVXWA4kaR5R4e9NifERT366TTCSagkfhmAbYLsu/go-log"
+	logging "github.com/ipfs/go-log"
 )
 
 var log = logging.Logger("ping")

p2p/protocol/ping/ping_test.go

@@ -4,9 +4,9 @@ import (
 	"testing"
 	"time"
 
-	context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
 	netutil "github.com/ipfs/go-libp2p/p2p/test/util"
+	context "golang.org/x/net/context"
 )
 
 func TestPing(t *testing.T) {

p2p/protocol/relay/relay.go

@@ -5,14 +5,14 @@ import (
 	"io"
 	"time"
 
-	mh "gx/Qma7dqy7ZVH4tkNJdC9TRrA82Uz5fQfbbwuvmNVVc17r7a/go-multihash"
+	mh "github.com/jbenet/go-multihash"
 
 	host "github.com/ipfs/go-libp2p/p2p/host"
 	inet "github.com/ipfs/go-libp2p/p2p/net"
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
 	protocol "github.com/ipfs/go-libp2p/p2p/protocol"
-	context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
-	logging "gx/QmfZZB1aVXWA4kaR5R4e9NifERT366TTCSagkfhmAbYLsu/go-log"
+	logging "github.com/ipfs/go-log"
+	context "golang.org/x/net/context"
 )
 
 var log = logging.Logger("github.com/ipfs/go-libp2p/p2p/protocol/relay")

p2p/protocol/relay/relay_test.go

@@ -8,10 +8,10 @@ import (
 	protocol "github.com/ipfs/go-libp2p/p2p/protocol"
 	relay "github.com/ipfs/go-libp2p/p2p/protocol/relay"
 	testutil "github.com/ipfs/go-libp2p/p2p/test/util"
-	logging "gx/QmfZZB1aVXWA4kaR5R4e9NifERT366TTCSagkfhmAbYLsu/go-log"
+	logging "github.com/ipfs/go-log"
 
-	context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
-	msmux "gx/QmdrbcnPVM2FnZQQM7p2GU91XhpuyYyd1tzPouEyh1phyD/go-multistream"
+	msmux "github.com/whyrusleeping/go-multistream"
+	context "golang.org/x/net/context"
 )
 
 var log = logging.Logger("relay_test")

p2p/test/backpressure/backpressure_test.go

@@ -11,10 +11,10 @@ import (
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
 	protocol "github.com/ipfs/go-libp2p/p2p/protocol"
 	testutil "github.com/ipfs/go-libp2p/p2p/test/util"
-	logging "gx/QmfZZB1aVXWA4kaR5R4e9NifERT366TTCSagkfhmAbYLsu/go-log"
+	logging "github.com/ipfs/go-log"
 
-	u "gx/QmQA79FfVsUnGkH3TgKDqcDkupfjqLSJ6EYwDuDDZK8nhD/go-ipfs-util"
-	context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
+	u "github.com/ipfs/go-ipfs-util"
+	context "golang.org/x/net/context"
 )
 
 var log = logging.Logger("backpressure")

p2p/test/reconnects/reconnect_test.go

@@ -7,16 +7,16 @@ import (
 	"testing"
 	"time"
 
+	u "github.com/ipfs/go-ipfs-util"
 	host "github.com/ipfs/go-libp2p/p2p/host"
 	inet "github.com/ipfs/go-libp2p/p2p/net"
 	swarm "github.com/ipfs/go-libp2p/p2p/net/swarm"
 	protocol "github.com/ipfs/go-libp2p/p2p/protocol"
 	testutil "github.com/ipfs/go-libp2p/p2p/test/util"
-	u "gx/QmQA79FfVsUnGkH3TgKDqcDkupfjqLSJ6EYwDuDDZK8nhD/go-ipfs-util"
-	logging "gx/QmfZZB1aVXWA4kaR5R4e9NifERT366TTCSagkfhmAbYLsu/go-log"
+	logging "github.com/ipfs/go-log"
 
-	ps "gx/QmQMkNFMuh1UJbdaggASZpLtCroTnAYcWNenYL5hrzLJrT/go-peerstream"
-	context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
+	ps "github.com/jbenet/go-peerstream"
+	context "golang.org/x/net/context"
 )
 
 func init() {

p2p/test/util/key.go

@@ -5,14 +5,14 @@ import (
 	"io"
 	"testing"
 
+	u "github.com/ipfs/go-ipfs-util"
 	testutil "github.com/ipfs/go-libp2p/testutil"
-	u "gx/QmQA79FfVsUnGkH3TgKDqcDkupfjqLSJ6EYwDuDDZK8nhD/go-ipfs-util"
-	logging "gx/QmfZZB1aVXWA4kaR5R4e9NifERT366TTCSagkfhmAbYLsu/go-log"
+	logging "github.com/ipfs/go-log"
 
 	ic "github.com/ipfs/go-libp2p/p2p/crypto"
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
 
-	ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr"
+	ma "github.com/jbenet/go-multiaddr"
 )
 
 var log = logging.Logger("boguskey")

p2p/test/util/util.go

@@ -10,8 +10,8 @@ import (
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
 	tu "github.com/ipfs/go-libp2p/testutil"
 
-	ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr"
-	context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
+	ma "github.com/jbenet/go-multiaddr"
+	context "golang.org/x/net/context"
 )
 
 func GenSwarmNetwork(t *testing.T, ctx context.Context) *swarm.Network {

package.json

@@ -2,88 +2,6 @@
   "name": "go-libp2p",
   "author": "whyrusleeping",
   "version": "1.0.0",
-  "gxDependencies": [
-    {
-      "name": "go-log",
-      "hash": "QmfZZB1aVXWA4kaR5R4e9NifERT366TTCSagkfhmAbYLsu",
-      "version": "1.0.0"
-    },
-    {
-      "name": "go-keyspace",
-      "hash": "QmThbzo9oBE7FAVmgjp3xYv5Yra81uB7KXbrTei47gWT6o",
-      "version": "1.0.0"
-    },
-    {
-      "name": "go-multiaddr-net",
-      "hash": "QmNT7d1e4Xcp3KcsvxyzUHVtqrR43uypoxLLzdKj6YZga2",
-      "version": "1.0.0"
-    },
-    {
-      "name": "multiaddr-filter",
-      "hash": "QmVCmuhgDFer5MW5737Z8GtBEGpUyEkFnLUv4ASDWnLZdC",
-      "version": "1.0.0"
-    },
-    {
-      "name": "go-notifier",
-      "hash": "QmRV5aE4LZ4Kw9g2VAMpbEcaT7uz3Z3WxgdW8mzRPLL7g8",
-      "version": "1.0.0"
-    },
-    {
-      "name": "go-ipfs-util",
-      "hash": "QmQA79FfVsUnGkH3TgKDqcDkupfjqLSJ6EYwDuDDZK8nhD",
-      "version": "1.0.0"
-    },
-    {
-      "name": "go-peerstream",
-      "hash": "QmQMkNFMuh1UJbdaggASZpLtCroTnAYcWNenYL5hrzLJrT",
-      "version": "1.0.0"
-    },
-    {
-      "name": "go-msgio",
-      "hash": "QmXMkWRYvXJ2NTzHMEz5794997kNPGsVX8EhFiXXpoKDZr",
-      "version": "0.0.0"
-    },
-    {
-      "name": "randbo",
-      "hash": "QmciEePSP8wpGYZp8fsPFi49Ya7xQMUFwFj2z5fDpfZnhC",
-      "version": "1.0.0"
-    },
-    {
-      "name": "mdns",
-      "hash": "QmdkSkALqzKfXnuMTsbBVS26U4XGS9kCffRpSTWvVbkRSi",
-      "version": "0.0.0"
-    },
-    {
-      "name": "go-reuseport",
-      "hash": "QmfDF93E1PjQUqFM4rKyFs85feJdMR9AaVm1axVZ4qdFU1",
-      "version": "0.0.0"
-    },
-    {
-      "name": "go-semver",
-      "hash": "QmcrrEpx3VMUbrbgVroH3YiYyUS5c4YAykzyPJWKspUYLa",
-      "version": "0.0.0"
-    },
-    {
-      "name": "go-nat",
-      "hash": "QmWjjKcvWKtkwzbqF6t3Kz3wXA3Uj8DRAbPaTtcgFnvTQt",
-      "version": "0.0.0"
-    },
-    {
-      "name": "go-metrics",
-      "hash": "QmeYJHEk8UjVVZ4XCRTZe6dFQrb8pGWD81LYCgeLp8CvMB",
-      "version": "0.0.0"
-    },
-    {
-      "name": "go-detect-race",
-      "hash": "QmQHGMVmrsgmqUG8ih3puNXUJneSpi13dkcZpzLKkskUkH",
-      "version": "0.0.0"
-    },
-    {
-      "name": "gogo-protobuf",
-      "hash": "QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR",
-      "version": "0.0.0"
-    }
-  ],
   "language": "go",
   "issues_url": "",
   "gx": {

testutil/gen.go

@@ -8,11 +8,11 @@ import (
 	"sync"
 	"testing"
 
+	u "github.com/ipfs/go-ipfs-util"
 	ci "github.com/ipfs/go-libp2p/p2p/crypto"
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
-	u "gx/QmQA79FfVsUnGkH3TgKDqcDkupfjqLSJ6EYwDuDDZK8nhD/go-ipfs-util"
 
-	ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr"
+	ma "github.com/jbenet/go-multiaddr"
 )
 
 // ZeroLocalTCPAddress is the "zero" tcp local multiaddr. This means: