grassrootseconomics
/
openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Master merge updates (conflicts)

This commit is contained in:
Jaco Greeff 2017-06-06 11:24:43 +02:00
parent 6a480ffb5b
commit bba1688981
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/src/secureApi.js
View File

@ -115,7 +115,7 @@ export default class SecureApi extends Api {
}
get isConnected () {
return this._transport.isConnected;
return this.provider.isConnected;
}
get needsToken () {
@ -123,7 +123,7 @@ export default class SecureApi extends Api {
}
get secureToken () {
return this._transport.token;
return this.provider.token;
}
connect () {
@ -252,11 +252,11 @@ export default class SecureApi extends Api {
.then(() => {
// Update the URL and token in the transport layer
this.transport.url = SecureApi.transportUrl(this._wsUrl, this.protocol);
this.transport.updateToken(token, false);
this.provider.updateToken(token, false);
log.debug('connecting with token', token);
return this.transport.connect();
return this.provider.connect();
})
.then(() => {
log.debug('connected with', token);