Merge pull request ipfs#18 from libp2p/feat/update-deps

Feat/update deps
ariescodescream · Oct 5, 2016 · 6741301 · 6741301
2 parents e64bc45 + f17ab65
commit 6741301
Show file tree

Hide file tree

Showing 16 changed files with 74 additions and 62 deletions.
diff --git a/.gx/lastpubver b/.gx/lastpubver
@@ -1 +1 @@
-2.0.3: QmeuUpURExXBcvBSQvN15vAUmA797ETFSTXqDY2F1wuPQV
+2.1.0: QmRDMP3Y9E6hZtJwcFii8F6RTUSDn67Hi2o5VFTBXNRioo
diff --git a/dht.go b/dht.go
@@ -17,17 +17,17 @@ import (
 	proto "github.com/gogo/protobuf/proto"
 	cid "github.com/ipfs/go-cid"
 	ds "github.com/ipfs/go-datastore"
-	ci "github.com/ipfs/go-libp2p-crypto"
-	peer "github.com/ipfs/go-libp2p-peer"
-	pstore "github.com/ipfs/go-libp2p-peerstore"
 	logging "github.com/ipfs/go-log"
 	goprocess "github.com/jbenet/goprocess"
 	goprocessctx "github.com/jbenet/goprocess/context"
+	ci "github.com/libp2p/go-libp2p-crypto"
+	host "github.com/libp2p/go-libp2p-host"
 	kb "github.com/libp2p/go-libp2p-kbucket"
+	peer "github.com/libp2p/go-libp2p-peer"
+	pstore "github.com/libp2p/go-libp2p-peerstore"
+	protocol "github.com/libp2p/go-libp2p-protocol"
 	record "github.com/libp2p/go-libp2p-record"
 	recpb "github.com/libp2p/go-libp2p-record/pb"
-	host "github.com/libp2p/go-libp2p/p2p/host"
-	protocol "github.com/libp2p/go-libp2p/p2p/protocol"
 	base32 "github.com/whyrusleeping/base32"
 )
 

diff --git a/dht_bootstrap.go b/dht_bootstrap.go
@@ -10,9 +10,9 @@ import (
 	"time"
 
 	u "github.com/ipfs/go-ipfs-util"
-	peer "github.com/ipfs/go-libp2p-peer"
 	goprocess "github.com/jbenet/goprocess"
 	periodicproc "github.com/jbenet/goprocess/periodic"
+	peer "github.com/libp2p/go-libp2p-peer"
 	routing "github.com/libp2p/go-libp2p-routing"
 )
 

diff --git a/dht_net.go b/dht_net.go
@@ -7,10 +7,10 @@ import (
 	"time"
 
 	ggio "github.com/gogo/protobuf/io"
-	peer "github.com/ipfs/go-libp2p-peer"
 	ctxio "github.com/jbenet/go-context/io"
 	pb "github.com/libp2p/go-libp2p-kad-dht/pb"
-	inet "github.com/libp2p/go-libp2p/p2p/net"
+	inet "github.com/libp2p/go-libp2p-net"
+	peer "github.com/libp2p/go-libp2p-peer"
 )
 
 var dhtReadMessageTimeout = time.Minute

diff --git a/dht_test.go b/dht_test.go
@@ -15,13 +15,13 @@ import (
 	ds "github.com/ipfs/go-datastore"
 	dssync "github.com/ipfs/go-datastore/sync"
 	u "github.com/ipfs/go-ipfs-util"
-	peer "github.com/ipfs/go-libp2p-peer"
-	pstore "github.com/ipfs/go-libp2p-peerstore"
-	ma "github.com/jbenet/go-multiaddr"
+	peer "github.com/libp2p/go-libp2p-peer"
+	pstore "github.com/libp2p/go-libp2p-peerstore"
 	record "github.com/libp2p/go-libp2p-record"
 	netutil "github.com/libp2p/go-libp2p/p2p/test/util"
 	ci "github.com/libp2p/go-testutil/ci"
 	travisci "github.com/libp2p/go-testutil/ci/travis"
+	ma "github.com/multiformats/go-multiaddr"
 )
 
 var testCaseValues = map[string][]byte{}

