improved fake provider, with stacking validation and results

web3 · Oct 4, 2016 · f3107c2 · f3107c2
1 parent 8654941
commit f3107c2
Show file tree

Hide file tree

Showing 4 changed files with 167 additions and 180 deletions.
diff --git a/lib/web3/contract.js b/lib/web3/contract.js
@@ -482,6 +482,7 @@ Contract.prototype.deploy = function(options, callback){
     return defer.promise;
 };
 
+// TODO add constructor as method with .encodeABI
 
 /**
  * Encodes any contract function, including the constructor into a data ABI HEX string.
@@ -752,8 +753,9 @@ Contract.prototype._executeMethod = function _executeMethod(type){
         // create the callback method
         var methodReturnCallback = function(err, returnValue) {
 
-            if(type === 'call')
+            if(type === 'call') {
                 returnValue = _this._parent._decodeMethodReturn(_this._method.outputTypes, returnValue);
+            }
 
 
             if (err) {

diff --git a/lib/web3/requestmanager.js b/lib/web3/requestmanager.js
@@ -77,7 +77,7 @@ RequestManager.prototype.sendAsync = function (data, callback) {
     }
     var payload = Jsonrpc.getInstance().toPayload(data.method, data.params);
     this.provider.sendAsync(payload, function (err, result) {
-        // if(payload.id !== result.id) return callback(new Error('Wrong response id for '+ JSON.stringify(payload)));;
+        if(payload.id !== result.id) return callback(new Error('Wrong response id "'+ result.id +'" (expected: "'+ payload.id +'") in '+ JSON.stringify(payload)));;
 
         if (err) {
             return callback(err);