aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Kotewicz <marek.kotewicz@gmail.com>2014-10-30 00:14:59 +0800
committerMarek Kotewicz <marek.kotewicz@gmail.com>2014-10-30 00:14:59 +0800
commitcb607b4911711501a8e70db0fe2148c51272c719 (patch)
tree066a6280876d2c6c05788989d1f0610be37b4b46
parent31c6159019d330d27c086343257902c97de3a8ae (diff)
downloaddexon-cb607b4911711501a8e70db0fe2148c51272c719.tar
dexon-cb607b4911711501a8e70db0fe2148c51272c719.tar.gz
dexon-cb607b4911711501a8e70db0fe2148c51272c719.tar.bz2
dexon-cb607b4911711501a8e70db0fe2148c51272c719.tar.lz
dexon-cb607b4911711501a8e70db0fe2148c51272c719.tar.xz
dexon-cb607b4911711501a8e70db0fe2148c51272c719.tar.zst
dexon-cb607b4911711501a8e70db0fe2148c51272c719.zip
changes to make whisper working
-rw-r--r--httprpc.js2
-rw-r--r--main.js12
2 files changed, 9 insertions, 5 deletions
diff --git a/httprpc.js b/httprpc.js
index 8e3c74b8b..085b4693d 100644
--- a/httprpc.js
+++ b/httprpc.js
@@ -48,7 +48,7 @@
var self = this;
this.sendRequest(payload, function (request) {
var parsed = JSON.parse(request.responseText);
- if (!parsed.result) {
+ if (parsed.result instanceof Array ? parsed.result.length === 0 : !parsed.result) {
return;
}
self.handlers.forEach(function (handler) {
diff --git a/main.js b/main.js
index 32064ce26..cc85b9850 100644
--- a/main.js
+++ b/main.js
@@ -131,11 +131,11 @@
}).then(function (request) {
return new Promise(function (resolve, reject) {
web3.provider.send(request, function (result) {
- if (result) {
+ if (result || typeof result === "boolean") {
resolve(result);
- } else {
- reject(result);
- }
+ return;
+ }
+ reject(result);
});
});
}).catch(function( err) {
@@ -373,6 +373,10 @@
});
};
+ Filter.prototype.arrived = function(callback) {
+ this.changed(callback);
+ }
+
Filter.prototype.changed = function(callback) {
var self = this;
this.promise.then(function(id) {