diff --git a/ext_test.go b/ext_test.go
@@ -11,11 +11,11 @@ import (
 	ds "github.com/ipfs/go-datastore"
 	dssync "github.com/ipfs/go-datastore/sync"
 	u "github.com/ipfs/go-ipfs-util"
-	pstore "github.com/ipfs/go-libp2p-peerstore"
 	pb "github.com/libp2p/go-libp2p-kad-dht/pb"
+	inet "github.com/libp2p/go-libp2p-net"
+	pstore "github.com/libp2p/go-libp2p-peerstore"
 	record "github.com/libp2p/go-libp2p-record"
 	routing "github.com/libp2p/go-libp2p-routing"
-	inet "github.com/libp2p/go-libp2p/p2p/net"
 	mocknet "github.com/libp2p/go-libp2p/p2p/net/mock"
 )
 

diff --git a/handlers.go b/handlers.go
@@ -10,10 +10,10 @@ import (
 	cid "github.com/ipfs/go-cid"
 	ds "github.com/ipfs/go-datastore"
 	u "github.com/ipfs/go-ipfs-util"
-	lgbl "github.com/ipfs/go-libp2p-loggables"
-	peer "github.com/ipfs/go-libp2p-peer"
-	pstore "github.com/ipfs/go-libp2p-peerstore"
 	pb "github.com/libp2p/go-libp2p-kad-dht/pb"
+	lgbl "github.com/libp2p/go-libp2p-loggables"
+	peer "github.com/libp2p/go-libp2p-peer"
+	pstore "github.com/libp2p/go-libp2p-peerstore"
 	recpb "github.com/libp2p/go-libp2p-record/pb"
 	base32 "github.com/whyrusleeping/base32"
 )

diff --git a/lookup.go b/lookup.go
@@ -3,11 +3,11 @@ package dht
 import (
 	"context"
 
-	peer "github.com/ipfs/go-libp2p-peer"
-	pset "github.com/ipfs/go-libp2p-peer/peerset"
-	pstore "github.com/ipfs/go-libp2p-peerstore"
 	logging "github.com/ipfs/go-log"
 	kb "github.com/libp2p/go-libp2p-kbucket"
+	peer "github.com/libp2p/go-libp2p-peer"
+	pset "github.com/libp2p/go-libp2p-peer/peerset"
+	pstore "github.com/libp2p/go-libp2p-peerstore"
 	notif "github.com/libp2p/go-libp2p-routing/notifications"
 )
 

diff --git a/notif.go b/notif.go
@@ -1,8 +1,8 @@
 package dht
 
 import (
-	ma "github.com/jbenet/go-multiaddr"
-	inet "github.com/libp2p/go-libp2p/p2p/net"
+	inet "github.com/libp2p/go-libp2p-net"
+	ma "github.com/multiformats/go-multiaddr"
 	mstream "github.com/whyrusleeping/go-multistream"
 )
 

