uncommented few more tests

Author: debris

lib/web3/allevents.js

@@ -27,7 +27,8 @@ var utils = require('../utils/utils');
 var Filter = require('./filter');
 var watches = require('./methods/watches');
 
-var AllSolidityEvents = function (json, address) {
+var AllSolidityEvents = function (web3, json, address) {
+    this._web3 = web3;
     this._json = json;
     this._address = address;
 };
@@ -61,7 +62,7 @@ AllSolidityEvents.prototype.decode = function (data) {
         return data;
     }
 
-    var event = new SolidityEvent(match, this._address);
+    var event = new SolidityEvent(this._web3, match, this._address);
     return event.decode(data);
 };
 
@@ -75,7 +76,7 @@ AllSolidityEvents.prototype.execute = function (options, callback) {
 
     var o = this.encode(options);
     var formatter = this.decode.bind(this);
-    return new Filter(o, watches.eth(), formatter, callback);
+    return new Filter(this._web3, o, watches.eth(), formatter, callback);
 };
 
 AllSolidityEvents.prototype.attachToContract = function (contract) {

lib/web3/contract.js

@@ -56,7 +56,7 @@ var addFunctionsToContract = function (contract, abi) {
     abi.filter(function (json) {
         return json.type === 'function';
     }).map(function (json) {
-        return new SolidityFunction(json, contract.address);
+        return new SolidityFunction(contract._web3, json, contract.address);
     }).forEach(function (f) {
         f.attachToContract(contract);
     });
@@ -74,11 +74,11 @@ var addEventsToContract = function (contract, abi) {
         return json.type === 'event';
     });
 
-    var All = new AllEvents(events, contract.address);
+    var All = new AllEvents(contract._web3, events, contract.address);
     All.attachToContract(contract);
 
     events.map(function (json) {
-        return new SolidityEvent(json, contract.address);
+        return new SolidityEvent(contract._web3, json, contract.address);
     }).forEach(function (e) {
         e.attachToContract(contract);
     });
@@ -98,7 +98,7 @@ var checkForContractAddress = function(contract, callback){
         callbackFired = false;
 
     // wait for receipt
-    var filter = web3.eth.filter('latest', function(e){
+    var filter = contract._web3.eth.filter('latest', function(e){
         if (!e && !callbackFired) {
             count++;
 
@@ -116,7 +116,7 @@ var checkForContractAddress = function(contract, callback){
 
             } else {
 
-                web3.eth.getTransactionReceipt(contract.transactionHash, function(e, receipt){
+                contract._web3.eth.getTransactionReceipt(contract.transactionHash, function(e, receipt){
                     if(receipt && !callbackFired) {
 
                         web3.eth.getCode(receipt.contractAddress, function(e, code){
@@ -185,7 +185,7 @@ var ContractFactory = function (web3, abi) {
  * @returns {Contract} returns contract instance
  */
 ContractFactory.prototype.new = function () {
-    var contract = new Contract(this.abi);
+    var contract = new Contract(this.web3, this.abi);
 
     // parse arguments
     var options = {}; // required!
@@ -240,7 +240,7 @@ ContractFactory.prototype.new = function () {
  * otherwise calls callback function (err, contract)
  */
 ContractFactory.prototype.at = function (address, callback) {
-    var contract = new Contract(this.abi, address);
+    var contract = new Contract(this.web3, this.abi, address);
 
     if (callback) {
         callback(null, contract);
@@ -255,7 +255,8 @@ ContractFactory.prototype.at = function (address, callback) {
  * @param {Array} abi
  * @param {Address} contract address
  */
-var Contract = function (abi, address) {
+var Contract = function (web3, abi, address) {
+    this._web3 = web3;
     this._transactionHash = null;
     this.address = address;
 

lib/web3/event.js

@@ -30,7 +30,8 @@ var watches = require('./methods/watches');
 /**
  * This prototype should be used to create event filters
  */
-var SolidityEvent = function (json, address) {
+var SolidityEvent = function (web3, json, address) {
+    this._web3 = web3;
     this._params = json.inputs;
     this._name = utils.transformToFullName(json);
     this._address = address;
@@ -185,7 +186,7 @@ SolidityEvent.prototype.execute = function (indexed, options, callback) {
 
     var o = this.encode(indexed, options);
     var formatter = this.decode.bind(this);
-    return new Filter(o, watches.eth(), formatter, callback);
+    return new Filter(this._web3, o, watches.eth(), formatter, callback);
 };
 
 /**

lib/web3/function.js

@@ -20,7 +20,6 @@
  * @date 2015
  */
 
-var web3 = require('../web3');
 var coder = require('../solidity/coder');
 var utils = require('../utils/utils');
 var formatters = require('./formatters');
@@ -29,7 +28,8 @@ var sha3 = require('../utils/sha3');
 /**
  * This prototype should be used to call/sendTransaction to solidity functions
  */
-var SolidityFunction = function (json, address) {
+var SolidityFunction = function (web3, json, address) {
+    this._web3 = web3;
     this._inputTypes = json.inputs.map(function (i) {
         return i.type;
     });
@@ -109,12 +109,12 @@ SolidityFunction.prototype.call = function () {
 
 
     if (!callback) {
-        var output = web3.eth.call(payload, defaultBlock);
+        var output = this._web3.eth.call(payload, defaultBlock);
         return this.unpackOutput(output);
     } 
 
     var self = this;
-    web3.eth.call(payload, defaultBlock, function (error, output) {
+    this._web3.eth.call(payload, defaultBlock, function (error, output) {
         callback(error, self.unpackOutput(output));
     });
 };
@@ -131,10 +131,10 @@ SolidityFunction.prototype.sendTransaction = function () {
     var payload = this.toPayload(args);
 
     if (!callback) {
-        return web3.eth.sendTransaction(payload);
+        return this._web3.eth.sendTransaction(payload);
     }
 
-    web3.eth.sendTransaction(payload, callback);
+    this._web3.eth.sendTransaction(payload, callback);
 };
 
 /**
@@ -149,10 +149,10 @@ SolidityFunction.prototype.estimateGas = function () {
     var payload = this.toPayload(args);
 
     if (!callback) {
-        return web3.eth.estimateGas(payload);
+        return this._web3.eth.estimateGas(payload);
     }
 
-    web3.eth.estimateGas(payload, callback);
+    this._web3.eth.estimateGas(payload, callback);
 };
 
 /**

lib/web3/methods/eth.js

@@ -31,6 +31,7 @@ var c = require('../../utils/config');
 var Contract = require('../contract');
 var watches = require('./watches');
 var Filter = require('../filter');
+var IsSyncing = require('../syncing');
 
 var blockCall = function (args) {
     return (utils.isString(args[0]) && args[0].indexOf('0x') === 0) ? "eth_getBlockByHash" : "eth_getBlockByNumber";
@@ -311,5 +312,9 @@ Eth.prototype.filter = function (fil, callback) {
     return new Filter(this.web3, fil, watches.eth(), formatters.outputLogFormatter, callback);
 };
 
+Eth.prototype.isSyncing = function (callback) {
+    return new IsSyncing(this.web3, callback);
+};
+
 module.exports = Eth;
 

lib/web3/methods/eth1.js

@@ -22,19 +22,23 @@
 
 var Method = require('../method');
 var formatters = require('../formatters');
+var Filter = require('../filter');
+var watches = require('./watches');
 
 var Shh = function (web3) {
-    this._requestManager = web3._requestManager;
+    this.web3 = web3;
 
     var self = this;
 
     methods().forEach(function(method) { 
         method.attachToObject(self);
         method.setRequestManager(web3._requestManager);
     });
-
 };
 
+Shh.prototype.filter = function (fil, callback) {
+    return new Filter(this.web3, fil, watches.shh(), formatters.outputPostFormatter, callback);
+};
 
 var methods = function () { 
 

lib/web3/methods/shh.js

@@ -20,13 +20,10 @@
  * @date 2015
  */
 
-var RequestManager = require('./requestmanager');
 var Method = require('./method');
 var formatters = require('./formatters');
 var utils = require('../utils/utils');
 
-
-
 /**
 Adds the callback and sets up the methods, to iterate over the results.
 
@@ -47,7 +44,7 @@ var pollSyncing = function(self) {
             sync = self.implementation.outputFormatter(sync);
 
         self.callbacks.forEach(function (callback) {
-            if(lastSyncState !== sync) {
+            if (lastSyncState !== sync) {
 
                 // call the callback with true first so the app can stop anything, before receiving the sync data
                 if(!lastSyncState && utils.isObject(sync))
@@ -63,14 +60,15 @@ var pollSyncing = function(self) {
         });
     };
 
-    RequestManager.getInstance().startPolling({
+    self._web3._requestManager.startPolling({
         method: self.implementation.call,
         params: [],
     }, self.pollId, onMessage, self.stopWatching.bind(self));
 
 };
 
-var IsSyncing = function (callback) {
+var IsSyncing = function (web3, callback) {
+    this._web3 = web3;
     this.pollId = 'syncPoll_'+ Math.floor(Math.random() * 1000);
     this.callbacks = [];
     this.implementation = new Method({
@@ -93,7 +91,7 @@ IsSyncing.prototype.addCallback = function (callback) {
 };
 
 IsSyncing.prototype.stopWatching = function () {
-    RequestManager.getInstance().stopPolling(this.pollId);
+    this._web3._requestManager.stopPolling(this.pollId);
     this.callbacks = [];
 };
 

lib/web3/syncing.js

@@ -8,7 +8,7 @@ var utils = require('../lib/utils/utils');
 var BigNumber = require('bignumber.js');
 var sha3 = require('../lib/utils/sha3');
 
-/*
+
 var desc = [{
     "name": "balance(address)",
     "type": "function",
@@ -573,4 +573,3 @@ describe('contract', function () {
     });
 });
 
-*/

test/contract.js

@@ -2,6 +2,9 @@ var chai = require('chai');
 var assert = chai.assert;
 var BigNumber = require('bignumber.js');
 var SolidityEvent = require('../lib/web3/event');
+var Web3 = require('../index');
+var web3 = new Web3();
+
 
 var name = 'event1';
 var address = '0x1234567890123456789012345678901234567890';
@@ -169,7 +172,7 @@ describe('lib/web3/event', function () {
     describe('decode', function () {
         tests.forEach(function (test, index) {
             it('test no: ' + index, function () {
-                var event = new SolidityEvent(test.abi, address);
+                var event = new SolidityEvent(web3, test.abi, address);
 
                 var result = event.decode(test.data);
                 assert.deepEqual(result, test.expected);