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

html: More offer filtering.

Browse Source
This commit is contained in:
tecnovert
2019-08-01 18:21:23 +02:00
parent 8731c9796a
commit da9f95fd61
10 changed files with 128 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/basicswap/test_nmc.py
View File

@@ -257,6 +257,9 @@ class Test(unittest.TestCase):
settings = json.load(fs)
fp = open(os.path.join(basicswap_dir, 'basicswap.log'), 'w')
cls.swap_clients.append(BasicSwap(fp, basicswap_dir, settings, 'regtest', log_name='BasicSwap{}'.format(i)))
cls.swap_clients[-1].setDaemonPID(Coins.BTC, cls.daemons[0].pid)
cls.swap_clients[-1].setDaemonPID(Coins.NMC, cls.daemons[1].pid)
cls.swap_clients[-1].setDaemonPID(Coins.PART, cls.daemons[2 + i].pid)
cls.swap_clients[-1].start()
cls.swap_clients[0].callrpc('extkeyimportmaster', ['abandon baby cabbage dad eager fabric gadget habit ice kangaroo lab absorb'])
cls.swap_clients[1].callrpc('extkeyimportmaster', ['pact mammal barrel matrix local final lecture chunk wasp survey bid various book strong spread fall ozone daring like topple door fatigue limb olympic', '', 'true'])

2
tests/basicswap/test_prepare.py
View File

@@ -33,7 +33,7 @@ class Test(unittest.TestCase):
super(Test, self).tearDownClass()
def test(self):
testargs = ['basicswap-prepare', '-datadir=' + test_path, '-particl_mnemonic=none'] # Why won't the daemon run in travis-ci?
testargs = ['basicswap-prepare', '-datadir=' + test_path]
with patch.object(sys, 'argv', testargs):
prepareSystem.main()

2
tests/basicswap/test_reload.py
View File

@@ -26,7 +26,7 @@ import threading
import bin.basicswap_prepare as prepareSystem
import bin.basicswap_run as runSystem
test_path = os.path.expanduser('/tmp/test_basicswap')
test_path = os.path.expanduser('~/test_basicswap1')
logger = logging.getLogger()
logger.level = logging.DEBUG

12
tests/basicswap/test_run.py
View File

@@ -9,7 +9,7 @@
basicswap]$ python setup.py test
Run one test:
$ python setup.py test -s tests.test_run.Test.test_04_ltc_btc
$ python setup.py test -s tests.basicswap.test_run.Test.test_04_ltc_btc
"""
@@ -259,6 +259,9 @@ class Test(unittest.TestCase):
settings = json.load(fs)
fp = open(os.path.join(basicswap_dir, 'basicswap.log'), 'w')
cls.swap_clients.append(BasicSwap(fp, basicswap_dir, settings, 'regtest', log_name='BasicSwap{}'.format(i)))
cls.swap_clients[-1].setDaemonPID(Coins.BTC, cls.daemons[0].pid)
cls.swap_clients[-1].setDaemonPID(Coins.LTC, cls.daemons[1].pid)
cls.swap_clients[-1].setDaemonPID(Coins.PART, cls.daemons[2 + i].pid)
cls.swap_clients[-1].start()
cls.swap_clients[0].callrpc('extkeyimportmaster', ['abandon baby cabbage dad eager fabric gadget habit ice kangaroo lab absorb'])
cls.swap_clients[1].callrpc('extkeyimportmaster', ['pact mammal barrel matrix local final lecture chunk wasp survey bid various book strong spread fall ozone daring like topple door fatigue limb olympic', '', 'true'])
@@ -558,11 +561,16 @@ class Test(unittest.TestCase):
def pass_99_delay(self):
global stop_test
logging.info('Delay')
for i in range(60 * 5):
for i in range(60 * 10):
if stop_test:
break
time.sleep(1)
print('delay', i)
if i % 2 == 0:
offer_id = self.swap_clients[0].postOffer(Coins.BTC, Coins.LTC, 0.001 * (i + 1) * COIN, 1.0 * (i + 1) * COIN, 0.001 * (i + 1) * COIN, SwapTypes.SELLER_FIRST)
else:
offer_id = self.swap_clients[1].postOffer(Coins.LTC, Coins.BTC, 0.001 * (i + 1) * COIN, 1.0 * (i + 1) * COIN, 0.001 * COIN, SwapTypes.SELLER_FIRST)
stop_test = True