Merge branch 'develop' of https://github.com/ethereum/web3.js into develop

This commit is contained in:
beth.null 2015-09-15 00:03:55 +02:00
commit 18b37482c6
1 changed files with 6 additions and 1 deletions

View File

@ -41,13 +41,18 @@ FakeHttpProvider.prototype.send = function (payload) {
};
FakeHttpProvider.prototype.sendAsync = function (payload, callback) {
assert.equal(utils.isArray(payload) || utils.isObject(payload), true);
assert.equal(utils.isFunction(callback), true);
if (this.validation) {
// imitate plain json object
this.validation(JSON.parse(JSON.stringify(payload)), callback);
}
callback(this.error, this.getResponse());
var response = this.getResponse();
var error = this.error;
setTimeout(function(){
callback(error, response);
});
};
FakeHttpProvider.prototype.injectResponse = function (response) {