status-im
/
web3.js
mirror of https://github.com/status-im/web3.js.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed filter polling

This commit is contained in:
Fabian Vogelsteller 2015-10-08 12:17:54 +02:00
parent df4e612278
commit c8f8ba8086
4 changed files with 42 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/web3/filter.js
View File

@ -134,8 +134,8 @@ var Filter = function (web3, options, methods, formatter, callback) {
var self = this;
var implementation = {};
methods.forEach(function (method) {
method.attachToObject(implementation);
method.setRequestManager(web3._requestManager);
method.attachToObject(implementation);
});
this.requestManager = web3._requestManager;
this.options = getOptions(options);

2
lib/web3/requestmanager.js
View File

@ -40,6 +40,8 @@ var RequestManager = function (provider) {
this.polls = {};
this.timeout = null;
this.isPolling = false;
this.poll();
};
/**

15
lib/web3/syncing.js
View File

@ -20,7 +20,6 @@
* @date 2015
*/
var Method = require('./method');
var formatters = require('./formatters');
var utils = require('../utils/utils');
@ -41,7 +40,7 @@ var pollSyncing = function(self) {
}
if(utils.isObject(sync))
sync = self.implementation.outputFormatter(sync);
sync = formatters.outputSyncingFormatter(sync);
self.callbacks.forEach(function (callback) {
if (lastSyncState !== sync) {
@ -60,8 +59,8 @@ var pollSyncing = function(self) {
});
};
self._web3._requestManager.startPolling({
method: self.implementation.call,
self.requestManager.startPolling({
method: 'eth_syncing',
params: [],
}, self.pollId, onMessage, self.stopWatching.bind(self));
@ -69,15 +68,9 @@ var pollSyncing = function(self) {
var IsSyncing = function (web3, callback) {
this._web3 = web3;
this.requestManager = web3._requestManager;
this.pollId = 'syncPoll_'+ Math.floor(Math.random() * 1000);
this.callbacks = [];
this.implementation = new Method({
name: 'isSyncing',
call: 'eth_syncing',
params: 0,
outputFormatter: formatters.outputSyncingFormatter
});
this.addCallback(callback);
pollSyncing(this);

70
test/web3.eth.isSyncing.js
View File

@ -22,40 +22,40 @@ var tests = [{
call: 'eth_syncing'
}];
//describe('eth', function () {
//describe(method, function () {
//tests.forEach(function (test, index) {
//it('property test: ' + index, function (done) {
describe('eth', function () {
describe(method, function () {
tests.forEach(function (test, index) {
it('property test: ' + index, function (done) {
// given
var provider = new FakeHttpProvider();
web3.setProvider(provider);
web3.reset();
provider.injectBatchResults(test.result);
provider.injectValidation(function(payload) {
assert.equal(payload[0].jsonrpc, '2.0', 'failed');
assert.equal(payload[0].method, test.call);
assert.deepEqual(payload[0].params, test.formattedArgs);
});
var count = 1;
// TODO results seem to be overwritten
// call
var syncing = web3.eth[method](function(e, res){
if(count === 1) {
assert.isTrue(res);
count++;
} else {
assert.deepEqual(res, test.formattedResult);
syncing.stopWatching();
done();
}
});
//// given
//var provider = new FakeHttpProvider();
//web3.setProvider(provider);
//web3.reset();
//provider.injectBatchResults(test.result);
//provider.injectValidation(function (payload) {
//assert.equal(payload[0].jsonrpc, '2.0');
//assert.equal(payload[0].method, test.call);
//assert.deepEqual(payload[0].params, test.formattedArgs);
//});
//var count = 1;
//// TODO results seem to be overwritten
//// call
//var syncing = web3.eth[method](function(e, res){
//if(count === 1) {
//assert.isTrue(res);
//count++;
//} else {
//assert.deepEqual(res, test.formattedResult);
//syncing.stopWatching();
//done();
//}
//});
//});
//});
//});
//});
});
});
});
});