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

Jump to bottom

Add LongRunningTradesTest to apitest #5303

Merged
merged 17 commits into from Mar 19, 2021
Merged

Add LongRunningTradesTest to apitest #5303

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
5c097d3
Adjust protos for takeoffer error handing
ghubstan Mar 10, 2021
067a5c7
Inject CoreContext into OpenOfferManager, adjust test
ghubstan Mar 10, 2021
d0590d9
Adjust grpc & core services to new takeoffer error handling
ghubstan Mar 10, 2021
697cf66
Convert AvailabilityResult to error msg when takeoffer fails
ghubstan Mar 10, 2021
d4d989d
Add missing grpc exception catch blocks
ghubstan Mar 10, 2021
48ecb5b
Derive AvailabilityResult from Task errorMessage
ghubstan Mar 10, 2021
4a68773
Merge branch 'master' into 01-fix-takeoffer-err-handling
ghubstan Mar 14, 2021
64d4c31
Avoid NPE due to null fee while wrapping tx in TxInfo
ghubstan Mar 14, 2021
1f28fc6
Add LongRunningTradesTest
ghubstan Mar 14, 2021
bc6c176
Print trade info to console after successful trade
ghubstan Mar 14, 2021
1d56d79
Refactor takeoffer reply proto & ErrorMessageHandler
ghubstan Mar 15, 2021
98c6a8e
Merge branch '01-fix-takeoffer-err-handling' into 02-modify-txinfo
ghubstan Mar 15, 2021
a2b2313
Merge branch '02-modify-txinfo' into 03-add-long-running-trade-test
ghubstan Mar 15, 2021
10e7217
Add convenience (get all offers, both directions), and make sorter pu…
ghubstan Mar 15, 2021
588541e
Add bot convenience: getMyOffersSortedByDate(String currencyCode)
ghubstan Mar 15, 2021
8783889
Fix api getfundingaddresses bug
ghubstan Mar 15, 2021
dc4f730
Validate paymentAccountId in createAndPlaceOffer
ghubstan Mar 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion core/src/main/java/bisq/core/api/CoreOffersService.java
View file
Open in desktop
Expand Up @@ -157,13 +157,16 @@ void createAndPlaceOffer(String currencyCode,
coreWalletsService.verifyEncryptedWalletIsUnlocked();
offerUtil.maybeSetFeePaymentCurrencyPreference(makerFeeCurrencyCode);

PaymentAccount paymentAccount = user.getPaymentAccount(paymentAccountId);
if (paymentAccount == null)
throw new IllegalArgumentException(format("payment account with id %s not found", paymentAccountId));

String upperCaseCurrencyCode = currencyCode.toUpperCase();
String offerId = createOfferService.getRandomOfferId();
Direction direction = Direction.valueOf(directionAsString.toUpperCase());
Price price = Price.valueOf(upperCaseCurrencyCode, priceStringToLong(priceAsString, upperCaseCurrencyCode));
Coin amount = Coin.valueOf(amountAsLong);
Coin minAmount = Coin.valueOf(minAmountAsLong);
PaymentAccount paymentAccount = user.getPaymentAccount(paymentAccountId);
Coin useDefaultTxFee = Coin.ZERO;
Offer offer = createOfferService.createAndGetOffer(offerId,
direction,
Expand Down