Merge pull request #17 from ethereum/master

fallback for go-ethereum && fixed parsing ethereum messages
This commit is contained in:
Marian OANCΞA 2015-02-22 22:52:04 +02:00
commit bfef6251b2
5 changed files with 8 additions and 6 deletions

3
dist/ethereum.js vendored
View File

@ -715,6 +715,7 @@ var outputParser = function (event) {
args: {}
};
output.topics = output.topic; // fallback for go-ethereum
if (!output.topic) {
return result;
}
@ -829,7 +830,7 @@ var filter = function(options, implementation, formatter) {
var filterId = implementation.newFilter(options);
var onMessages = function (messages) {
messages.forEach(function (message) {
messages = formatter ? formatter(message) : message;
message = formatter ? formatter(message) : message;
callbacks.forEach(function (callback) {
callback(message);
});

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -99,6 +99,7 @@ var outputParser = function (event) {
args: {}
};
output.topics = output.topic; // fallback for go-ethereum
if (!output.topic) {
return result;
}

View File

@ -76,7 +76,7 @@ var filter = function(options, implementation, formatter) {
var filterId = implementation.newFilter(options);
var onMessages = function (messages) {
messages.forEach(function (message) {
messages = formatter ? formatter(message) : message;
message = formatter ? formatter(message) : message;
callbacks.forEach(function (callback) {
callback(message);
});