Merge #3863 from ethcore/jg-contract-subid

Store subscriptionId, align with main subscription model
This commit is contained in:
Jannis Redmann 2016-12-15 18:14:33 +01:00 committed by GitHub
commit 5939575c87

View File

@ -342,7 +342,8 @@ export default class Contract {
options: _options, options: _options,
autoRemove, autoRemove,
callback, callback,
filterId filterId,
id: subscriptionId
}; };
if (skipInitFetch) { if (skipInitFetch) {
@ -452,13 +453,13 @@ export default class Contract {
}) })
) )
.then((logsArray) => { .then((logsArray) => {
logsArray.forEach((logs, subscriptionId) => { logsArray.forEach((logs, index) => {
if (!logs || !logs.length) { if (!logs || !logs.length) {
return; return;
} }
try { try {
this._sendData(subscriptionId, null, this.parseEventLogs(logs)); this._sendData(subscriptions[index].id, null, this.parseEventLogs(logs));
} catch (error) { } catch (error) {
console.error('_sendSubscriptionChanges', error); console.error('_sendSubscriptionChanges', error);
} }