Commit Graph

423 Commits

Author SHA1 Message Date
ghubstan
82a0f0060c
Adjust to grpc.proto TradeInfo field name changes
See commit b9b66b4826.
2022-02-27 18:13:54 -03:00
Stan
1499465c11
Merge branch 'master' into 7-more-grpcproto-comments 2022-02-25 20:46:05 -03:00
ghubstan
5e754a25a1
Fix comment 2022-02-24 08:28:36 -03:00
ghubstan
dd7d803053
Fix BSQ swap description of BTC price for 1 BSQ 2022-02-23 19:44:25 -03:00
ghubstan
2febe6b327
Adjust apitest cases to new .proto *Pct field names 2022-02-20 15:22:40 -03:00
ghubstan
543c573998
Adjust apitest cases to TradeInfo .proto's price & volume type change 2022-02-19 15:17:38 -03:00
ghubstan
15f75eea3d
Add some asserts on volume/min-volume strings from server 2022-02-18 16:49:51 -03:00
ghubstan
2af3ac22a3
Adjust to string triggerPrice change in API test cases 2022-02-18 11:25:18 -03:00
ghubstan
18888f4d7a
Fix 'unnecessary use of fully qualified name'. 2022-02-17 18:30:27 -03:00
ghubstan
1d70b1bb5f
Adjust apitest cases to OfferInfo.price proto field type to string 2022-02-17 18:18:54 -03:00
ghubstan
135a42ba45
Delete deprecated CLI console output formatting classes
The new console output formatting (tbl) api is working, and the
deprecated classes just add maintenance work.

Update affected test cases.
2022-02-17 15:00:52 -03:00
ghubstan
210d966702
Fix method name 2022-01-25 12:12:07 -03:00
ghubstan
fd0c4c2794
Add BsqSwapSellBtcTradeTest 2022-01-23 17:09:34 -03:00
ghubstan
2db20c0df1
Split BsqSwap tests into "buy" and "sell" tests 2022-01-23 17:08:49 -03:00
ghubstan
0ec095220b
Remove trailing spaces 2022-01-20 15:06:06 -03:00
ghubstan
a5857e26f6
Re-set log level to INFO in apitest cases 2022-01-18 13:04:10 -03:00
ghubstan
3cd1e05a9f
Try to display accurate status of closed trades, or "Pending" if still open 2022-01-18 13:01:42 -03:00
ghubstan
7690ffd953
Add API methods 'failtrade', 'unfailtrade'
Prerequisite for next PR: Add API method 'gettrades'

The `gettrades` method will show 'open', 'closed', and 'failed' trades.
Users already needed to be able to fail and unfail trades for the
same reasons they do in the UI.  API test cases will need to be able to
fail and unfail trades to check correct behavior of 'gettrades' method.

Based on branch `rename-keepfunds2closetrade`.
2022-01-07 19:11:34 -03:00
ghubstan
905841b2b2
Adjust api beta test guide to new closetrade cmd 2022-01-05 12:19:36 -03:00
ghubstan
a9aaba87fa
Rename API method keepfunds -> closetrade
Trade proceeds and deposits have already been transfered to Bisq wallets
before the `keepfunds` command is (was) executed;  `keepfunds` merely moves
open trades to closed trades lists and persistence files.  Renaming `keepfunds`
as `closetrade` makes its purpose clear to API users.

The commit modifies only method names and comments in api server+cli classes,
apitest cases, and api trade simulation scripts.

Based on `master`
2022-01-05 12:10:46 -03:00
ghubstan
5a390fa359
Document 'createcryptopaymentacct' in API beta-test guide 2021-12-27 13:45:16 -03:00
ghubstan
cb4df2b1c3
Rename CLI opt '--payment-account' -> '--payment-account-id'
Adjust related docs and scripts.
2021-12-27 13:10:16 -03:00
Stan
53d693d710
Merge branch 'master' into 7-deprecate-api-getmyoffer 2021-12-27 12:09:22 -03:00
ghubstan
5f571cccca
Deprecate API 'getmyoffer'
The method 'getoffer' should support looking up a user's open-offers, and other users' available offers.

