From 5a0263ba5ef3491347a274e9e156e5eb508985e1 Mon Sep 17 00:00:00 2001 From: tecnovert Date: Sat, 30 Jan 2021 18:23:04 +0200 Subject: [PATCH] tests: Fix persistent test xmr chain. --- basicswap/basicswap.py | 2 +- tests/basicswap/extended/test_xmr_persistent.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/basicswap/basicswap.py b/basicswap/basicswap.py index e97b4ea..f0777c3 100644 --- a/basicswap/basicswap.py +++ b/basicswap/basicswap.py @@ -4116,8 +4116,8 @@ class BasicSwap(BaseApp): return if bid.debug_ind == DebugTypes.CREATE_INVALID_COIN_B_LOCK: - self.log.debug('XMR bid %s: Debug %d - Reducing lock b txn amount by 10%%.', bid_id.hex(), bid.debug_ind) bid.amount_to -= int(bid.amount_to * 0.1) + self.log.debug('XMR bid %s: Debug %d - Reducing lock b txn amount by 10%% to %s.', bid_id.hex(), bid.debug_ind, ci_to.format_amount(bid.amount_to)) self.logBidEvent(bid, EventLogTypes.DEBUG_TWEAK_APPLIED, 'ind {}'.format(bid.debug_ind), session) try: b_lock_tx_id = ci_to.publishBLockTx(xmr_swap.pkbv, xmr_swap.pkbs, bid.amount_to, xmr_offer.b_fee_rate) diff --git a/tests/basicswap/extended/test_xmr_persistent.py b/tests/basicswap/extended/test_xmr_persistent.py index f71de7d..a2d2753 100644 --- a/tests/basicswap/extended/test_xmr_persistent.py +++ b/tests/basicswap/extended/test_xmr_persistent.py @@ -250,11 +250,11 @@ class Test(unittest.TestCase): wallets = json.loads(urlopen('http://127.0.0.1:{}/json/wallets'.format(UI_PORT + 1)).read()) - xmr_addr1 = wallets['6']['deposit_address'] + self.xmr_addr = wallets['6']['deposit_address'] num_blocks = 100 if callrpc_xmr_na(XMR_BASE_RPC_PORT + 1, 'get_block_count')['count'] < num_blocks: - logging.info('Mining {} Monero blocks to {}.'.format(num_blocks, xmr_addr1)) - callrpc_xmr_na(XMR_BASE_RPC_PORT + 1, 'generateblocks', {'wallet_address': xmr_addr1, 'amount_of_blocks': num_blocks}) + logging.info('Mining {} Monero blocks to {}.'.format(num_blocks, self.xmr_addr)) + callrpc_xmr_na(XMR_BASE_RPC_PORT + 1, 'generateblocks', {'wallet_address': self.xmr_addr, 'amount_of_blocks': num_blocks}) logging.info('XMR blocks: %d', callrpc_xmr_na(XMR_BASE_RPC_PORT + 1, 'get_block_count')['count']) self.btc_addr = callbtcrpc(0, 'getnewaddress', ['mining_addr', 'bech32'])