Fix payment account deserialize issue (e.g. CHASE_QUICK_PAY) #5614
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ghost
mentioned this pull request
ripcurlx
reviewed
Jul 12, 2021
| @@ -132,6 +132,7 @@ public static UserPayload fromProto(protobuf.UserPayload proto, CoreProtoResolve | |||
| ProtoUtil.stringOrNullFromProto(proto.getAccountId()), | |||
| proto.getPaymentAccountsList().isEmpty() ? new HashSet<>() : new HashSet<>(proto.getPaymentAccountsList().stream() | |||
| .map(e -> PaymentAccount.fromProto(e, coreProtoResolver)) | |||
| .filter(e -> e != null) | |||
There was a problem hiding this comment.
Suggested change
| .filter(e -> e != null) | |
| .filter(Objects::nonNull) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #5613
When loading payment accounts which have been deprecated, an exception is thrown which is not handled. This causes the entire set of payment accounts to be lost.
To fix this we check for an exception when deserializing a payment account, and log a warning with the details. The erroneous payment account will therefore be dropped from the list, which is what is expected.
I tested using the following procedure on both regtest & mainnet Bisq.
Testing:
Check that a log warning is written, like this:
(It will actually be logged 2 times since UserPreferences deserializes 2 times).