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

Merge branch 'master' of https://github.com/ethereum/ethereum.js 

Conflicts:
	lib/web3/jsonrpc.js
This commit is contained in:
Marek Kotewicz 2015-03-28 14:41:15 +01:00
parent 2f45df835a e750fd9bb4
commit 534e96da9e
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dist/ethereum-light.js vendored
View File

@ -2418,7 +2418,7 @@ Jsonrpc.prototype.toPayload = function (method, params) {
method: method,
params: params || [],
id: this.messageId++
};
};
};
/**
@ -2426,7 +2426,7 @@ Jsonrpc.prototype.toPayload = function (method, params) {
*
* @method isValidResponse
* @param {Object}
* @returns {Boolean} true if response is valid, otherwise false
* @returns {Boolean} true if response is valid, otherwise false
*/
Jsonrpc.prototype.isValidResponse = function (response) {
return !!response &&
@ -2447,7 +2447,7 @@ Jsonrpc.prototype.toBatchPayload = function (messages) {
var self = this;
return messages.map(function (message) {
return self.toPayload(message.method, message.params);
});
});
};
module.exports = Jsonrpc;

2
dist/ethereum-light.js.map vendored
View File

File diff suppressed because one or more lines are too long

6
dist/ethereum.js vendored
View File

@ -2418,7 +2418,7 @@ Jsonrpc.prototype.toPayload = function (method, params) {
method: method,
params: params || [],
id: this.messageId++
};
};
};
/**
@ -2426,7 +2426,7 @@ Jsonrpc.prototype.toPayload = function (method, params) {
*
* @method isValidResponse
* @param {Object}
* @returns {Boolean} true if response is valid, otherwise false
* @returns {Boolean} true if response is valid, otherwise false
*/
Jsonrpc.prototype.isValidResponse = function (response) {
return !!response &&
@ -2447,7 +2447,7 @@ Jsonrpc.prototype.toBatchPayload = function (messages) {
var self = this;
return messages.map(function (message) {
return self.toPayload(message.method, message.params);
});
});
};
module.exports = Jsonrpc;

2
dist/ethereum.js.map vendored
View File

File diff suppressed because one or more lines are too long

6
lib/web3/jsonrpc.js
View File

@ -55,7 +55,7 @@ Jsonrpc.prototype.toPayload = function (method, params) {
method: method,
params: params || [],
id: this.messageId++
};
};
};
/**
@ -63,7 +63,7 @@ Jsonrpc.prototype.toPayload = function (method, params) {
*
* @method isValidResponse
* @param {Object}
* @returns {Boolean} true if response is valid, otherwise false
* @returns {Boolean} true if response is valid, otherwise false
*/
Jsonrpc.prototype.isValidResponse = function (response) {
return !!response &&
@ -84,7 +84,7 @@ Jsonrpc.prototype.toBatchPayload = function (messages) {
var self = this;
return messages.map(function (message) {
return self.toPayload(message.method, message.params);
});
});
};
module.exports = Jsonrpc;