Cleaning up QueueHolderOrder's state

This commit is contained in:
Taha Afzal committed 2019-02-06 15:54:20 -05:00
1 parent 7a586c075b
commit 93a3ac55a1
3 files changed
+21 -25

No files matched your search

@@ -15,16 +15,14 @@ namespace orderman {
QueueHolderOrder::QueueHolderOrder()
:
_services(nullptr),
_order_def(),
_is_succ_inited(false),
_is_recovered(false),
_tick_size(bts::os::nan()),
_n_orders(0),
_reported_state(),
_order_def(),
_order_builder(),
_book(),
_order_manager(),
_services(nullptr),
_reported_state(),
_book(),
_state_worker(nullptr),
_start_state_worker(this),
_waiting_for_ack_state_worker(this),
@@ -68,17 +68,15 @@ private:
oss << str << key();
bts_assert_msg(false, oss.str());
}
private:
OrderServices *_services;
api::orderman::OrderDefinition _order_def;
private:
bool _is_succ_inited;
bool _is_recovered;
double _tick_size;
uint16_t _n_orders;
api::orderman::OrderState _reported_state;
bool _is_recovered;
api::orderman::OrderDefinition _order_def;
OrderBuilder _order_builder;
Book _book;
QHOOrderManager _order_manager;
OrderServices *_services;
api::orderman::OrderState _reported_state;
Book _book;
IQueueHolderOrderStateWorker* _state_worker;
QHOStartStateWorker _start_state_worker;
QHOWaitingForAckStateWorker _waiting_for_ack_state_worker;
@@ -45,16 +45,11 @@ void QHOStartStateWorker::on_activate(Price price,
if (_porder->_is_recovered || !_porder->_is_succ_inited)
_porder->_switch_state(QueueHolderOrderState::END);
else {
_porder->_order_builder.activate(services);
_porder->_order_manager.init(_porder->_order_builder,
SecurityKey(_porder->_order_def.security_key()),
_porder->_order_def.side(),
_porder->_tick_size,
_porder->_n_orders);
_porder->_order_builder.activate(services);
services.subscribe_to_child_updates(
[this](const OrderStateUpdateEvent &os) {
_porder->_on_child_order_update(os);
});
});
services.subscribe_to_book(SecurityKey(_porder->_order_def.security_key()),
[this](const BookUpdateEvent &bk_event) {
_porder->_on_book_update(bk_event);
@@ -86,7 +81,6 @@ void QHOStartStateWorker::on_time(const TimeStamp&){
bool QHOStartStateWorker::_on_init_new(
const api::orderman::OrderDefinition& order_def,
const PreActivationOrderServices& pre_os) {
_porder->_order_def = order_def;
if (!order_def.has_custom_def() ||
!order_def.custom_def().has_queue_holder()) {
LOG(OrderMan, Error,
@@ -106,11 +100,17 @@ bool QHOStartStateWorker::_on_init_new(
_porder->_reported_state.set_last_msg("Could not resolve Trigger Order security");
return false;
}
const api::orderman::QueueHolderDefinition&
qh_def=order_def.custom_def().queue_holder();
_porder->_order_def=order_def;
const api::orderman::QueueHolderDefinition& qho_def=
order_def.custom_def().queue_holder();
api::orderman::OrderDefinition child_order_def = order_def;
child_order_def.mutable_custom_def()->CopyFrom(qh_def.child());
child_order_def.mutable_custom_def()->CopyFrom(qho_def.child());
_porder->_order_builder = OrderBuilder(_porder->key(), child_order_def, pre_os);
_porder->_order_manager.init( _porder->_order_builder,
SecurityKey(order_def.security_key()),
_porder->_order_def.side(),
sec_ptr->contract_spec().low_tick(),
qho_def.n_queue_orders());
LOG(OrderMan, Info,
"QHOStartStateWorker::_on_init_new key:{} ",
_porder->key());