Let API user set currencies in some payment account json forms #5685
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
Some i18n property values can be used by the API if long strings are wrapped before written as commments to json payment account forms, or written to the CLI console. This change anticipates the addition of the more complex Swift payment method (PR 5672). PR 5672's i18n property value for key "payment.swift.info" will be wrapped and appended to the comments of the Swift payment account's json form.
Several payment methods support multiple trade currencies and a selected trade currency, but the api's payment account creation has not let CLI users specify them in the json form passed to the `createpaymentacct` command. This change adds `tradeCurrencies` and `selectedTradeCurrency` fields to the appropriate json forms.
Define and verify trade currencies and selected trade currency values in appropriate api test cases, and add test cases for new payment methods.
Method was added on the false assumption `PaymentAccount#hasMultipleCurrencies()` would not always return a correct value when a `PaymentAccount` instance is created via reflection. But `hasMultipleCurrencies()` will work as long as appropriate PaymentAccount subclasses continue setting their `tradeCurrencies` fields within their default constructors.
sqrrm
reviewed
Sep 16, 2021
core/src/main/java/bisq/core/api/model/PaymentAccountTypeAdapter.java
Outdated
Show resolved
Hide resolved
core/src/main/java/bisq/core/api/model/PaymentAccountTypeAdapter.java
Outdated
Show resolved
Hide resolved
apitest/src/test/java/bisq/apitest/method/payment/AbstractPaymentAccountTest.java
Show resolved
Hide resolved
ghubstan
added a commit
to ghubstan/bisq
that referenced
this pull request
Sep 16, 2021
ghubstan
added a commit
to ghubstan/bisq
that referenced
this pull request
Sep 16, 2021
This was referenced Sep 21, 2021
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.
Several payment methods support multiple trade currencies and a selected trade currency, but the API has not let CLI users specify them in the json form passed to the
createpaymentacctcommand.This change adds
tradeCurrenciesandselectedTradeCurrencyfields to the appropriate json forms.Summary of changes:
Added support for reading/writing trade currency info from/to json forms to
PaymentAccountTypeAdapter.Added new boolean convenience methods to
PaymentAccountto aid in correctly defining and validating pay account json from currency lists and selections.Adjusted
CorePaymentAccountsService,CreateOfferServiceMutableOfferDataModel,MutableOfferView,MutableOfferViewModel,TakeOfferDataModeltoPaymentAccountrefactoring.Added
Res # List<String> getWrappedAsList(String key, int wrapLength)andUtilities # List<String> toListOfWrappedStrings(String s, int wrapLength)to convert long, multi-line i18n strings to wrapped strings the API can use.Added constants to apitest's
AbstractPaymentAccountTestfor newSwiftAccounttest case to be added after PR 5672 is merged.Added asserts to existing
CreatePaymentAccountTestcases: check new account instances'tradeCurrenciesandselectedTradeCurrencyfield values written to payment account creation json forms.Added new
CreatePaymentAccountTestcases, including commented out casetestCreateSwiftAccount-- in anticipation of the new Swift payment method merge.Added
apitest/src/test/resources/logback.xmlfor configuring apitest case logging.Removed dead/commented code in some of the touched classes.
Based on branch
detault-api-testharness-callrate-config, which was merged earlier today in PR 5683