mirror of
https://github.com/basicswap/basicswap.git
synced 2024-11-17 00:07:56 +00:00
Fix bug when manually setting bid state.
This commit is contained in:
tecnovert
parent
771ad2586a
commit
f2a3fc1da1
2 changed files with 96 additions and 74 deletions
|
|
@ -6623,13 +6623,13 @@ class BasicSwap(BaseApp):
|
|||
except Exception as ex:
|
||||
self.logException(f'update {ex}')
|
||||
|
||||
def manualBidUpdate(self, bid_id: bytes, data):
|
||||
def manualBidUpdate(self, bid_id: bytes, data) -> None:
|
||||
self.log.info('Manually updating bid %s', bid_id.hex())
|
||||
self.mxDB.acquire()
|
||||
|
||||
add_bid_action = -1
|
||||
try:
|
||||
bid, offer = self.getBidAndOffer(bid_id)
|
||||
session = self.openSession()
|
||||
bid, offer = self.getBidAndOffer(bid_id, session)
|
||||
ensure(bid, 'Bid not found {}'.format(bid_id.hex()))
|
||||
ensure(offer, 'Offer not found {}'.format(bid.offer_id.hex()))
|
||||
|
||||
|
|
@ -6639,47 +6639,43 @@ class BasicSwap(BaseApp):
|
|||
self.log.warning('Set state to %s', strBidState(bid.state))
|
||||
has_changed = True
|
||||
|
||||
if data['bid_action'] != -1:
|
||||
if data.get('bid_action', -1) != -1:
|
||||
self.log.warning('Adding action', ActionTypes(data['bid_action']).name)
|
||||
add_bid_action = ActionTypes(data['bid_action'])
|
||||
has_changed = True
|
||||
|
||||
if bid.debug_ind != data['debug_ind']:
|
||||
if bid.debug_ind is None and data['debug_ind'] == -1:
|
||||
pass # Already unset
|
||||
else:
|
||||
self.log.debug('Bid %s Setting debug flag: %s', bid_id.hex(), data['debug_ind'])
|
||||
bid.debug_ind = data['debug_ind']
|
||||
has_changed = True
|
||||
if 'debug_ind' in data:
|
||||
if bid.debug_ind != data['debug_ind']:
|
||||
if bid.debug_ind is None and data['debug_ind'] == -1:
|
||||
pass # Already unset
|
||||
else:
|
||||
self.log.debug('Bid %s Setting debug flag: %s', bid_id.hex(), data['debug_ind'])
|
||||
bid.debug_ind = data['debug_ind']
|
||||
has_changed = True
|
||||
|
||||
if data['kbs_other'] is not None:
|
||||
if data.get('kbs_other', None) is not None:
|
||||
return xmr_swap_1.recoverNoScriptTxnWithKey(self, bid_id, data['kbs_other'])
|
||||
|
||||
if has_changed:
|
||||
session = scoped_session(self.session_factory)
|
||||
try:
|
||||
activate_bid = False
|
||||
if bid.state and isActiveBidState(bid.state):
|
||||
activate_bid = True
|
||||
activate_bid = False
|
||||
if bid.state and isActiveBidState(bid.state):
|
||||
activate_bid = True
|
||||
|
||||
if add_bid_action > -1:
|
||||
delay = self.get_delay_event_seconds()
|
||||
self.createActionInSession(delay, add_bid_action, bid_id, session)
|
||||
if add_bid_action > -1:
|
||||
delay = self.get_delay_event_seconds()
|
||||
self.createActionInSession(delay, add_bid_action, bid_id, session)
|
||||
|
||||
if activate_bid:
|
||||
self.activateBid(session, bid)
|
||||
else:
|
||||
self.deactivateBid(session, offer, bid)
|
||||
if activate_bid:
|
||||
self.activateBid(session, bid)
|
||||
else:
|
||||
self.deactivateBid(session, offer, bid)
|
||||
|
||||
self.saveBidInSession(bid_id, bid, session)
|
||||
session.commit()
|
||||
finally:
|
||||
session.close()
|
||||
session.remove()
|
||||
self.saveBidInSession(bid_id, bid, session)
|
||||
session.commit()
|
||||
else:
|
||||
raise ValueError('No changes')
|
||||
finally:
|
||||
self.mxDB.release()
|
||||
self.closeSession(session, commit=False)
|
||||
|
||||
def editGeneralSettings(self, data):
|
||||
self.log.info('Updating general settings')
|
||||
|
|
|
|||
|
|
@ -847,50 +847,6 @@ class Test(BaseTest):
|
|||
assert (expect_size >= actual_size)
|
||||
assert (expect_size - actual_size < 100) # TODO
|
||||
|
||||
def test_01_part_xmr(self):
|
||||
logging.info('---------- Test PART to XMR')
|
||||
swap_clients = self.swap_clients
|
||||
|
||||
start_xmr_amount = self.getXmrBalance(read_json_api(1800, 'wallets'))
|
||||
js_1 = read_json_api(1801, 'wallets')
|
||||
assert (self.getXmrBalance(js_1) > 0.0)
|
||||
|
||||
offer_id = swap_clients[0].postOffer(Coins.PART, Coins.XMR, 100 * COIN, 0.11 * XMR_COIN, 100 * COIN, SwapTypes.XMR_SWAP)
|
||||
wait_for_offer(test_delay_event, swap_clients[1], offer_id)
|
||||
offers = swap_clients[1].listOffers(filters={'offer_id': offer_id})
|
||||
assert (len(offers) == 1)
|
||||
offer = offers[0]
|
||||
|
||||
bid_id = swap_clients[1].postXmrBid(offer_id, offer.amount_from)
|
||||
|
||||
wait_for_bid(test_delay_event, swap_clients[0], bid_id, BidStates.BID_RECEIVED)
|
||||
|
||||
bid, xmr_swap = swap_clients[0].getXmrBid(bid_id)
|
||||
assert (xmr_swap)
|
||||
|
||||
swap_clients[0].acceptXmrBid(bid_id)
|
||||
|
||||
wait_for_bid(test_delay_event, swap_clients[0], bid_id, BidStates.SWAP_COMPLETED, wait_for=180)
|
||||
wait_for_bid(test_delay_event, swap_clients[1], bid_id, BidStates.SWAP_COMPLETED, sent=True)
|
||||
|
||||
js_0_end = read_json_api(1800, 'wallets')
|
||||
end_xmr_amount = self.getXmrBalance(js_0_end)
|
||||
xmr_amount_diff = end_xmr_amount - start_xmr_amount
|
||||
assert (xmr_amount_diff > 10.9 and xmr_amount_diff < 11.0)
|
||||
|
||||
bid_id_hex = bid_id.hex()
|
||||
path = f'bids/{bid_id_hex}/states'
|
||||
offerer_states = read_json_api(1800, path)
|
||||
bidder_states = read_json_api(1801, path)
|
||||
|
||||
assert (compare_bid_states(offerer_states, self.states_offerer[0]) is True)
|
||||
assert (compare_bid_states(bidder_states, self.states_bidder[0]) is True)
|
||||
|
||||
# Test remove_expired_data
|
||||
remove_expired_data(swap_clients[0], -swap_clients[0]._expire_db_records_after * 2)
|
||||
offers = swap_clients[0].listOffers(filters={'offer_id': offer_id})
|
||||
assert (len(offers) == 0)
|
||||
|
||||
def test_011_smsgaddresses(self):
|
||||
logging.info('---------- Test address management and private offers')
|
||||
swap_clients = self.swap_clients
|
||||
|
|
@ -997,6 +953,50 @@ class Test(BaseTest):
|
|||
json_rv = read_json_api(1800, 'smsgaddresses/disableall')
|
||||
assert (json_rv['num_disabled'] >= 1)
|
||||
|
||||
def test_01_part_xmr(self):
|
||||
logging.info('---------- Test PART to XMR')
|
||||
swap_clients = self.swap_clients
|
||||
|
||||
start_xmr_amount = self.getXmrBalance(read_json_api(1800, 'wallets'))
|
||||
js_1 = read_json_api(1801, 'wallets')
|
||||
assert (self.getXmrBalance(js_1) > 0.0)
|
||||
|
||||
offer_id = swap_clients[0].postOffer(Coins.PART, Coins.XMR, 100 * COIN, 0.11 * XMR_COIN, 100 * COIN, SwapTypes.XMR_SWAP)
|
||||
wait_for_offer(test_delay_event, swap_clients[1], offer_id)
|
||||
offers = swap_clients[1].listOffers(filters={'offer_id': offer_id})
|
||||
assert (len(offers) == 1)
|
||||
offer = offers[0]
|
||||
|
||||
bid_id = swap_clients[1].postXmrBid(offer_id, offer.amount_from)
|
||||
|
||||
wait_for_bid(test_delay_event, swap_clients[0], bid_id, BidStates.BID_RECEIVED)
|
||||
|
||||
bid, xmr_swap = swap_clients[0].getXmrBid(bid_id)
|
||||
assert (xmr_swap)
|
||||
|
||||
swap_clients[0].acceptXmrBid(bid_id)
|
||||
|
||||
wait_for_bid(test_delay_event, swap_clients[0], bid_id, BidStates.SWAP_COMPLETED, wait_for=180)
|
||||
wait_for_bid(test_delay_event, swap_clients[1], bid_id, BidStates.SWAP_COMPLETED, sent=True)
|
||||
|
||||
js_0_end = read_json_api(1800, 'wallets')
|
||||
end_xmr_amount = self.getXmrBalance(js_0_end)
|
||||
xmr_amount_diff = end_xmr_amount - start_xmr_amount
|
||||
assert (xmr_amount_diff > 10.9 and xmr_amount_diff < 11.0)
|
||||
|
||||
bid_id_hex = bid_id.hex()
|
||||
path = f'bids/{bid_id_hex}/states'
|
||||
offerer_states = read_json_api(1800, path)
|
||||
bidder_states = read_json_api(1801, path)
|
||||
|
||||
assert (compare_bid_states(offerer_states, self.states_offerer[0]) is True)
|
||||
assert (compare_bid_states(bidder_states, self.states_bidder[0]) is True)
|
||||
|
||||
# Test remove_expired_data
|
||||
remove_expired_data(swap_clients[0], -swap_clients[0]._expire_db_records_after * 2)
|
||||
offers = swap_clients[0].listOffers(filters={'offer_id': offer_id})
|
||||
assert (len(offers) == 0)
|
||||
|
||||
def test_02_leader_recover_a_lock_tx(self):
|
||||
logging.info('---------- Test PART to XMR leader recovers coin a lock tx')
|
||||
swap_clients = self.swap_clients
|
||||
|
|
@ -1586,6 +1586,32 @@ class Test(BaseTest):
|
|||
assert (first_subaddress != current_subaddress)
|
||||
assert (second_subaddress != current_subaddress)
|
||||
|
||||
def test_17_edit_bid_state(self):
|
||||
logging.info('---------- Test manually changing the state of a bid')
|
||||
# Stall the bid by setting a debug token. Once it's stalled, clear the debug token and fix the bid state.
|
||||
swap_clients = self.swap_clients
|
||||
|
||||
amt_swap = make_int(random.uniform(0.1, 10.0), scale=8, r=1)
|
||||
rate_swap = make_int(random.uniform(2.0, 20.0), scale=12, r=1)
|
||||
offer_id = swap_clients[0].postOffer(Coins.PART, Coins.XMR, amt_swap, rate_swap, amt_swap, SwapTypes.XMR_SWAP)
|
||||
|
||||
wait_for_offer(test_delay_event, swap_clients[1], offer_id)
|
||||
bid_id = swap_clients[1].postXmrBid(offer_id, amt_swap)
|
||||
swap_clients[1].setBidDebugInd(bid_id, DebugTypes.BID_STOP_AFTER_COIN_A_LOCK)
|
||||
|
||||
wait_for_bid(test_delay_event, swap_clients[0], bid_id, BidStates.BID_RECEIVED)
|
||||
swap_clients[0].acceptXmrBid(bid_id)
|
||||
|
||||
wait_for_bid(test_delay_event, swap_clients[1], bid_id, BidStates.BID_STALLED_FOR_TEST, sent=True, wait_for=90)
|
||||
data = {
|
||||
'debug_ind': int(DebugTypes.NONE),
|
||||
'bid_state': int(BidStates.XMR_SWAP_MSG_SCRIPT_LOCK_SPEND_TX),
|
||||
}
|
||||
swap_clients[1].manualBidUpdate(bid_id, data)
|
||||
|
||||
wait_for_bid(test_delay_event, swap_clients[0], bid_id, BidStates.SWAP_COMPLETED, wait_for=180)
|
||||
wait_for_bid(test_delay_event, swap_clients[1], bid_id, BidStates.SWAP_COMPLETED, sent=True)
|
||||
|
||||
def test_97_withdraw_all(self):
|
||||
logging.info('---------- Test XMR withdrawal all')
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue