seasharp/basicswap_miserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests: Update swap type validation.

Browse Source
This commit is contained in:
tecnovert 2023-12-01 09:23:10 +02:00
parent 28baa597cc
commit 5b6f447692
No known key found for this signature in database
GPG Key ID: 8ED6D8750C4E3F93
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
basicswap/basicswap.py
View File

@ -1168,9 +1168,7 @@ class BasicSwap(BaseApp):
if swap_type == SwapTypes.XMR_SWAP: if swap_type == SwapTypes.XMR_SWAP:
reverse_bid: bool = self.is_reverse_ads_bid(coin_from) reverse_bid: bool = self.is_reverse_ads_bid(coin_from)
itx_coin = coin_to if reverse_bid else coin_from itx_coin = coin_to if reverse_bid else coin_from
if (itx_coin in self.coins_without_segwit): if (itx_coin in self.coins_without_segwit + self.scriptless_coins):
raise ValueError('Invalid swap type for: {} -> {}'.format(coin_from.name, coin_to.name))
if (coin_from in self.scriptless_coins and coin_to in self.scriptless_coins):
raise ValueError('Invalid swap type for: {} -> {}'.format(coin_from.name, coin_to.name)) raise ValueError('Invalid swap type for: {} -> {}'.format(coin_from.name, coin_to.name))
else: else:
if coin_from in self.adaptor_swap_only_coins or coin_to in self.adaptor_swap_only_coins: if coin_from in self.adaptor_swap_only_coins or coin_to in self.adaptor_swap_only_coins:

2
tests/basicswap/test_run.py
View File

@ -193,10 +193,10 @@ class Test(BaseTest):
(Coins.BTC, Coins.FIRO, SwapTypes.XMR_SWAP), (Coins.BTC, Coins.FIRO, SwapTypes.XMR_SWAP),
(Coins.FIRO, Coins.BTC, SwapTypes.SELLER_FIRST), (Coins.FIRO, Coins.BTC, SwapTypes.SELLER_FIRST),
(Coins.BTC, Coins.FIRO, SwapTypes.SELLER_FIRST), (Coins.BTC, Coins.FIRO, SwapTypes.SELLER_FIRST),
(Coins.FIRO, Coins.BTC, SwapTypes.XMR_SWAP),
] ]
should_fail = [ should_fail = [
(Coins.BTC, Coins.XMR, SwapTypes.SELLER_FIRST), (Coins.BTC, Coins.XMR, SwapTypes.SELLER_FIRST),
(Coins.FIRO, Coins.BTC, SwapTypes.XMR_SWAP),
(Coins.XMR, Coins.PART_ANON, SwapTypes.XMR_SWAP), (Coins.XMR, Coins.PART_ANON, SwapTypes.XMR_SWAP),
(Coins.FIRO, Coins.PART_ANON, SwapTypes.XMR_SWAP), (Coins.FIRO, Coins.PART_ANON, SwapTypes.XMR_SWAP),
(Coins.PART_ANON, Coins.FIRO, SwapTypes.XMR_SWAP), (Coins.PART_ANON, Coins.FIRO, SwapTypes.XMR_SWAP),