diff --git a/package.json b/package.json
@@ -14,15 +14,15 @@
     },
     {
       "author": "whyrusleeping",
-      "hash": "QmVoi5es8D5fNHZDqoW6DgDAEPEV5hQp8GBz161vZXiwpQ",
+      "hash": "QmfWDLQjGjVe4fr5CoztYW2DYYjRysMJrFe1RCsXLPTf46",
       "name": "go-libp2p-crypto",
-      "version": "1.0.4"
+      "version": "1.3.1"
     },
     {
       "author": "whyrusleeping",
-      "hash": "QmWXjJo15p4pzT7cayEwZi2sWgJqLnGDof6ZGMh9xBgU1p",
+      "hash": "QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC",
       "name": "go-libp2p-peer",
-      "version": "2.0.4"
+      "version": "2.1.0"
     },
     {
       "hash": "QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP",
@@ -42,9 +42,9 @@
     },
     {
       "author": "jbenet",
-      "hash": "QmX6DhWrpBB5NtadXmPSXYNdVvuLfJXoFNMvUMoVvP5UJa",
+      "hash": "QmTKsRYeY4simJyf37K93juSq75Lo8MVCDJ7owjmf46u8W",
       "name": "go-context",
-      "version": "0.0.0"
+      "version": "1.0.0"
     },
     {
       "author": "jbenet",
@@ -60,9 +60,9 @@
     },
     {
       "author": "whyrusleeping",
-      "hash": "QmYkwVGkwoPbMVQEbf6LonZg4SsCxGP3H7PBEtdNCNRyxD",
+      "hash": "QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo",
       "name": "go-libp2p-peerstore",
-      "version": "1.2.5"
+      "version": "1.3.0"
     },
     {
       "author": "whyrusleeping",
@@ -84,27 +84,27 @@
     },
     {
       "author": "whyrusleeping",
-      "hash": "QmYpVUnnedgGrp6cX2pBii5HRQgcSr778FiKVe7o7nF5Z3",
+      "hash": "QmaEcA713Y54EtSsj7ZYfwXmsTfxrJ4oywr1iFt1d6LKY5",
       "name": "go-testutil",
-      "version": "1.0.2"
+      "version": "1.1.0"
     },
     {
       "author": "whyrusleeping",
-      "hash": "QmV4WegGoE6DcQdS3fPJjfMykWD9RqhheQ2gKdzkMJnvr9",
+      "hash": "QmdM4ohF7cr4MvAECVeD3hRA3HtZrk1ngaek4n8ojVT87h",
       "name": "go-libp2p-record",
-      "version": "2.0.0"
+      "version": "2.1.0"
     },
     {
       "author": "whyrusleeping",
-      "hash": "QmepYi89BQ3qAhDXejox51WUm7toGBGd9xVVB7fhpsiXuv",
+      "hash": "QmUKePKcUEXwdvJENZJ6z8mJjPaxLsDZ3V9CZjPPtyawPm",
       "name": "go-libp2p-kbucket",
-      "version": "2.0.0"
+      "version": "2.1.0"
     },
     {
       "author": "whyrusleeping",
-      "hash": "QmPtBUT1rFE9AR8qbyWtPAq54hhPggPCQbTV7vyHx896BX",
+      "hash": "QmXKuGUzLcgoQvp8M6ZEJzupWUNmx8NoqXEbYLMDjL4rjj",
       "name": "go-libp2p-routing",
-      "version": "2.0.1"
+      "version": "2.1.1"
     },
     {
       "author": "whyrusleeping",
@@ -114,22 +114,34 @@
     },
     {
       "author": "whyrusleeping",
-      "hash": "QmeDy4wNGTzmizLRKfm7oVe2k9FanDC4ys4LSFTuwTvb3z",
-      "name": "go-libp2p",
-      "version": "3.6.0"
+      "hash": "QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro",
+      "name": "go-cid",
+      "version": "0.5.2"
     },
     {
       "author": "whyrusleeping",
-      "hash": "QmcW7CcRA5kMdqNBRpif7e8y9yvVRmJG1uurMvea8TY2SM",
-      "name": "go-cid",
-      "version": "0.5.0"
+      "hash": "QmTMy4hVSY28DdwJ9kBz6y7q6MuioFzPcpM3Ma3aPjo1i3",
+      "name": "go-libp2p-loggables",
+      "version": "1.1.1"
+    },
+    {
+      "author": "whyrusleeping",
+      "hash": "QmdML3R42PRSwnt46jSuEts9bHSqLctVYEjJqMR3UYV8ki",
+      "name": "go-libp2p-host",
+      "version": "1.1.0"
+    },
+    {
+      "author": "whyrusleeping",
+      "hash": "QmcRa2qn6iCmap9bjp8jAwkvYAq13AUfxdY3rrYiaJbLum",
+      "name": "go-libp2p",
+      "version": "4.0.1"
     }
   ],
   "gxVersion": "0.4.0",
   "language": "go",
   "license": "MIT",
   "name": "go-libp2p-kad-dht",
   "releaseCmd": "git commit -a -m \"gx publish $VERSION\"",
-  "version": "2.0.3"
+  "version": "2.1.0"
 }
 
diff --git a/pb/message.go b/pb/message.go
@@ -1,12 +1,12 @@
 package dht_pb
 
 import (
-	peer "github.com/ipfs/go-libp2p-peer"
-	pstore "github.com/ipfs/go-libp2p-peerstore"
 	logging "github.com/ipfs/go-log"
 	b58 "github.com/jbenet/go-base58"
-	ma "github.com/jbenet/go-multiaddr"
-	inet "github.com/libp2p/go-libp2p/p2p/net"
+	inet "github.com/libp2p/go-libp2p-net"
+	peer "github.com/libp2p/go-libp2p-peer"
+	pstore "github.com/libp2p/go-libp2p-peerstore"
+	ma "github.com/multiformats/go-multiaddr"
 )
 
 var log = logging.Logger("dht.pb")

