Merge branch 'master' into master

README.md

@@ -4,6 +4,7 @@ js-libp2p-pubsub
 [![](https://img.shields.io/badge/made%20by-Protocol%20Labs-blue.svg?style=flat-square)](http://ipn.io)
 [![](https://img.shields.io/badge/project-IPFS-blue.svg?style=flat-square)](http://libp2p.io/)
 [![](https://img.shields.io/badge/freenode-%23ipfs-blue.svg?style=flat-square)](http://webchat.freenode.net/?channels=%23ipfs)
+[![Discourse posts](https://img.shields.io/discourse/https/discuss.libp2p.io/posts.svg)](https://discuss.libp2p.io)
 [![Coverage Status](https://coveralls.io/repos/github/libp2p/js-libp2p-pubsub/badge.svg?branch=master)](https://coveralls.io/github/libp2p/js-libp2p-pubsub?branch=master)
 [![Travis CI](https://travis-ci.org/libp2p/js-libp2p-pubsub.svg?branch=master)](https://travis-ci.org/libp2p/js-libp2p-pubsub)
 [![Circle CI](https://circleci.com/gh/libp2p/js-libp2p-pubsub.svg?style=svg)](https://circleci.com/gh/libp2p/js-libp2p-pubsub)

package.json

@@ -41,25 +41,25 @@
   },
   "homepage": "https://github.com/libp2p/js-libp2p-pubsub#readme",
   "devDependencies": {
-    "aegir": "^18.0.3",
+    "aegir": "^18.2.1",
     "benchmark": "^2.1.4",
     "chai": "^4.2.0",
     "chai-spies": "^1.0.0",
     "dirty-chai": "^2.0.1",
     "libp2p": "~0.24.4",
-    "libp2p-secio": "~0.11.0",
-    "libp2p-spdy": "~0.13.1",
+    "libp2p-secio": "~0.11.1",
+    "libp2p-spdy": "~0.13.3",
     "libp2p-tcp": "~0.13.0",
     "lodash": "^4.17.11",
     "peer-id": "~0.12.2",
     "peer-info": "~0.15.1"
   },
   "dependencies": {
-    "async": "^2.6.1",
+    "async": "^2.6.2",
     "bs58": "^4.0.1",
     "debug": "^4.1.1",
     "err-code": "^1.1.2",
-    "length-prefixed-stream": "^1.6.0",
+    "length-prefixed-stream": "^2.0.0",
     "libp2p-crypto": "^0.16.1",
     "protons": "^1.0.1",
     "pull-length-prefixed": "^1.3.1",

src/message/rpc.proto.js

@@ -6,7 +6,7 @@ message RPC {
 
   message SubOpts {
     optional bool subscribe = 1; // subscribe or unsubcribe
-    optional string topicCID = 2;
+    optional string topicID = 2;
   }
 
   message Message {

src/peer.js

@@ -105,7 +105,7 @@ class Peer extends EventEmitter {
     topics.forEach((topic) => {
       subs.push({
         subscribe: subscribe,
-        topicCID: topic
+        topicID: topic
       })
     })
 
@@ -153,9 +153,9 @@ class Peer extends EventEmitter {
   updateSubscriptions (changes) {
     changes.forEach((subopt) => {
       if (subopt.subscribe) {
-        this.topics.add(subopt.topicCID)
+        this.topics.add(subopt.topicID)
       } else {
-        this.topics.delete(subopt.topicCID)
+        this.topics.delete(subopt.topicID)
       }
     })
   }