aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Kotewicz <marek.kotewicz@gmail.com>2015-01-22 04:54:51 +0800
committerMarek Kotewicz <marek.kotewicz@gmail.com>2015-01-22 04:54:51 +0800
commitf4bb060d50c3b4b638b0b2887e443c31133096d5 (patch)
treefa7b211eac57a74ca73384be8f83ba481e5d5e48
parentca8aa01b3468295f6c6ca8d96742d920da189a11 (diff)
downloaddexon-solidity-f4bb060d50c3b4b638b0b2887e443c31133096d5.tar.gz
dexon-solidity-f4bb060d50c3b4b638b0b2887e443c31133096d5.tar.zst
dexon-solidity-f4bb060d50c3b4b638b0b2887e443c31133096d5.zip
Squashed 'libjsqrc/ethereumjs/' changes from e1fcffc..edfb874
edfb874 changes in filter.js (not yet working) c2d9c1a toDecimal/fromDecimal is using bignumber.js now 81a5813 removed unused pieces of code 08e2696 removed send queues from providermanager c9693b4 contract.html example is working with sync api ceb4357 sync api tests running, removed unused pieces of code fc986a3 removed unused providers 0d2cccc http sync api git-subtree-dir: libjsqrc/ethereumjs git-subtree-split: edfb874527160cee14cca931377e55187b874cbe
-rw-r--r--db.methods.js1
-rw-r--r--eth.methods.js1
-rw-r--r--shh.methods.js1
-rw-r--r--utils.js2
-rw-r--r--web3.methods.js1
5 files changed, 1 insertions, 5 deletions
diff --git a/db.methods.js b/db.methods.js
index 662f4e7c..55cf699f 100644
--- a/db.methods.js
+++ b/db.methods.js
@@ -3,7 +3,6 @@ require('es6-promise').polyfill();
var assert = require('assert');
var web3 = require('../index.js');
var u = require('./utils.js');
-web3.setProvider(new web3.providers.WebSocketProvider('http://localhost:8080')); // TODO: create some mock provider
describe('web3', function() {
describe('db', function() {
diff --git a/eth.methods.js b/eth.methods.js
index 892db0d8..5baedb88 100644
--- a/eth.methods.js
+++ b/eth.methods.js
@@ -3,7 +3,6 @@ require('es6-promise').polyfill();
var assert = require('assert');
var web3 = require('../index.js');
var u = require('./utils.js');
-web3.setProvider(new web3.providers.WebSocketProvider('http://localhost:8080')); // TODO: create some mock provider
describe('web3', function() {
describe('eth', function() {
diff --git a/shh.methods.js b/shh.methods.js
index f2f56edb..2e7e1387 100644
--- a/shh.methods.js
+++ b/shh.methods.js
@@ -3,7 +3,6 @@ require('es6-promise').polyfill();
var assert = require('assert');
var web3 = require('../index.js');
var u = require('./utils.js');
-web3.setProvider(new web3.providers.WebSocketProvider('http://localhost:8080')); // TODO: create some mock provider
describe('web3', function() {
describe('shh', function() {
diff --git a/utils.js b/utils.js
index 8617348e..8a1e9a0b 100644
--- a/utils.js
+++ b/utils.js
@@ -8,7 +8,7 @@ var methodExists = function (object, method) {
var propertyExists = function (object, property) {
it('should have property ' + property + ' implemented', function() {
- assert.equal('object', typeof object[property], 'property ' + property + ' is not implemented');
+ assert.notEqual('undefined', typeof object[property], 'property ' + property + ' is not implemented');
});
};
diff --git a/web3.methods.js b/web3.methods.js
index 5c30177e..3ff4103e 100644
--- a/web3.methods.js
+++ b/web3.methods.js
@@ -3,7 +3,6 @@ require('es6-promise').polyfill();
var assert = require('assert');
var web3 = require('../index.js');
var u = require('./utils.js');
-web3.setProvider(new web3.providers.WebSocketProvider('http://localhost:8080')); // TODO: create some mock provider
describe('web3', function() {
u.methodExists(web3, 'sha3');