From fe7cc2294c5a34cec9d5848e71236985a946d3ca Mon Sep 17 00:00:00 2001 From: Richard Schneider Date: Mon, 20 Nov 2017 21:07:38 +1300 Subject: [PATCH] fix: allow topicCIDs from older peers (#631) --- src/pubsub.js | 1 + src/utils/pubsub-message-utils.js | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pubsub.js b/src/pubsub.js index ced2b2c32..ec61daf61 100644 --- a/src/pubsub.js +++ b/src/pubsub.js @@ -121,6 +121,7 @@ module.exports = (arg) => { function subscribe (topic, options, handler, callback) { ps.on(topic, handler) if (subscriptions[topic]) { + // TODO: should a callback error be returned? return callback() } diff --git a/src/utils/pubsub-message-utils.js b/src/utils/pubsub-message-utils.js index 2b3bbbabe..53d1e397a 100644 --- a/src/utils/pubsub-message-utils.js +++ b/src/utils/pubsub-message-utils.js @@ -30,10 +30,10 @@ function deserializeFromBase64 (obj) { from: bs58.encode(Buffer.from(obj.from, 'base64')).toString(), seqno: Buffer.from(obj.seqno, 'base64'), data: Buffer.from(obj.data, 'base64'), - topicIDs: obj.topicIDs + topicIDs: obj.topicIDs || obj.topicCIDs } } function isPubsubMessage (obj) { - return obj && obj.from && obj.seqno && obj.data && obj.topicIDs + return obj && obj.from && obj.seqno && obj.data && (obj.topicIDs || obj.topicCIDs) }