Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(web3-errors): the undefined data in Eip838ExecutionError #6905

Merged
merged 7 commits into from
Jul 11, 2024
Merged

fix(web3-errors): the undefined data in Eip838ExecutionError #6905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
544902a
fix(web3-errors): handle the undefined data in Eip838ExecutionError c…
Alfxjx Mar 16, 2024
b9c6117
Merge branch '4.x' into fix-6433
Alfxjx Mar 17, 2024
4d0b9b0
doc: update changelog
Alfxjx Mar 25, 2024
933acc2
Merge branch '4.x' into fix-6433
Muhammad-Altabba Apr 9, 2024
7a01984
Update CHANGELOG.md
jdevcs Jul 11, 2024
47b906b
Update CHANGELOG.md
jdevcs Jul 11, 2024
88a3793
Merge branch 'junaid/eip838fix' into fix-6433
jdevcs Jul 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/web3-errors/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,4 +172,4 @@ Documentation:

- Added `InvalidIntegerError` error for fromWei and toWei (#7052)

## [Unreleased]
## [Unreleased]
2 changes: 1 addition & 1 deletion packages/web3-errors/src/errors/contract_errors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ export class Eip838ExecutionError extends Web3ContractError {
// error.data, error.data.data or error.data.originalError.data (https://github.com/web3/web3.js/issues/4454#issuecomment-1485953455)
if (typeof error.data === 'object') {
let originalError: { data: string };
if ('originalError' in error.data) {
if (error.data && 'originalError' in error.data) {
jdevcs marked this conversation as resolved.
Show resolved Hide resolved
originalError = error.data.originalError;
} else {
// Ganache has no `originalError` sub-object unlike others
Expand Down
11 changes: 11 additions & 0 deletions packages/web3-errors/test/unit/__snapshots__/errors.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,17 @@ exports[`errors Eip838ExecutionError should get the data from error.data.origina
}
`;

exports[`errors Eip838ExecutionError should return correctly when data is undefined 1`] = `
{
"cause": undefined,
"code": undefined,
"data": undefined,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The code was already working when data is undefined. But it does not work when data is null. So, could you please update the tests?
Thanks,

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok I will look into it and fix.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @Alfxjx ,
Just to clarify that your code looks great! And what I proposed to update is only your tests. That is to test with null instead of undefined. Please, let me know if you need any help to finish this.
Thanks,

"innerError": undefined,
"message": "Error",
"name": "Eip838ExecutionError",
}
`;

exports[`errors InvalidConnectionError should have valid json structure 1`] = `
{
"cause": undefined,
Expand Down
7 changes: 7 additions & 0 deletions packages/web3-errors/test/unit/errors.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,13 @@ describe('errors', () => {
} as JsonRpcError<contractErrors.ProviderErrorData>).toJSON(),
).toMatchSnapshot();
});
it('should return correctly when data is undefined', () => {
expect(
new contractErrors.Eip838ExecutionError({
data: undefined,
} as JsonRpcError<contractErrors.ProviderErrorData>).toJSON(),
).toMatchSnapshot();
});
});

describe('ResponseError', () => {
Expand Down