Merge pull request #11 from ethereum/revert-6-master

Revert "Run JSHint on all code using Travis CI"
pull/272/merge
Jeffrey Wilcke 10 years ago
commit 60198a05b9
  1. 7
      .travis.yml
  2. 2
      README.md
  3. 8
      httprpc.js
  4. 26
      main.js
  5. 2
      qt.js
  6. 2
      websocket.js

@ -1,7 +0,0 @@
language: node_js
node_js:
- "0.11"
install:
- "npm install jshint"
script:
- "jshint *.js"

@ -1,7 +1,5 @@
# Ethereum JavaScript API # Ethereum JavaScript API
[![Build Status](https://travis-ci.org/ethereum/ethereum.js.svg?branch=master)](https://travis-ci.org/ethereum/ethereum.js)
This is the Ethereum compatible JavaScript API using `Promise`s This is the Ethereum compatible JavaScript API using `Promise`s
which implements the [Generic JSON RPC](https://github.com/ethereum/wiki/wiki/Generic-JSON-RPC) spec. which implements the [Generic JSON RPC](https://github.com/ethereum/wiki/wiki/Generic-JSON-RPC) spec.

@ -10,8 +10,8 @@
method: object.call, method: object.call,
params: object.args, params: object.args,
id: object._id id: object._id
}; }
} };
function formatJsonRpcMessage(message) { function formatJsonRpcMessage(message) {
var object = JSON.parse(message); var object = JSON.parse(message);
@ -20,7 +20,7 @@
_id: object.id, _id: object.id,
data: object.result data: object.result
}; };
} };
HttpRpcProvider.prototype.sendRequest = function (payload, cb) { HttpRpcProvider.prototype.sendRequest = function (payload, cb) {
var data = formatJsonRpcObject(payload); var data = formatJsonRpcObject(payload);
@ -32,7 +32,7 @@
if (request.readyState === 4 && cb) { if (request.readyState === 4 && cb) {
cb(request); cb(request);
} }
}; }
}; };
HttpRpcProvider.prototype.send = function (payload) { HttpRpcProvider.prototype.send = function (payload) {

@ -1,6 +1,6 @@
(function(window) { (function(window) {
function isPromise(o) { function isPromise(o) {
return o instanceof Promise; return o instanceof Promise
} }
function flattenPromise (obj) { function flattenPromise (obj) {
@ -40,7 +40,7 @@
} }
return Promise.resolve(obj); return Promise.resolve(obj);
} };
var ethMethods = function () { var ethMethods = function () {
var blockCall = function (args) { var blockCall = function (args) {
@ -171,7 +171,7 @@
}).catch(function (err) { }).catch(function (err) {
console.error(err); console.error(err);
}); });
}; }
} }
Object.defineProperty(obj, property.name, proto); Object.defineProperty(obj, property.name, proto);
}); });
@ -196,8 +196,8 @@
var str = ""; var str = "";
var i = 0, l = hex.length; var i = 0, l = hex.length;
for(; i < l; i+=2) { for(; i < l; i+=2) {
var code = hex.charCodeAt(i); var code = hex.charCodeAt(i)
if(code === 0) { if(code == 0) {
break; break;
} }
@ -216,18 +216,22 @@
var hex = this.toHex(str); var hex = this.toHex(str);
while(hex.length < pad*2) while(hex.length < pad*2)
hex += "00"; hex += "00";
return hex; return hex
}, },
eth: { eth: {
prototype: Object(),
watch: function (params) { watch: function (params) {
return new Filter(params, ethWatch); return new Filter(params, ethWatch);
}, },
}, },
db: {}, db: {
prototype: Object()
},
shh: { shh: {
prototype: Object(),
watch: function (params) { watch: function (params) {
return new Filter(params, shhWatch); return new Filter(params, shhWatch);
} }
@ -239,7 +243,7 @@
} }
web3._events[event][id] = cb; web3._events[event][id] = cb;
return this; return this
}, },
off: function(event, id) { off: function(event, id) {
@ -247,7 +251,7 @@
delete web3._events[event][id]; delete web3._events[event][id];
} }
return this; return this
}, },
trigger: function(event, id, data) { trigger: function(event, id, data) {
@ -372,7 +376,7 @@
Filter.prototype.arrived = function(callback) { Filter.prototype.arrived = function(callback) {
this.changed(callback); this.changed(callback);
}; }
Filter.prototype.changed = function(callback) { Filter.prototype.changed = function(callback) {
var self = this; var self = this;
@ -412,7 +416,7 @@
if(data._id) { if(data._id) {
var cb = web3._callbacks[data._id]; var cb = web3._callbacks[data._id];
if (cb) { if (cb) {
cb.call(this, data.data); cb.call(this, data.data)
delete web3._callbacks[data._id]; delete web3._callbacks[data._id];
} }
} }

@ -7,7 +7,7 @@
self.handlers.forEach(function (handler) { self.handlers.forEach(function (handler) {
handler.call(self, JSON.parse(message.data)); handler.call(self, JSON.parse(message.data));
}); });
}; }
}; };
QtProvider.prototype.send = function(payload) { QtProvider.prototype.send = function(payload) {

@ -11,7 +11,7 @@
var self = this; var self = this;
this.ws.onmessage = function(event) { this.ws.onmessage = function(event) {
for(var i = 0; i < self.handlers.length; i++) { for(var i = 0; i < self.handlers.length; i++) {
self.handlers[i].call(self, JSON.parse(event.data), event); self.handlers[i].call(self, JSON.parse(event.data), event)
} }
}; };

Loading…
Cancel
Save