Rename pub/sub to publish/subscribe

Author: victorb

src/api/pubsub.js

@@ -31,7 +31,7 @@ const parseMessage = (message) => {
 
 module.exports = (send, config) => {
   return {
-    sub: promisify((topic, options, callback) => {
+    subscribe: promisify((topic, options, callback) => {
       if (typeof options === 'function') {
         callback = options
         options = {}
@@ -79,7 +79,7 @@ module.exports = (send, config) => {
       }
       callback(null, rs)
     }),
-    pub: promisify((topic, data, options, callback) => {
+    publish: promisify((topic, data, options, callback) => {
       if (typeof options === 'function') {
         callback = options
         options = {}

test/ipfs-api/pubsub.spec.js

@@ -10,9 +10,9 @@ const FactoryClient = require('../factory/factory-client')
 const topicName = 'js-ipfs-api-tests'
 
 const publish = (ipfs, data, callback) => {
-  ipfs.pubsub.pub(topicName, data, (err, result) => {
+  ipfs.pubsub.publish(topicName, data, (err, successful) => {
     expect(err).to.not.exist
-    expect(result).to.equal(true)
+    expect(successful).to.equal(true)
     callback()
   })
 }
@@ -50,7 +50,7 @@ describe('.pubsub', () => {
 
   describe('.subscribe', () => {
     it('one topic', (done) => {
-      ipfs.pubsub.sub(topicName, (err, subscription) => {
+      ipfs.pubsub.subscribe(topicName, (err, subscription) => {
         expect(err).to.not.exist
         subscription.on('data', (d) => {
           expect(d.data).to.equal('hi')
@@ -63,9 +63,9 @@ describe('.pubsub', () => {
       setTimeout(publish.bind(null, ipfs, 'hi', () => {}), 0)
     })
     it('fails when already subscribed', (done) => {
-      ipfs.pubsub.sub(topicName, (firstErr, firstSub) => {
+      ipfs.pubsub.subscribe(topicName, (firstErr, firstSub) => {
         expect(firstErr).to.not.exist
-        ipfs.pubsub.sub(topicName, (secondErr, secondSub) => {
+        ipfs.pubsub.subscribe(topicName, (secondErr, secondSub) => {
           expect(secondErr).to.be.an('error')
           expect(secondErr.toString()).to.equal('Error: Already subscribed to ' + topicName)
           firstSub.cancel()
@@ -77,7 +77,7 @@ describe('.pubsub', () => {
       let receivedMessages = []
       let interval = null
       const expectedMessages = 2
-      ipfs.pubsub.sub(topicName, (err, subscription) => {
+      ipfs.pubsub.subscribe(topicName, (err, subscription) => {
         expect(err).to.not.exists
         subscription.on('data', (d) => {
           receivedMessages.push(d.data)
@@ -100,7 +100,7 @@ describe('.pubsub', () => {
   describe('multiple nodes pub/sub', () => {
     it('receive messages from different node', (done) => {
       const expectedString = 'hello from the other side'
-      apiClients.a.pubsub.sub(topicName, (err, subscription) => {
+      apiClients.a.pubsub.subscribe(topicName, (err, subscription) => {
         expect(err).to.not.exists
         subscription.on('data', (d) => {
           expect(d.data).to.be.equal(expectedString)
@@ -109,7 +109,7 @@ describe('.pubsub', () => {
         })
       })
       setTimeout(() => {
-        apiClients.b.pubsub.pub(topicName, expectedString, (err, result) => {
+        apiClients.b.pubsub.publish(topicName, expectedString, (err, result) => {
           expect(err).to.not.exist
           expect(result).to.equal(true)
         })