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

ui: Expose bid valid for.

Browse Source 
Set smsgsregtestadjust to false in tests.
Fix offer smsg valid for.
Set active_ind on bid records.
api: All times returned should be in unix-time.
This commit is contained in:
tecnovert
2021-02-15 15:34:47 +02:00
parent 1953820cd1
commit 5beb1d17b9
15 changed files with 145 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tests/basicswap/test_xmr_reload.py
View File

@@ -68,11 +68,29 @@ class Test(XmrTestBase):
offers = json.loads(urlopen('http://127.0.0.1:12701/json/offers').read())
offer = offers[0]
data = parse.urlencode({
data = {
'offer_id': offer['offer_id'],
'amount_from': offer['amount_from']}).encode()
'amount_from': offer['amount_from']}
bid_id = json.loads(urlopen('http://127.0.0.1:12701/json/bids/new', data=data).read())
data['valid_for_seconds'] = 24 * 60 * 60 + 1
bid = json.loads(urlopen('http://127.0.0.1:12701/json/bids/new', data=parse.urlencode(data).encode()).read())
assert(bid['error'] == 'Bid TTL too high')
del data['valid_for_seconds']
data['validmins'] = 24 * 60 + 1
bid = json.loads(urlopen('http://127.0.0.1:12701/json/bids/new', data=parse.urlencode(data).encode()).read())
assert(bid['error'] == 'Bid TTL too high')
del data['validmins']
data['valid_for_seconds'] = 10
bid = json.loads(urlopen('http://127.0.0.1:12701/json/bids/new', data=parse.urlencode(data).encode()).read())
assert(bid['error'] == 'Bid TTL too low')
del data['valid_for_seconds']
data['validmins'] = 1
bid = json.loads(urlopen('http://127.0.0.1:12701/json/bids/new', data=parse.urlencode(data).encode()).read())
assert(bid['error'] == 'Bid TTL too low')
data['validmins'] = 60
bid_id = json.loads(urlopen('http://127.0.0.1:12701/json/bids/new', data=parse.urlencode(data).encode()).read())
waitForNumBids(self.delay_event, 12700, 1)
@@ -82,6 +100,7 @@ class Test(XmrTestBase):
if bid['bid_state'] == 'Received':
break
self.delay_event.wait(1)
assert(bid['expire_at'] == bid['created_at'] + data['validmins'] * 60)
data = parse.urlencode({
'accept': True