diff --git a/providers/providers.go b/providers/providers.go
@@ -11,10 +11,10 @@ import (
 	cid "github.com/ipfs/go-cid"
 	ds "github.com/ipfs/go-datastore"
 	dsq "github.com/ipfs/go-datastore/query"
-	peer "github.com/ipfs/go-libp2p-peer"
 	logging "github.com/ipfs/go-log"
 	goprocess "github.com/jbenet/goprocess"
 	goprocessctx "github.com/jbenet/goprocess/context"
+	peer "github.com/libp2p/go-libp2p-peer"
 	autobatch "github.com/whyrusleeping/autobatch"
 	base32 "github.com/whyrusleeping/base32"
 )

diff --git a/providers/providers_test.go b/providers/providers_test.go
@@ -1,15 +1,15 @@
 package providers
 
 import (
+	"context"
 	"fmt"
 	"testing"
 	"time"
 
 	cid "github.com/ipfs/go-cid"
 	ds "github.com/ipfs/go-datastore"
 	u "github.com/ipfs/go-ipfs-util"
-	peer "github.com/ipfs/go-libp2p-peer"
-	context "golang.org/x/net/context"
+	peer "github.com/libp2p/go-libp2p-peer"
 )
 
 func TestProviderManager(t *testing.T) {

diff --git a/query.go b/query.go
@@ -5,14 +5,14 @@ import (
 	"sync"
 
 	u "github.com/ipfs/go-ipfs-util"
-	peer "github.com/ipfs/go-libp2p-peer"
-	pset "github.com/ipfs/go-libp2p-peer/peerset"
-	pstore "github.com/ipfs/go-libp2p-peerstore"
-	queue "github.com/ipfs/go-libp2p-peerstore/queue"
 	logging "github.com/ipfs/go-log"
 	todoctr "github.com/ipfs/go-todocounter"
 	process "github.com/jbenet/goprocess"
 	ctxproc "github.com/jbenet/goprocess/context"
+	peer "github.com/libp2p/go-libp2p-peer"
+	pset "github.com/libp2p/go-libp2p-peer/peerset"
+	pstore "github.com/libp2p/go-libp2p-peerstore"
+	queue "github.com/libp2p/go-libp2p-peerstore/queue"
 	routing "github.com/libp2p/go-libp2p-routing"
 	notif "github.com/libp2p/go-libp2p-routing/notifications"
 )

diff --git a/records.go b/records.go
@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"time"
 
-	ci "github.com/ipfs/go-libp2p-crypto"
-	peer "github.com/ipfs/go-libp2p-peer"
 	ctxfrac "github.com/jbenet/go-context/frac"
+	ci "github.com/libp2p/go-libp2p-crypto"
+	peer "github.com/libp2p/go-libp2p-peer"
 	record "github.com/libp2p/go-libp2p-record"
 	recpb "github.com/libp2p/go-libp2p-record/pb"
 	routing "github.com/libp2p/go-libp2p-routing"

diff --git a/routing.go b/routing.go
@@ -9,15 +9,15 @@ import (
 	"time"
 
 	cid "github.com/ipfs/go-cid"
-	peer "github.com/ipfs/go-libp2p-peer"
-	pset "github.com/ipfs/go-libp2p-peer/peerset"
-	pstore "github.com/ipfs/go-libp2p-peerstore"
 	pb "github.com/libp2p/go-libp2p-kad-dht/pb"
 	kb "github.com/libp2p/go-libp2p-kbucket"
+	inet "github.com/libp2p/go-libp2p-net"
+	peer "github.com/libp2p/go-libp2p-peer"
+	pset "github.com/libp2p/go-libp2p-peer/peerset"
+	pstore "github.com/libp2p/go-libp2p-peerstore"
 	record "github.com/libp2p/go-libp2p-record"
 	routing "github.com/libp2p/go-libp2p-routing"
 	notif "github.com/libp2p/go-libp2p-routing/notifications"
-	inet "github.com/libp2p/go-libp2p/p2p/net"
 )
 
 // asyncQueryBuffer is the size of buffered channels in async queries. This