From a27cfcba0f0a87d038331fa1b73dc94806c64648 Mon Sep 17 00:00:00 2001 From: tecnovert Date: Sun, 31 Jan 2021 10:15:37 +0200 Subject: [PATCH] tests: Reduce test amounts. --- basicswap/basicswap.py | 2 +- tests/basicswap/test_xmr.py | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/basicswap/basicswap.py b/basicswap/basicswap.py index f0777c3..0db6c61 100644 --- a/basicswap/basicswap.py +++ b/basicswap/basicswap.py @@ -4129,7 +4129,7 @@ class BasicSwap(BaseApp): self.log.error(error_msg) str_error = str(ex) - if num_retries < 5 and 'not enough unlocked money' in str_error or 'transaction was rejected by daemon' in str_error: + if num_retries < 5 and ('not enough unlocked money' in str_error or 'transaction was rejected by daemon' in str_error): delay = random.randrange(self.min_delay_retry, self.max_delay_retry) self.log.info('Retrying sending xmr swap chain B lock tx for bid %s in %d seconds', bid_id.hex(), delay) self.createEventInSession(delay, EventTypes.SEND_XMR_SWAP_LOCK_TX_B, bid_id, session) diff --git a/tests/basicswap/test_xmr.py b/tests/basicswap/test_xmr.py index 89182d9..18d4190 100644 --- a/tests/basicswap/test_xmr.py +++ b/tests/basicswap/test_xmr.py @@ -576,12 +576,17 @@ class Test(unittest.TestCase): logging.info('---------- Test Multiple concurrent swaps') swap_clients = self.swap_clients - amt_1 = make_int(random.uniform(0.001, 100.0), scale=8, r=1) - amt_2 = make_int(random.uniform(0.001, 100.0), scale=8, r=1) + js_w0_before = json.loads(urlopen('http://127.0.0.1:1800/json/wallets').read()) + js_w1_before = json.loads(urlopen('http://127.0.0.1:1801/json/wallets').read()) + + amt_1 = make_int(random.uniform(0.001, 49.0), scale=8, r=1) + amt_2 = make_int(random.uniform(0.001, 49.0), scale=8, r=1) rate_1 = make_int(random.uniform(80.0, 110.0), scale=12, r=1) rate_2 = make_int(random.uniform(0.01, 0.5), scale=12, r=1) + logging.info('amt_1 {}, rate_1 {}'.format(amt_1, rate_1)) + logging.info('amt_2 {}, rate_2 {}'.format(amt_2, rate_2)) offer1_id = swap_clients[0].postOffer(Coins.BTC, Coins.XMR, amt_1, rate_1, amt_1, SwapTypes.XMR_SWAP) offer2_id = swap_clients[0].postOffer(Coins.PART, Coins.XMR, amt_2, rate_2, amt_2, SwapTypes.XMR_SWAP) @@ -620,6 +625,14 @@ class Test(unittest.TestCase): wait_for_none_active(delay_event, 1800) wait_for_none_active(delay_event, 1801) + js_w0_after = json.loads(urlopen('http://127.0.0.1:1800/json/wallets').read()) + js_w1_after = json.loads(urlopen('http://127.0.0.1:1801/json/wallets').read()) + logging.info('[rm] js_w0_after {}'.format(json.dumps(js_w0_after, indent=4))) + logging.info('[rm] js_w1_after {}'.format(json.dumps(js_w1_after, indent=4))) + + assert(make_int(js_w1_after['2']['balance'], scale=8, r=1) - (make_int(js_w1_before['2']['balance'], scale=8, r=1) + amt_1) < 1000) + + def test_07_revoke_offer(self): logging.info('---------- Test offer revocaction') swap_clients = self.swap_clients