midefos/basicswap
1
0
Fork 0
mirror of https://github.com/basicswap/basicswap.git synced 2025-11-05 18:38:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

scripts: Rename 'min_amount' to 'amount_step'.

Browse Source
This commit is contained in:
tecnovert
2024-10-08 23:04:42 +02:00
committed by tecnovert
parent 4117c461bb
commit 3f963f3329
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/createoffers.py
View File

@@ -31,7 +31,7 @@ Create offers
"enabled": Set to false to ignore offer template. "enabled": Set to false to ignore offer template.
"swap_type": Type of swap, defaults to "adaptor_sig" "swap_type": Type of swap, defaults to "adaptor_sig"
"min_swap_amount": Sets "amt_bid_min" on the offer, minimum valid bid when offer amount is variable. "min_swap_amount": Sets "amt_bid_min" on the offer, minimum valid bid when offer amount is variable.
"min_amount": If set offers will be created for amounts between "min_coin_from_amt" and "amount" in increments of "min_amount". "amount_step": If set offers will be created for amount values between "amount" and "min_coin_from_amt" in decrements of "amount_step".
}, },
... ...
], ],
@@ -168,7 +168,7 @@ def readConfig(args, known_coins):
num_changes += 1 num_changes += 1
offer_templates_map[offer_template['name']] = offer_template offer_templates_map[offer_template['name']] = offer_template
min_offer_amount: float = float(offer_template.get('min_amount', offer_template['amount'])) min_offer_amount: float = float(offer_template.get('amount_step', offer_template['amount']))
if float(offer_template.get('min_coin_from_amt', 0)) < min_offer_amount: if float(offer_template.get('min_coin_from_amt', 0)) < min_offer_amount:
print('Setting min_coin_from_amt for', offer_template['name']) print('Setting min_coin_from_amt for', offer_template['name'])
offer_template['min_coin_from_amt'] = min_offer_amount offer_template['min_coin_from_amt'] = min_offer_amount
@@ -330,7 +330,7 @@ def main():
continue continue
max_offer_amount: float = offer_template['amount'] max_offer_amount: float = offer_template['amount']
min_offer_amount: float = offer_template.get('min_amount', max_offer_amount) min_offer_amount: float = offer_template.get('amount_step', max_offer_amount)
wallet_balance: float = float(wallet_from['balance']) wallet_balance: float = float(wallet_from['balance'])
min_wallet_from_amount: float = float(offer_template['min_coin_from_amt']) min_wallet_from_amount: float = float(offer_template['min_coin_from_amt'])
if wallet_balance - min_offer_amount <= min_wallet_from_amount: if wallet_balance - min_offer_amount <= min_wallet_from_amount:

8
tests/basicswap/extended/test_scripts.py
View File

@@ -560,7 +560,7 @@ class Test(unittest.TestCase):
rv_stdout = result.stdout.decode().split('\n') rv_stdout = result.stdout.decode().split('\n')
''' '''
def test_offer_min_amount(self): def test_offer_amount_step(self):
waitForServer(self.delay_event, UI_PORT + 0) waitForServer(self.delay_event, UI_PORT + 0)
waitForServer(self.delay_event, UI_PORT + 1) waitForServer(self.delay_event, UI_PORT + 1)
@@ -587,9 +587,9 @@ class Test(unittest.TestCase):
} }
json_rv = read_json_api(UI_PORT + 1, 'wallets/xmr/withdraw', post_json) json_rv = read_json_api(UI_PORT + 1, 'wallets/xmr/withdraw', post_json)
assert (len(json_rv['txid']) == 64) assert (len(json_rv['txid']) == 64)
wait_for_balance(self.delay_event, f'http://127.0.0.1:{UI_PORT + 1}/json/wallets/xmr', 'balance', expect_balance) wait_for_balance(self.delay_event, f'http://127.0.0.1:{UI_PORT + 0}/json/wallets/xmr', 'balance', expect_balance)
xmr_wallet_balance = read_json_api(UI_PORT + 0, 'wallets/xmr')['balance'] xmr_wallet_balance = float(read_json_api(UI_PORT + 0, 'wallets/xmr')['balance'])
assert (xmr_wallet_balance > offer_min_amount) assert (xmr_wallet_balance > offer_min_amount)
assert (xmr_wallet_balance < offer_amount) assert (xmr_wallet_balance < offer_amount)
@@ -601,7 +601,7 @@ class Test(unittest.TestCase):
'coin_from': 'XMR', 'coin_from': 'XMR',
'coin_to': 'Particl', 'coin_to': 'Particl',
'amount': offer_amount, 'amount': offer_amount,
'min_amount': offer_min_amount, 'amount_step': offer_min_amount,
'minrate': 0.05, 'minrate': 0.05,
'amount_variable': True, 'amount_variable': True,
'address': -1, 'address': -1,