Merge pull request #5857 from ipfs/gx/update-bugfixes

gx: update pubsub, connmgr, and flatfs
ipfs · Dec 19, 2018 · 3f6925d · 3f6925d
2 parents 3f50279 + 0c14f86
commit 3f6925d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/core/core.go b/core/core.go
@@ -52,19 +52,19 @@ import (
 	quic "gx/ipfs/QmSvK3DvgynMo45orM88RQowdupvgdxs3fDyahQsKkmcUP/go-libp2p-quic-transport"
 	bitswap "gx/ipfs/QmUYXFM46WgGs5AScfL4FSZXa9p5nAhddueyM5auAVZGCQ/go-bitswap"
 	bsnet "gx/ipfs/QmUYXFM46WgGs5AScfL4FSZXa9p5nAhddueyM5auAVZGCQ/go-bitswap/network"
+	connmgr "gx/ipfs/QmWJBngogUPF87Xz788NotnwfYS1B5oanKew82zuMwUkQu/go-libp2p-connmgr"
 	dht "gx/ipfs/QmXbPygnUKAPMwseE5U3hQA7Thn59GVm7pQrhkFV63umT8/go-libp2p-kad-dht"
 	dhtopts "gx/ipfs/QmXbPygnUKAPMwseE5U3hQA7Thn59GVm7pQrhkFV63umT8/go-libp2p-kad-dht/opts"
+	psrouter "gx/ipfs/QmXvWpPZMuWbwoDV393Y1ADVwuJsrVAvct4gKdLAkjvbhH/go-libp2p-pubsub-router"
 	pnet "gx/ipfs/QmY4Q5JC4vxLEi8EpVxJM4rcRryEVtH1zRKVTAm6BKV1pg/go-libp2p-pnet"
 	peer "gx/ipfs/QmY5Grm8pJdiSSVsYxx4uNRgweY72EmYwuSDbRnbFok3iY/go-libp2p-peer"
 	smux "gx/ipfs/QmY9JXR3FupnYAYJWK9aMr9bCpqWKcToQ1tz8DVGTrHpHw/go-stream-muxer"
-	psrouter "gx/ipfs/QmYNjCcTvz65dj9GbsmLKsVDkAiJNGHdWBMCRJamxKTrqB/go-libp2p-pubsub-router"
 	mfs "gx/ipfs/QmYnp3EVZqLjzm8NYigcB3aHqDLFmAVUvtaUdYb3nFDtK6/go-mfs"
 	config "gx/ipfs/QmYyzmMnhNTtoXx5ttgUaRdHHckYnQWjPL98hgLAR2QLDD/go-ipfs-config"
 	pstore "gx/ipfs/QmZ9zH2FnLcxv1xyzFeUpDUeo55xEhZQHgveZijcxr7TLj/go-libp2p-peerstore"
 	resolver "gx/ipfs/QmZErC2Ay6WuGi96CPg316PwitdwgLo6RxZRqVjJjRj2MR/go-path/resolver"
-	connmgr "gx/ipfs/QmZNGvvTqtVtGzVxkhRCu5nuwbytdRdtHtJbWLGxeMYAkt/go-libp2p-connmgr"
 	mplex "gx/ipfs/QmZsejKNkeFSQe5TcmYXJ8iq6qPL1FpsP4eAA8j7RfE7xg/go-smux-multiplex"
-	pubsub "gx/ipfs/QmaTfHazBrintpyALv8MzmCvGyGg3XWY7vDrsVfGVnpd1j/go-libp2p-pubsub"
+	pubsub "gx/ipfs/QmaqGyUhWLsJbVo1QAujSu13mxNjFJ98Kt2VWGSnShGE1Q/go-libp2p-pubsub"
 	metrics "gx/ipfs/QmbYN6UmTJn5UUQdi5CTsU86TXVBSrTcRk5UmyA36Qx2J6/go-libp2p-metrics"
 	ipld "gx/ipfs/QmcKKBwfz6FyQdHR2jsXrrF6XeSBXYL86anmWNewpFpoF5/go-ipld-format"
 	logging "gx/ipfs/QmcuXC5cxs79ro2cUuHs4HQ2bkDLJUYokwL8aivcX6HW3C/go-log"

diff --git a/core/coreapi/pubsub.go b/core/coreapi/pubsub.go
@@ -14,7 +14,7 @@ import (
 	cid "gx/ipfs/QmR8BauakNcBa3RbE4nbQu76PDiJgoQgz8AJdhJuiU4TAw/go-cid"
 	peer "gx/ipfs/QmY5Grm8pJdiSSVsYxx4uNRgweY72EmYwuSDbRnbFok3iY/go-libp2p-peer"
 	pstore "gx/ipfs/QmZ9zH2FnLcxv1xyzFeUpDUeo55xEhZQHgveZijcxr7TLj/go-libp2p-peerstore"
-	pubsub "gx/ipfs/QmaTfHazBrintpyALv8MzmCvGyGg3XWY7vDrsVfGVnpd1j/go-libp2p-pubsub"
+	pubsub "gx/ipfs/QmaqGyUhWLsJbVo1QAujSu13mxNjFJ98Kt2VWGSnShGE1Q/go-libp2p-pubsub"
 )
 
 type PubSubAPI CoreAPI

diff --git a/package.json b/package.json
@@ -136,7 +136,7 @@
     },
     {
       "author": "whyrusleeping",
-      "hash": "QmXdvAAZtD13sDU7BAtdR629rsqY7PUG7BbwrhfXdEpTgX",
+      "hash": "QmfZuoe973XBPt4AUQEQtcj3XhycT3cGufFnivLfpWUxMt",
       "name": "go-ds-flatfs",
       "version": "1.3.5"
     },
