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

Tidy up apitest #5024

Merged
merged 12 commits into from
Jan 1, 2021
Merged

Tidy up apitest #5024

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
32e9bd2
Delete unused method
ghubstan Dec 28, 2020
3bbf1e0
Add convenience method to convert enum[] to comma delimited string
ghubstan Dec 28, 2020
1f99192
Make visible to subclasses
ghubstan Dec 28, 2020
bcc7216
Fix tmp file deletion bug
ghubstan Dec 28, 2020
2f7f146
Replace junit with jupiter asserts
ghubstan Dec 28, 2020
25fbd35
Merge branch 'master' into 01-misc
ghubstan Dec 28, 2020
651e772
Merge branch 'master' into 01-misc
ghubstan Dec 29, 2020
9250845
Explain why balance asserts are checking a range, not one value
ghubstan Dec 29, 2020
6594d14
Refactor wallet test fixtures into util
ghubstan Dec 29, 2020
206364d
Reduce some trade test wait times
ghubstan Dec 29, 2020
81371d4
Merge branch 'master' into 01-misc
ghubstan Dec 31, 2020
f8cf109
Fix CLI --help formatting bugs
ghubstan Dec 31, 2020
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
14 changes: 7 additions & 7 deletions apitest/src/test/java/bisq/apitest/method/wallet/BtcWalletTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ public void testInitialBtcBalances(final TestInfo testInfo) {
// Bob & Alice's regtest Bisq wallets were initialized with 10 BTC.

BtcBalanceInfo alicesBalances = getBtcBalances(alicedaemon);
log.info("{} Alice's BTC Balances:\n{}", testName(testInfo), formatBtcBalanceInfoTbl(alicesBalances));
log.debug("{} Alice's BTC Balances:\n{}", testName(testInfo), formatBtcBalanceInfoTbl(alicesBalances));

BtcBalanceInfo bobsBalances = getBtcBalances(bobdaemon);
log.info("{} Bob's BTC Balances:\n{}", testName(testInfo), formatBtcBalanceInfoTbl(bobsBalances));
log.debug("{} Bob's BTC Balances:\n{}", testName(testInfo), formatBtcBalanceInfoTbl(bobsBalances));

assertEquals(INITIAL_BTC_BALANCES.getAvailableBalance(), alicesBalances.getAvailableBalance());
assertEquals(INITIAL_BTC_BALANCES.getAvailableBalance(), bobsBalances.getAvailableBalance());
Expand All @@ -80,7 +80,7 @@ public void testFundAlicesBtcWallet(final TestInfo testInfo) {
// New balance is 12.5 BTC
assertEquals(1250000000, btcBalanceInfo.getAvailableBalance());

log.info("{} -> Alice's Funded Address Balance -> \n{}",
log.debug("{} -> Alice's Funded Address Balance -> \n{}",
testName(testInfo),
formatAddressBalanceTbl(singletonList(getAddressBalance(alicedaemon, newAddress))));

Expand All @@ -92,7 +92,7 @@ public void testFundAlicesBtcWallet(final TestInfo testInfo) {
1250000000,
0);
verifyBtcBalances(alicesExpectedBalances, btcBalanceInfo);
log.info("{} -> Alice's BTC Balances After Sending 2.5 BTC -> \n{}",
log.debug("{} -> Alice's BTC Balances After Sending 2.5 BTC -> \n{}",
testName(testInfo),
formatBtcBalanceInfoTbl(btcBalanceInfo));
}
Expand Down Expand Up @@ -134,9 +134,9 @@ public void testAliceSendBTCToBob(TestInfo testInfo) {
log.debug("{} Bob's BTC Balances:\n{}",
testName(testInfo),
formatBtcBalanceInfoTbl(bobsBalances));
// We cannot (?) predict the exact tx size and calculate how much in tx fees were
// deducted from the 5.5 BTC sent to Bob, but we do know Bob should have something
// between 15.49978000 and 15.49978100 BTC.
// The sendbtc tx weight and size randomly varies between two distinct values
Copy link
Member

Choose a reason for hiding this comment

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

I assume this is a 1 byte difference in address length that is allowed.

// (876 wu, 219 bytes, OR 880 wu, 220 bytes) from test run to test run, hence
// the assertion of an available balance range [1549978000, 1549978100].
assertTrue(bobsBalances.getAvailableBalance() >= 1549978000);
assertTrue(bobsBalances.getAvailableBalance() <= 1549978100);
}
Expand Down