From c1161730d93c2dd8c9ba8c554b72cb176273abe9 Mon Sep 17 00:00:00 2001 From: Richard Ramos Date: Fri, 16 Nov 2018 17:57:21 -0400 Subject: [PATCH] Removing minPow to be able to receive messages from mailserver --- src/index.js | 1 - src/mailservers.js | 6 +++--- test-mailserver.js | 6 ++++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/index.js b/src/index.js index 9998e40..91e82ac 100644 --- a/src/index.js +++ b/src/index.js @@ -123,7 +123,6 @@ class StatusJS { } this.channels[channelName].subscription = this.shh.subscribe("messages", { - minPow: POW_TARGET, symKeyID: this.channels[channelName].channelKey, topics: [this.channels[channelName].channelCode], allowP2P: true diff --git a/src/mailservers.js b/src/mailservers.js index 796b4f9..e41a633 100644 --- a/src/mailservers.js +++ b/src/mailservers.js @@ -15,7 +15,7 @@ class MailServers { } this.symKeyID = await this.web3.shh.generateSymKeyFromPassword("status-offline-inbox"); - + this.web3.currentProvider.send({ method: "admin_addPeer", params: [enode], @@ -33,13 +33,12 @@ class MailServers { } setTimeout(() => { - this.web3.shh.markTrustedPeer(enode) + this.web3.shh.markTrustedPeer(enode) .then(res => { this.mailserver = enode; if (!cb) return true; cb(null, true); }).catch((e) => { - console.log(e); if (!cb) return; cb(e, false); }); @@ -55,6 +54,7 @@ class MailServers { const topics = [this.web3.utils.sha3(topic).slice(0, 10)]; const mailserverPeer = this.mailserver; + const timeout = options.timeout || 30; // seconds const symKeyID = this.symKeyID; const from = options.from || 0; // unix timestamp diff --git a/test-mailserver.js b/test-mailserver.js index bf67736..bd55ded 100644 --- a/test-mailserver.js +++ b/test-mailserver.js @@ -9,11 +9,13 @@ var status = new StatusJS(); await status.joinChat(channel); status.onMessage(channel, (err, data) => { - console.dir(data.payload); + console.log(data.payload); }); status.mailservers.useMailserver("mail-02.gc-us-central1-a.eth.beta", (err, res) => { - status.mailservers.requestMessages(channel, {}, (err, res) => { if(err) console.log(err); }); + status.mailservers.requestMessages(channel, {}, (err, res) => { + if(err) console.log(err); + }); }); setInterval(() => { }, 3000);