Skip to content

Commit

Permalink
RippleAPI: Add data property to error object
Browse files Browse the repository at this point in the history
  • Loading branch information
Alan Cohen committed Sep 17, 2015
1 parent 778f59b commit 0c9aea4
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
11 changes: 8 additions & 3 deletions src/api/common/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ type Wrapper = (data: any) => any
function composeAsync(wrapper: Wrapper, callback: Callback): Callback {
return function(error, data) {
if (error) {
callback(error);
callback(error, data);
return;
}
let result;
Expand All @@ -66,10 +66,15 @@ function composeAsync(wrapper: Wrapper, callback: Callback): Callback {
};
}

function convertErrors(callback: () => void): () => void {
function convertErrors(callback: Callback): () => void {
return function(error, data) {
if (error && !(error instanceof errors.RippleError)) {
callback(new errors.RippleError(error));
const error_ = new errors.RippleError(error);
error_.data = data;
callback(error_, data);
} else if (error) {
error.data = data;
callback(error, data);
} else {
callback(error, data);
}
Expand Down
1 change: 1 addition & 0 deletions test/api-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ describe('RippleAPI', function() {
assert(false, 'Should throw RippleError');
}).catch(error => {
assert(error instanceof this.api.errors.RippleError);
assert(error.data);
});
});

Expand Down

0 comments on commit 0c9aea4

Please sign in to comment.