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

Simplify, consolidate uses between subscription managers

Browse Source
This commit is contained in:
Jaco Greeff
2016-12-09 00:52:21 +01:00
parent 3989e2642b
commit 10c356de65
2 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
js/src/api/contract/contract.js
View File

@@ -316,6 +316,21 @@ export default class Contract {
}
}
_sendData (subscriptionId, error, logs) {
const { autoRemove, callback } = this._subscriptions[subscriptionId];
let result = false;
try {
result = callback(error, logs);
} catch (error) {
console.warn('_sendData', subscriptionId, error);
}
if (autoRemove && !result) {
this.unsubscribe(subscriptionId);
}
}
_subscribe (event = null, _options, callback, autoRemove = false) {
const subscriptionId = nextSubscriptionId++;
const { skipInitFetch } = _options;
@@ -339,12 +354,7 @@ export default class Contract {
return this._api.eth
.getFilterLogs(filterId)
.then((logs) => {
const result = callback(null, this.parseEventLogs(logs));
if (autoRemove && !result) {
this.unsubscribe(subscriptionId);
}
this._sendData(subscriptionId, null, this.parseEventLogs(logs));
this._subscribeToChanges();
return subscriptionId;
});
@@ -448,17 +458,11 @@ export default class Contract {
return;
}
let result = false;
try {
result = subscriptions[subscriptionId].callback(null, this.parseEventLogs(logs));
this.sendData(subscriptionId, null, this.parseEventLogs(logs));
} catch (error) {
console.error('_sendSubscriptionChanges', error);
}
if (subscriptions[subscriptionId].autoRemove && !result) {
this.unsubscribe(subscriptionId);
}
});
})
.catch((error) => {