@@ -362,9 +362,9 @@
     },
     {
       "author": "whyrusleeping",
-      "hash": "QmZNGvvTqtVtGzVxkhRCu5nuwbytdRdtHtJbWLGxeMYAkt",
+      "hash": "QmWJBngogUPF87Xz788NotnwfYS1B5oanKew82zuMwUkQu",
       "name": "go-libp2p-connmgr",
-      "version": "0.3.28"
+      "version": "0.3.29"
     },
     {
       "author": "why",
@@ -458,9 +458,9 @@
     },
     {
       "author": "stebalien",
-      "hash": "QmYNjCcTvz65dj9GbsmLKsVDkAiJNGHdWBMCRJamxKTrqB",
+      "hash": "QmXvWpPZMuWbwoDV393Y1ADVwuJsrVAvct4gKdLAkjvbhH",
       "name": "go-libp2p-pubsub-router",
-      "version": "0.5.8"
+      "version": "0.5.9"
     },
     {
       "author": "Stebalien",
@@ -583,9 +583,9 @@
     },
     {
       "author": "whyrusleeping",
-      "hash": "QmaTfHazBrintpyALv8MzmCvGyGg3XWY7vDrsVfGVnpd1j",
+      "hash": "QmaqGyUhWLsJbVo1QAujSu13mxNjFJ98Kt2VWGSnShGE1Q",
       "name": "go-libp2p-pubsub",
-      "version": "0.11.8"
+      "version": "0.11.9"
     },
     {
       "author": "travisperson",
@@ -612,3 +612,4 @@
   "name": "go-ipfs",
   "version": "0.4.18"
 }
+
diff --git a/plugin/plugins/flatfs/flatfs.go b/plugin/plugins/flatfs/flatfs.go
@@ -8,7 +8,7 @@ import (
 	"github.com/ipfs/go-ipfs/repo"
 	"github.com/ipfs/go-ipfs/repo/fsrepo"
 
-	flatfs "gx/ipfs/QmXdvAAZtD13sDU7BAtdR629rsqY7PUG7BbwrhfXdEpTgX/go-ds-flatfs"
+	flatfs "gx/ipfs/QmfZuoe973XBPt4AUQEQtcj3XhycT3cGufFnivLfpWUxMt/go-ds-flatfs"
 )
 
 // Plugins is exported list of plugins that will be loaded