Merge branch '1.0' of github.com:ethereum/web3.js into 1.0

frozeman · frozeman · commit 2a4a722647a9 · 2018-03-01T19:14:43.000+01:00
diff --git a/docs/web3-shh.rst b/docs/web3-shh.rst
@@ -7,7 +7,7 @@ web3.shh
 ========
 
 
-The ``web3-shh`` package allows you to interact with an the whisper protocol for broadcasting.
+The ``web3-shh`` package allows you to interact with the whisper protocol for broadcasting.
 For more see `Whisper  Overview <https://github.com/ethereum/go-ethereum/wiki/Whisper>`_.
 
 
diff --git a/packages/web3-providers-ws/src/index.js b/packages/web3-providers-ws/src/index.js
@@ -181,7 +181,7 @@ WebsocketProvider.prototype._addResponseCallback = function(payload, callback) {
 WebsocketProvider.prototype._timeout = function() {
     for(var key in this.responseCallbacks) {
         if(this.responseCallbacks.hasOwnProperty(key)){
-            this.responseCallbacks[key](errors.InvalidConnection('on IPC'));
+            this.responseCallbacks[key](errors.InvalidConnection('on WS'));
             delete this.responseCallbacks[key];
         }
     }
@@ -328,4 +328,3 @@ WebsocketProvider.prototype.reset = function () {
 };
 
 module.exports = WebsocketProvider;
-

Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ WebsocketProvider.prototype._addResponseCallback = function(payload, callback) {`
`181`	`181`	`WebsocketProvider.prototype._timeout = function() {`
`182`	`182`	`for(var key in this.responseCallbacks) {`
`183`	`183`	`if(this.responseCallbacks.hasOwnProperty(key)){`
`184`		`- this.responseCallbacks[key](errors.InvalidConnection('on IPC'));`
	`184`	`+ this.responseCallbacks[key](errors.InvalidConnection('on WS'));`
`185`	`185`	`delete this.responseCallbacks[key];`
`186`	`186`	`}`
`187`	`187`	`}`
`@@ -328,4 +328,3 @@ WebsocketProvider.prototype.reset = function () {`
`328`	`328`	`};`
`329`	`329`
`330`	`330`	`module.exports = WebsocketProvider;`
`331`		`-`