|
@@ -592,7 +592,7 @@ def current_value(ownable_id):
|
|
|
|
|
|
def execute_orders(ownable_id):
|
|
def execute_orders(ownable_id):
|
|
connect()
|
|
connect()
|
|
- orders_changed = False
|
|
|
|
|
|
+ orders_traded = False
|
|
while True:
|
|
while True:
|
|
# find order to execute
|
|
# find order to execute
|
|
cursor.execute('''
|
|
cursor.execute('''
|
|
@@ -670,12 +670,12 @@ def execute_orders(ownable_id):
|
|
# user_id,user_id,rowid,rowid)
|
|
# user_id,user_id,rowid,rowid)
|
|
|
|
|
|
if not matching_orders:
|
|
if not matching_orders:
|
|
- if not orders_changed:
|
|
|
|
|
|
+ if not orders_traded:
|
|
break
|
|
break
|
|
# check if the trading bot has any new offers to make
|
|
# check if the trading bot has any new offers to make
|
|
new_order_was_placed = trading_bot.notify_order_traded(ownable_id)
|
|
new_order_was_placed = trading_bot.notify_order_traded(ownable_id)
|
|
if new_order_was_placed:
|
|
if new_order_was_placed:
|
|
- orders_changed = False
|
|
|
|
|
|
+ orders_traded = False
|
|
continue
|
|
continue
|
|
else:
|
|
else:
|
|
break
|
|
break
|
|
@@ -735,10 +735,10 @@ def execute_orders(ownable_id):
|
|
|
|
|
|
if buy_order_finished:
|
|
if buy_order_finished:
|
|
delete_order(buy_order_id, 'Executed')
|
|
delete_order(buy_order_id, 'Executed')
|
|
- orders_changed = True
|
|
|
|
|
|
+ orders_traded = True
|
|
if sell_order_finished:
|
|
if sell_order_finished:
|
|
delete_order(sell_order_id, 'Executed')
|
|
delete_order(sell_order_id, 'Executed')
|
|
- orders_changed = True
|
|
|
|
|
|
+ orders_traded = True
|
|
|
|
|
|
if seller_id != buyer_id: # prevent showing self-transactions
|
|
if seller_id != buyer_id: # prevent showing self-transactions
|
|
cursor.execute('''
|
|
cursor.execute('''
|