- Adjust api-beta-test-guide.md to use only 'getoffer'.
- Adjust trade simulation scripts to use only 'getoffer'.
- Adjust api testcases to use 'getoffer' in place of 'getmyoffer'.
- Mark appropriate methods and protobuf msgs as deprecated.
2021-12-27 12:05:17 -03:00
Christoph Atteneder
23d1856a60
Merge pull request #5852 from ghubstan/create-swift-acct-with-api
Support and test creation of Swift accounts via API
2021-12-20 11:49:20 +01:00
ghubstan
0f32fe2fc3
Merge branch '5-api-bsqswap-simulation-n-docs-update' into 6-api-xmr-trading 2021-12-03 13:16:26 -03:00
ghubstan
bb68605c69
Add missing --currency-code=bsq param to createoffer example
Resolves issue mentioned in https://github.com/bisq-network/bisq/pull/5876#pullrequestreview-822692137
2021-12-03 12:13:33 -03:00
ghubstan
104f11acaa
Do not run 2x from gradle terminal cmd
Method tests are combined in scenario pkg tests to reduce test
harness startup/shutdown time.
2021-12-02 19:50:18 -03:00
ghubstan
e2647af6b5
Add a few more checks on editedOffer.getUseMarketBasedPrice() 2021-12-02 19:40:58 -03:00
ghubstan
f867f6beb3
Add new regtest apitest/scripts/trade-xmr-simulation.sh 2021-12-02 19:18:24 -03:00
ghubstan
743ef93750
Test API XMR support 2021-12-02 19:11:29 -03:00
ghubstan
3015554f9a
Adjust API beta-test guide for BSQ swaps 2021-11-29 13:14:56 -03:00
ghubstan
a1db0d10b0
Update API docs for Bitcoin Core version v22.0
Plus some outdated JDK version compat comments.
2021-11-29 12:43:58 -03:00
ghubstan
8b2dec7a55
Remove unused function outputs 2021-11-28 16:37:41 -03:00
ghubstan
1b7e43a874
Add apitest/scripts/bsqswap-simulation.sh script
Some refactoring and typo corrections in existing scripts too.
2021-11-28 16:12:02 -03:00
ghubstan
000fe9b991
Test blocking attempts to edit BsqSwap offers on server 2021-11-27 14:02:11 -03:00
ghubstan
15621d42a9
Re-@Disable method tests (don't run 2x from gradle) 2021-11-25 18:19:12 -03:00
ghubstan
3077be54f0
Remove API createoffer's paymentAcctId request param (BSQ swap) 2021-11-25 16:12:05 -03:00
ghubstan
00a5e2b650
Merge branch 'master' into 2-refactor-api-bsqswap-support 2021-11-25 14:33:48 -03:00
Christoph Atteneder
7727776453
Add official Java 15 support 2021-11-25 10:50:03 +01:00
ghubstan
6403fc1f81
Adjust apitest cases to rpc BSQ wwap related changes 2021-11-24 13:12:48 -03:00
ghubstan
b65cc9c1f4
Merge branch 'master' into 1-basic-api-bsqswap-support 2021-11-23 17:02:49 -03:00
chimp1984
cb474c57da
Rename getPaymentMethodById to getPaymentMethod 2021-11-23 00:40:59 +01:00
ghubstan
c3d5fdd9a2
Uncomment API's create swift acct test 2021-11-22 12:09:10 -03:00
ghubstan
4ca878a8e1
Adjust API 'gettrade' for Bsq swaps
- Made several adjustments to CLI's 'gettrade' output related code
  so it can show single trade details for either Bisq v1 trades, or
  BSQ swap trades.

- Did minor refactoring of API's core to retrieve # tx confirmations
  for an addresses and transactions.

- Show # of tx confirmations in bsq swap trade detail.
2021-11-14 13:48:12 -03:00
ghubstan
564303ac20
Normalize API gRPC bsq-swap related protos & wrappers
This commit refactors the first cut of the BsqSwapTradeInfo and
TradeInfo gRPC proto defs and wrappers.  The change avoids duplication
of fields between BsqSwapTradeInfo and TradeInfo, and adds a
bsqSwapTradeInfo field to the old TradeInfo proto & wrapper.

The immediate goal is moving towards getting the API's 'gettrade'
method to work for both Bisq v1 trades and BSQ swap trades:  the TradeInfo
proto sent to the CLI should represent either a Bisq v1 trade or a BSQ
swap trade.  A mid-term term goal is to also make a new 'gettrades' method
return a List<TradeInfo> to the CLI, where items in the List<TradeInfo>
can be either v1 trades or bsq-swap trades.
2021-11-12 18:48:35 -03:00
ghubstan
c5f50b53e4
Paritally adjust bsq-swap-offer related apitest cases
- Adjust to removal of BsqSwapOfferInfo proto, use ammended OfferInfo instead.
- Remove currency-code param from all get(My)BsqSwapOffer(s) requests.
2021-11-11 13:24:45 -03:00
ghubstan
4f1899265f
Fix conflicts from previous master/merge 2021-11-09 09:48:33 -03:00
ghubstan
20cc085dc8
Merge branch 'master' into 02-cli-console-formatting-api 2021-11-09 09:20:06 -03:00
ghubstan
ec09d39832
Adjust apitest cases to new CLI console output api 2021-11-07 14:00:52 -03:00
ghubstan
eb234bf93a
Remove apitest's create bsq-swap account method
If not present, a default BSQ swap account is saved when a User object
is initialized.  Use the existing default account in API bsq-swap test
cases, and rename the legacy BSQ payment account fixtures to distinguish
them from the new default 'BSQ Swap' payment account.
2021-11-05 13:59:41 -03:00
chimp1984
aad658fc94
Add api test, Cleanup 2021-11-04 12:48:07 +01:00
chimp1984
d5d3a85bfb
Apply patch from @ghubstan 2021-11-02 16:18:50 +01:00
chimp1984
2f5c644aa3
Apply patch from @ghubstan 2021-11-02 16:18:50 +01:00
chimp1984
8ee8cba668
Apply patch from ghubstan
Remove currency params. Bsq swaps have statically defined currencies (BSQ/BTC).
2021-11-02 16:18:50 +01:00
chimp1984
74789b1cc5
Move Utilities.objectToJson to JsonUtil.objectToJson
Move inner class AnnotationExclusionStrategy to JsonUtil
Next commit includes changes why that move to core is needed.
2021-11-02 16:18:50 +01:00
chimp1984
f7fcaa915e
Add BSQ swap code 2021-11-02 16:18:50 +01:00
chimp1984
54f17b00af
Cleanups 2021-10-21 17:44:48 +02:00
chimp1984
611b944609
Move protobuf OfferPayload.Direction to OfferDirection 2021-10-21 15:40:25 +02:00
chimp1984
88198be7ff
Rename availableConfirmedBalance to availableBalance
It does not include only confirmed txs as we include
the unconfirmed own change outputs.
2021-10-20 13:25:29 +02:00
chimp1984
777287af95
Cleanups, refromatting, add final qualifier 2021-10-20 11:58:04 +02:00
chimp1984
d42242762f
Move Trade to bisq.core.trade.model.bisq_v1 package 2021-10-20 11:58:04 +02:00
Christoph Atteneder
d0dd91906d
Merge pull request #5708 from ghubstan/close-bobs-trade-in-api-trade-simulator
Call 'keepfunds' (close trade) on both sides of trade simulation
2021-09-27 11:19:03 +02:00
ghubstan
41f55b0650
Add custom bisq.properties to API test harness
This change adds a bisq.properties file to apitest/src/main/resources,
and makes sure it is copied to regtest/dev bisq instances' app data dirs
before they are started.  By default it is empty, but can be used to
override default BisqApp options during ad-hoc testing.

The change was necessary because the core's bisq.properties resource is
not copied to test harness bisq instance's regtest data dirs during a normal
build.
2021-09-22 18:40:57 -03:00
ghubstan
bfff30bcdd
Call 'keepfunds' (close trade) on both sides of trade simulation 2021-09-20 12:09:38 -03:00
ghubstan
429e943a36
Add TODO commment above placeholder for future swift test
Resolves https://github.com/bisq-network/bisq/pull/5685#discussion_r710005619.
2021-09-16 08:57:31 -03:00
ghubstan
343b14ec0a
Set apitest test case log level to INFO 2021-09-07 11:34:48 -03:00
ghubstan
ab929d4435
Remove spurious PaymentAccount#canSupportMultipleCurrencies()
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.
2021-09-07 11:31:56 -03:00
ghubstan
1adde70c7a
Do pay acct ccy checks, add tests, anticipate swift pay method
Define and verify trade currencies and selected trade currency values
in appropriate api test cases, and add test cases for new payment methods.
2021-09-06 12:27:39 -03:00
ghubstan
8a42109a7a
Override/disable gRPC call rate meters in test harness driver
Ad-hoc API testers need to be able to run the test harness without
interference from the production api method call rate meters.
This change overrides and disables most call rate meters when the
test harness is run from the ApiTestMain driver (no jupiter tests).
2021-09-02 15:37:50 -03:00
ghubstan
4a69b89dc7
Put ratemeters.json in resources/data dirs before they are copied to build dirs
This fixes an inconsistency in the scaffold setup.
2021-09-02 15:26:27 -03:00
ghubstan
7eb0a19651
Delete generated rate metering config files in cleanDaoSetup task 2021-09-02 15:20:32 -03:00
ghubstan
71a61c63da
Display Enabled=PENDING in CLI 'createoffer' output
A newly created offer has no OpenOffer+State (AVAILABLE || DEACTIVATED)
when displayed in the CLI's console.  This change adds a 'bool isMyPendingOffer'
to the OfferInfo proto + wrapper, and the CLI's console offer output formatter
uses it to determine if it should display a new offer's Enabled column value
as PENDING, instead of an ambiguous NO value.
2021-08-14 16:58:47 -03:00
ghubstan
95bbb41e51
Add missing trigger-price param 2021-07-30 12:02:18 -03:00
ghubstan
b4ee6dbc12
Do not start test harness deamons in dbg mode by default 2021-07-30 11:58:12 -03:00
ghubstan
b8379e2003
Merge branch 'master' into 05-update-api-beta-test-guide 2021-07-30 11:53:34 -03:00
Christoph Atteneder
0b5f8edb1e
Increase MaxRam setting to 8g 2021-07-19 20:51:13 +02:00
Christoph Atteneder
14d9ee493f
Update remaining Java max ram default settings 2021-07-19 15:48:26 +02:00
ghubstan
a4278a4147
Fix typo 'enabled' -> 'enable' 2021-07-13 10:32:35 -03:00
ghubstan
622f7e9add
Remove old TODO because relevant refactoring was approved 2021-07-12 11:39:53 -03:00
ghubstan
1992bcb1c0
Do not duplicate Price.parse on CLI side for only one use case 2021-07-12 11:34:37 -03:00
ghubstan
06efcdfcb9
Delete tmp main() method 2021-07-11 12:08:40 -03:00
Christoph Atteneder
e5765aeef2
Delay sending of payment account information during trade by @chimp1984
It also removes the op return from the multisig transaction
2021-06-28 09:47:52 +02:00
ghubstan
05f4f4dd80
Fix header 2021-06-19 13:35:40 -03:00
ghubstan
9703b87379
Document api 'editoffer' usage 2021-06-19 13:27:02 -03:00
ghubstan
7880a84a00
Add BSQ offer editing tests to EditOfferTest
And log CLI's getoffer output to see getoffer formatting -- after adding
new ENABLED and TRIGGER-PRICE columns.
2021-06-18 17:52:03 -03:00
ghubstan
a3ea4ecbf6
Avoid duplicate test run 2021-06-15 13:22:07 -03:00
ghubstan
bc1576efbc
Throw exception is edit altcoin offer is attempted
Support for editing BSQ offers is in place, but will be added
in another PR.
2021-06-15 13:13:52 -03:00
ghubstan
063b52eb70
Add editoffer test case, suppress annoying warnings 2021-06-15 11:39:06 -03:00
ghubstan
54efad097d
Fix codacy issue 2021-06-13 14:05:00 -03:00
ghubstan
05f3985447
Fix problems found in codacy check 2021-06-13 13:54:16 -03:00
ghubstan
9a5e2d0df1
Remove unused import 2021-06-13 13:12:45 -03:00
ghubstan
571568a5e5
Remove chase quickpay acct test 2021-06-13 13:10:41 -03:00
ghubstan
929b28cb8c
Add editoffer api tests & minor apitest refactoring 2021-06-13 13:00:27 -03:00
ghubstan
2b1a7aac82
Remove unsupported create CHASE_QUICK_PAY apitest case 2021-06-12 17:46:55 -03:00
ghubstan
984aac713d
Fix NetworkParameters.fromID( incorrect-arg -> correct-arg ) 2021-04-28 12:22:26 -03:00
ghubstan
38eee59375
Fix flaky tx fee rate validation test (api)
Min tx fee rates move fast, sometimes so low the validation test fails.
Try to consistently force validation error by setting fee rate=1.
2021-04-28 12:01:25 -03:00
ghubstan
81f345b9ea
Fix bsq wallet testcase setup (api)
Regtest btc block was not being generated, and chain download not triggered.
Also ajusted testGetUnusedBsqAddress() for upcoming segwit bsq changes.
2021-04-28 12:00:54 -03:00
ghubstan
cff5e8163e
Update apitest docs for bitcoin-core v0.21 compat
The test harness is compatible with bitcoin-core 0.19, 0.20, 0.21.

Also removed some unnecessary comments about registering dispute
agents in the test harness because it now happens by default.
2021-04-19 12:35:13 -03:00
ghubstan
2308afb41b
Adjust to changing minimum tx fee rates
- Append minFeeServiceRate to TxFeeRateInfo proto.
- Display min rate in CLI console.
- Fix broken test due to changing min fee rate.
2021-04-19 12:08:52 -03:00