SPARK-310 (order interaction behind switch)

This commit is contained in:
Taha Afzal committed 2017-12-19 20:28:12 -05:00
1 parent 355b29458b
commit e457a4b3a6
12 files changed
+66 -36

No files matched your search

@@ -18,6 +18,7 @@ SpreaderOrder::SpreaderOrder(securities::ISecurityDB &db,
SpreaderOrderBase(db, f, os),
_cancel_timeout (5000),// TODO:get it from config
_active(false),
_real_orders (!bts::utils::internal::is_unittest_environment()),
_create_order_request (api::orderman::CreateOrderRequest()),
_state_worker(nullptr)
{
@@ -31,6 +32,7 @@ SpreaderOrder::SpreaderOrder(securities::ISecurityDB& db,
SpreaderOrderBase(db, f, k, cor),
_cancel_timeout (5000),// TODO:get it from config
_active (true),
_real_orders (!bts::utils::internal::is_unittest_environment()),
_create_order_request (cor),
_bookkeeping_data (SpreaderBookkeepingData (std::vector<SpreaderLegData>(), Price(cor.spreader().price()), Quantity(cor.spreader().quantity()))),
_state_worker(nullptr)
@@ -147,6 +149,21 @@ bts::orderman::SpreaderOrderBase::ChildOrder SpreaderOrder::get_new_order (const
bts::orderman::SpreaderOrderBase::ChildFactory child_factory = get_child_factory(*db_sec, leg_property_data.trading_side(), order_type);
return child_factory();
}
void SpreaderOrder::place_order (SpreaderOrderBase::ChildOrder& child_order, TickToTradeCorID cid, Price price, Quantity quantity)
{
if (_real_orders)
child_order.create(cid, price, quantity);
}
void SpreaderOrder::modify_order (SpreaderOrderBase::ChildOrder& child_order, TickToTradeCorID cid, Price price, Quantity quantity)
{
if (_real_orders)
child_order.update(cid, price, quantity);
}
void SpreaderOrder::cancel_order (SpreaderOrderBase::ChildOrder& child_order)
{
if (_real_orders)
child_order.cancel();
}
void SpreaderOrder::_transform_to_START()
{
bts_assert (_state_worker == nullptr);
@@ -280,14 +297,15 @@ void SpreaderOrder::_compute_hedge_price_quantity(size_t filled_leg_index,
{
}
}
void SpreaderOrder::_report_state (api::orderman::OrderStatus, std::string*)
void SpreaderOrder::_report_state (api::orderman::OrderStatus order_status, std::string* msg)
{
// report_state_change(SpreaderOrderState{
// order_status,
// _bookkeeping_data.price(),
// _bookkeeping_data.quantity(),
// m
// });
if (_real_orders)
report_state_change(SpreaderOrderState{
order_status,
_bookkeeping_data.price(),
_bookkeeping_data.quantity(),
msg
});
}
void SpreaderOrder::_switch_state (ISpreaderStateWorker* new_state)
{
@@ -14,6 +14,7 @@
#include "server/sparkd/orderman/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h"
#include "server/sparkd/orderman/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h"
#include "server/sparkd/orderman/spreader_orders/spreader_states/SpreaderEndStateWorker.h"
#include "lib/utils/is_unittest_environment.h"
namespace bts {
namespace api {namespace orderman {class OrderState; class CreateSpreaderOrder;}}
@@ -69,6 +70,9 @@ public:
const orderman::Book& get_book(size_t leg_index) const override;
const LegPropertyData& get_leg_data(size_t leg_index) const override;
bts::orderman::SpreaderOrderBase::ChildOrder get_new_order (const LegPropertyData& leg_property_data, bool is_quote_order) override;
void place_order (SpreaderOrderBase::ChildOrder& child_order, TickToTradeCorID cid, Price price, Quantity quantity) override;
void modify_order (SpreaderOrderBase::ChildOrder& child_order, TickToTradeCorID cid, Price price, Quantity quantity) override;
void cancel_order (SpreaderOrderBase::ChildOrder& child_order) override;
public:
// this is exposed for testing reasons only
SpreaderState test_only_func_spreader_state ();
@@ -113,6 +117,7 @@ private:
private:
const int64_t _cancel_timeout;
const bool _active;
const bool _real_orders;
std::string _msg;
const api::orderman::CreateOrderRequest _create_order_request;
// these 2 constitute the state
@@ -73,7 +73,15 @@ public:
bts::orderman::SpreaderOrderBase::ChildOrder rv;
return rv;
}
void place_order (SpreaderOrderBase::ChildOrder&, TickToTradeCorID, Price, Quantity)
{
}
void modify_order (SpreaderOrderBase::ChildOrder&, TickToTradeCorID, Price, Quantity)
{
}
void cancel_order (SpreaderOrderBase::ChildOrder&)
{
}
};
/**********************************************************************/
/***************************order creation*****************************/
@@ -21,5 +21,8 @@ public:
virtual const LegPropertyData& get_leg_data(size_t leg_index) const = 0;
// to request a new child order
virtual bts::orderman::SpreaderOrderBase::ChildOrder get_new_order (const LegPropertyData& leg_property_data, bool is_quote_order) = 0;
virtual void place_order (SpreaderOrderBase::ChildOrder& child_order, TickToTradeCorID cid, Price price, Quantity quantity) = 0;
virtual void modify_order (SpreaderOrderBase::ChildOrder& child_order, TickToTradeCorID cid, Price price, Quantity quantity) = 0;
virtual void cancel_order (SpreaderOrderBase::ChildOrder& child_order) = 0;
};
}}
@@ -9,14 +9,14 @@
namespace bts {
namespace orderman {
SingleFillHedger::SingleFillHedger(ISpreaderManager& ,
SingleFillHedger::SingleFillHedger(ISpreaderManager& spreader_manager,
const LegPropertyData& leg_property_data,
bts::orderman::SpreaderOrderBase::ChildOrder order,
bts::Price hedge_price,
bts::Quantity hedge_quantity,
api::Side hedge_side)
:
// _spreader_manager(spreader_manager),
_spreader(spreader_manager),
_leg_property_data (leg_property_data),
_order (order),
_price_quantity_state(hedge_price, hedge_quantity, hedge_side),
@@ -22,7 +22,7 @@ class SpreaderOrderUpdateMessage;
class SingleFillHedger
{
private:
// ISpreaderManager& _spreader_manager;
ISpreaderManager& _spreader;
const LegPropertyData& _leg_property_data;
bts::orderman::SpreaderOrderBase::ChildOrder _order;
HedgePriceQuantityState _price_quantity_state;
@@ -2,6 +2,7 @@
#include "server/sparkd/spreader/SpreaderOrderUpdateMessage.h"
#include "server/sparkd/orderman/md/Book.h"
#include "server/sparkd/spreader/SingleFillHedger.h"
#include "server/sparkd/spreader/ISpreaderManager.h"
namespace bts{
namespace orderman{
@@ -16,8 +17,7 @@ void HedgerStartStateWorker::init()
_hedger->_order.order_key().value(), _hedger->_price_quantity_state.out_price().value(), _hedger->_price_quantity_state.target_quantity().value());
// this is the only place from where the hedger sends the order
_hedger->_price_quantity_state.update_out_price_quantity (_hedger->_price_quantity_state.target_price(), _hedger->_price_quantity_state.target_quantity());
//TODO:temp disable for tests
//_hedger->_order.create(bts::orderman::NullTickToTradeCorID, _hedger->_price_quantity_state.out_price(), _hedger->_price_quantity_state.out_quantity());
_hedger->_spreader.place_order (_hedger->_order, bts::orderman::NullTickToTradeCorID, _hedger->_price_quantity_state.out_price(), _hedger->_price_quantity_state.out_quantity());
_hedger->transform_to_WAITING_FOR_FIRST_ACK ();
}
void HedgerStartStateWorker::on_order_update(const SpreaderOrderUpdateMessage&)
@@ -1,6 +1,7 @@
#include "server/sparkd/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.h"
#include "server/sparkd/spreader/SpreaderOrderUpdateMessage.h"
#include "server/sparkd/spreader/SingleFillHedger.h"
#include "server/sparkd/spreader/ISpreaderManager.h"
namespace bts{
namespace orderman{
@@ -26,8 +27,7 @@ void HedgerWaitingForFirstAckCancelledStateWorker::on_order_update(const Spreade
{
// this means the first ack is here and we should
// be able to cancel it now
//TODO:temp disable for tests
//_hedger->_order.cancel();
_hedger->_spreader.cancel_order(_hedger->_order);
_hedger->transform_to_WAITING_FOR_CANCEL_ACK ();
}
}
@@ -1,6 +1,8 @@
#include "server/sparkd/spreader/hedger/hedger_states/HedgerWorkingStateWorker.h"
#include "server/sparkd/spreader/SpreaderOrderUpdateMessage.h"
#include "server/sparkd/spreader/SingleFillHedger.h"
#include "server/sparkd/spreader/ISpreaderManager.h"
namespace bts{
namespace orderman{
@@ -10,7 +12,7 @@ HedgerState HedgerWorkingStateWorker::state() const {return HedgerState::WORKING
const std::string& HedgerWorkingStateWorker::state_text() const {return _state_text;}
void HedgerWorkingStateWorker::init()
{
bts_assert_msg (false, "HedgerWorkingStateWorker::init illegal operation");
bts_assert_msg (false, "HedgerWorkingStateWorker::init illegal operation");
}
void HedgerWorkingStateWorker::on_order_update(const SpreaderOrderUpdateMessage& order_update)
{
@@ -28,8 +30,7 @@ void HedgerWorkingStateWorker::on_book(bts::orderman::TickToTradeCorID, const bt
}
void HedgerWorkingStateWorker::cancel()
{
//TODO:temp disable for tests
//_hedger->_order.cancel();
_hedger->_spreader.cancel_order(_hedger->_order);
_hedger->transform_to_WAITING_FOR_CANCEL_ACK ();
}
void HedgerWorkingStateWorker::terminate()
@@ -4,6 +4,7 @@
#include "server/sparkd/spreader/quoter/quoter_states/QuoterState.h"
#include "server/sparkd/spreader/SingleLegQuoter.h"
#include "server/sparkd/spreader/SpreaderOrderUpdateMessage.h"
#include "server/sparkd/spreader/ISpreaderManager.h"
namespace bts{
namespace orderman{
@@ -29,8 +30,7 @@ void QuoterWaitingForFirstAckCancelledWorker::on_order_update (const SpreaderOrd
else
{
// got an ack, now cancel the order
//TODO:temp disable for tests
//_quoter->_order.cancel();
_quoter->_spreader.cancel_order (_quoter->_order);
_quoter->_transform_to_WAITING_FOR_CANCEL_ACK ();
}
}
@@ -3,6 +3,7 @@
#include "server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.h"
#include "server/sparkd/spreader/quoter/quoter_states/QuoterState.h"
#include "server/sparkd/spreader/SingleLegQuoter.h"
#include "server/sparkd/spreader/ISpreaderManager.h"
namespace bts{
namespace orderman{
@@ -48,7 +49,7 @@ void QuoterWaitingForSizeStateWorker::update_spreader_order (Price price, Quanti
_quoter->_price_quantity_state.update_target_price_quantity (price, quantity);
_longpath_analyze_and_act (bts::orderman::NullTickToTradeCorID);
}
void QuoterWaitingForSizeStateWorker::_longpath_analyze_and_act (bts::orderman::TickToTradeCorID)
void QuoterWaitingForSizeStateWorker::_longpath_analyze_and_act (bts::orderman::TickToTradeCorID corid)
{
if (_quoter->_price_quantity_state.target_reached())
{
@@ -64,8 +65,7 @@ void QuoterWaitingForSizeStateWorker::_longpath_analyze_and_act (bts::orderman::
_quoter->_price_quantity_state.update_out_price_quantity(out_price, out_quantity);
LOG(OrderMan, Diag, "QuoterWaitingForSizeStateWorker key: {}, sending order, price: {} quantity: {}",
_quoter->_order.order_key().value(), out_price.value(), out_quantity.value());
//TODO:temp disable for tests
//_quoter->_order.create(corid, _quoter->_price_quantity_state.out_price(), _quoter->_price_quantity_state.out_quantity());
_quoter->_spreader.place_order (_quoter->_order, corid, out_price, out_quantity);
_quoter->_transform_to_WAITING_FOR_FIRST_ACK ();
}
}
@@ -3,6 +3,7 @@
#include "server/sparkd/spreader/quoter/quoter_states/QuoterWorkingStateWorker.h"
#include "server/sparkd/spreader/quoter/quoter_states/QuoterState.h"
#include "server/sparkd/spreader/SingleLegQuoter.h"
#include "server/sparkd/spreader/ISpreaderManager.h"
namespace bts{
namespace orderman{
@@ -35,8 +36,7 @@ void QuoterWorkingStateWorker::on_book (bts::orderman::TickToTradeCorID corid, s
}
void QuoterWorkingStateWorker::cancel()
{
//TODO:temp disable for tests
//_quoter->_order.cancel ();
_quoter->_spreader.cancel_order (_quoter->_order);
_quoter->_transform_to_WAITING_FOR_CANCEL_ACK ();
}
void QuoterWorkingStateWorker::terminate()
@@ -55,7 +55,7 @@ void QuoterWorkingStateWorker::update_spreader_order (Price price, Quantity quan
_quoter->_price_quantity_state.update_target_price_quantity (price, quantity);
_longpath_analyze_and_act (bts::orderman::NullTickToTradeCorID);
}
void QuoterWorkingStateWorker::_longpath_analyze_and_act (bts::orderman::TickToTradeCorID)
void QuoterWorkingStateWorker::_longpath_analyze_and_act (bts::orderman::TickToTradeCorID corid)
{
if (_quoter->_price_quantity_state.target_reached())
{
@@ -63,8 +63,7 @@ void QuoterWorkingStateWorker::_longpath_analyze_and_act (bts::orderman::TickToT
// i. fills in this leg (though that should be caught by the status)
// ii. fills in other legs causing reduction here
// iii. quantity reduction in the spreader order by the user
//TODO:temp disable for tests
//_quoter->_order.cancel ();
_quoter->_spreader.cancel_order (_quoter->_order);
_quoter->_transform_to_WAITING_FOR_CANCEL_ACK ();
}
else
@@ -74,8 +73,7 @@ void QuoterWorkingStateWorker::_longpath_analyze_and_act (bts::orderman::TickToT
if (computed_quantity.value() == 0)
{
// no size could be computed, go to wait state
//TODO:temp disable for tests
//_quoter->_order.cancel ();
_quoter->_spreader.cancel_order (_quoter->_order);
_quoter->_transform_to_WAITING_FOR_CANCEL_ACK();
}
else
@@ -87,8 +85,7 @@ void QuoterWorkingStateWorker::_longpath_analyze_and_act (bts::orderman::TickToT
// this is a size change, size changes always go through regardless of the
// quoting parameters
_quoter->_price_quantity_state.update_out_price_quantity(computed_price, order_quantity);
//TODO:temp disable for tests
//_quoter->_order.update(corid, computed_price, order_quantity);
_quoter->_spreader.modify_order (_quoter->_order, corid, computed_price, order_quantity);
}
else
{
@@ -98,13 +95,11 @@ void QuoterWorkingStateWorker::_longpath_analyze_and_act (bts::orderman::TickToT
_quoter->_this_leg_data.tick_size(), _quoter->_this_leg_data.leg_params().quote_params().quote_mute_zone());
if (reprice)
{
_quoter->_price_quantity_state.update_out_price_quantity(computed_price, order_quantity);
//TODO:temp disable for tests
//_quoter->_order.update(corid, computed_price, order_quantity);
_quoter->_price_quantity_state.update_out_price_quantity(computed_price, order_quantity);
_quoter->_spreader.modify_order (_quoter->_order, corid, computed_price, order_quantity);
}
}
}
}
}
}}