spreader ready to go with sim

This commit is contained in:
Taha Afzal committed 2020-09-24 00:21:43 -04:00
1 parent ef016bfafc
commit 87d0f93043
9 files changed
+43 -29

No files matched your search

@@ -19,9 +19,9 @@ namespace bts {
namespace orderman {
/**************************Cons/Dest*******************************/
SpreaderOrder::SpreaderOrder()
SpreaderOrder::SpreaderOrder(IAlternateOrderGateway* alt_order_gateway)
:
_alt_order_gateway(nullptr),
_alt_order_gateway(alt_order_gateway),
_cancelled (false),
_report_dirty(false),
_active(true),
@@ -49,7 +49,7 @@ private:
// no error condition
NONE
};
IAlternateOrderGateway* _alt_order_gateway;
IAlternateOrderGateway* const _alt_order_gateway;
// when a fill update, this is populated with
// the indices of the other legs
//std::array<uint8_t,16> _non_filled_indices;
@@ -89,7 +89,7 @@ private:
// copied either way)
//////////////////////////////////
public:
SpreaderOrder();
SpreaderOrder(IAlternateOrderGateway* = nullptr);
SpreaderOrder(const SpreaderOrder&)=delete;
SpreaderOrder(SpreaderOrder&&)=delete;
SpreaderOrder& operator=(const SpreaderOrder&)=delete;
@@ -30,12 +30,12 @@ _order_place_time(src._order_place_time)
{ }
SpreaderChildOrderState::SpreaderChildOrderState (SecurityKey sec_key,
bool is_live,
bool,
api::Side side,
bool is_quoting,
IAlternateOrderGateway* alt_order_gwy)
:
_is_live (is_live),
_is_live (alt_order_gwy==nullptr),
_alt_order_gwy(alt_order_gwy),
_sec_key (sec_key),
_is_quoting (is_quoting),
@@ -6,12 +6,10 @@ namespace bts{
namespace orderman{
SpreaderOrderServices::SpreaderOrderServices (
OrderServices* order_services,
IAlternateOrderGateway* alt_order_gateway)
OrderServices* order_services)
:
_is_live(order_services != nullptr),
_order_services(order_services),
_alt_order_gateway(alt_order_gateway){
_order_services(order_services){
}
OrderServices& SpreaderOrderServices::order_services(){
@@ -48,8 +46,4 @@ bool SpreaderOrderServices::is_live() const {
return _is_live;
}
IAlternateOrderGateway* SpreaderOrderServices::alt_order_gateway(){
return _alt_order_gateway;
}
}}
@@ -22,10 +22,8 @@ class SpreaderOrderServices
private:
const bool _is_live;
bts::orderman::OrderServices* _order_services;
IAlternateOrderGateway* _alt_order_gateway;
public:
SpreaderOrderServices (OrderServices* order_services,
IAlternateOrderGateway* alt_order_gateway = nullptr);
SpreaderOrderServices (OrderServices* order_services);
OrderServices& order_services();
void report_state(const api::orderman::OrderState &state);
trace::ScopedPerfLogEntry log_scope(
@@ -38,7 +36,6 @@ public:
const char *txt_1 = "",
uint32_t uint32_1 = 0);
bool is_live() const;
IAlternateOrderGateway* alt_order_gateway();
};
}}
@@ -80,7 +80,6 @@ void SpreaderStartStateWorker::on_init_recovered(const bts::api::orderman::Order
void SpreaderStartStateWorker::on_activate(Price price,
Quantity quantity,
SpreaderOrderServices& order_services){
_spreader->_alt_order_gateway = order_services.alt_order_gateway();
// 1. update price, qty
_spreader->_set_price_quantity (price, quantity);
// 2. activate order builders
@@ -17,7 +17,8 @@ TEST_CASE ("quoter price quantity state", "[spreader]")
ContractLeg leg_1;
fill_future_contract_leg (leg_1, 0, "ES", bts::api::Venue::VENUE_GLBX, 2017, 12, 15, 1, 1, api::Side::SIDE_BUY, 1.0, 0.25);
LegPropertyData leg_prop_data_1 = create_leg_property_data (leg_1, 0, 1.0, true, 2.0);
SpreaderChildOrderState order(leg_prop_data_1.leg_security_key(),false,leg_prop_data_1.trading_side(),true,nullptr);
AltOrderGatewayForTest alt_order_gateway;
SpreaderChildOrderState order(leg_prop_data_1.leg_security_key(),false,leg_prop_data_1.trading_side(),true,&alt_order_gateway);
QuoteLegPriceQuantityState s (Price (-1.0), Quantity (200), order);
REQUIRE (s.target_spread_price() == Price (-1.0));
REQUIRE (s.target_leg_quantity() == Quantity (200));
@@ -86,7 +87,7 @@ TEST_CASE ("quoter price quantity state", "[spreader]")
REQUIRE (s.out_quantity() == Quantity (123));
SECTION("test cycle_back")
{
SpreaderChildOrderState order_2(leg_prop_data_1.leg_security_key(),false,leg_prop_data_1.trading_side(), true,nullptr);
SpreaderChildOrderState order_2(leg_prop_data_1.leg_security_key(),false,leg_prop_data_1.trading_side(),true,&alt_order_gateway);
QuoteLegPriceQuantityState s (Price (-1.0), Quantity (200),order_2);
REQUIRE (s.target_spread_price() == Price (-1.0));
REQUIRE (s.target_leg_quantity() == Quantity (200));
@@ -1740,7 +1741,7 @@ TEST_CASE ("spreader_START", "[spreader]")
SpreaderUtils::resolve_synthetic_spread(pao_services, order_def, leg_props,quoter_ord_defs,hedger_ord_defs);
SpreaderManagerForTest spreader_manager (order_key, order_def, pao_services, leg_props,quoter_ord_defs,hedger_ord_defs);
SpreaderBookkeepingData& bookkeeping_data = spreader_manager.bookkeeping_data();
SpreaderOrder spreader;
SpreaderOrder spreader(spreader_manager.alt_order_gateway());
REQUIRE(spreader.test_only_func_spreader_state() == SpreaderState::START);
SECTION("1. on_init_new.resolved")
@@ -1796,7 +1797,7 @@ TEST_CASE ("spreader_WORKING", "[spreader]")
hedger_ord_defs;
SpreaderUtils::resolve_synthetic_spread(pao_services, order_def, leg_props,quoter_ord_defs,hedger_ord_defs);
SpreaderManagerForTest spreader_manager (order_key, order_def, pao_services, leg_props,quoter_ord_defs,hedger_ord_defs);
SpreaderOrder spreader;
SpreaderOrder spreader(spreader_manager.alt_order_gateway());
REQUIRE(spreader.test_only_func_spreader_state() == SpreaderState::START);
// on_init_new and activate
spreader.test_only_on_init_new (order_def, pao_services);
@@ -2128,7 +2129,7 @@ TEST_CASE ("spreader_WAITING_FOR_CANCEL_ACK", "[spreader]")
hedger_ord_defs;
SpreaderUtils::resolve_synthetic_spread(pao_services, order_def, leg_props,quoter_ord_defs,hedger_ord_defs);
SpreaderManagerForTest spreader_manager (order_key, order_def, pao_services, leg_props,quoter_ord_defs,hedger_ord_defs);
SpreaderOrder spreader;
SpreaderOrder spreader(spreader_manager.alt_order_gateway());
REQUIRE(spreader.test_only_func_spreader_state() == SpreaderState::START);
// on_init_new and activate
spreader.test_only_on_init_new (order_def, pao_services);
@@ -2955,7 +2956,7 @@ TEST_CASE ("spreader_perf_2legs", "[spreader]")
hedger_ord_defs;
SpreaderUtils::resolve_synthetic_spread(pao_services, order_def, leg_props,quoter_ord_defs,hedger_ord_defs);
SpreaderManagerForTest spreader_manager (order_key, order_def, pao_services, leg_props,quoter_ord_defs,hedger_ord_defs);
SpreaderOrder spreader;
SpreaderOrder spreader(spreader_manager.alt_order_gateway());
REQUIRE(spreader.test_only_func_spreader_state() == SpreaderState::START);
// on_init_new and activate
spreader.test_only_on_init_new (order_def, pao_services);
@@ -3107,7 +3108,7 @@ TEST_CASE ("spreader_perf_4legs", "[spreader]")
hedger_ord_defs;
SpreaderUtils::resolve_synthetic_spread(pao_services, order_def, leg_props,quoter_ord_defs,hedger_ord_defs);
SpreaderManagerForTest spreader_manager (order_key, order_def, pao_services, leg_props,quoter_ord_defs,hedger_ord_defs);
SpreaderOrder spreader;
SpreaderOrder spreader(spreader_manager.alt_order_gateway());
REQUIRE(spreader.test_only_func_spreader_state() == SpreaderState::START);
// on_init_new and activate
spreader.test_only_on_init_new (order_def, pao_services);
@@ -3746,7 +3747,7 @@ TEST_CASE ("4legs_hedging", "[spreader_perf]")
hedger_ord_defs;
SpreaderUtils::resolve_synthetic_spread(pao_services, order_def, leg_props,quoter_ord_defs,hedger_ord_defs);
SpreaderManagerForTest spreader_manager (order_key, order_def, pao_services, leg_props,quoter_ord_defs,hedger_ord_defs);
SpreaderOrder spreader;
SpreaderOrder spreader(spreader_manager.alt_order_gateway());
REQUIRE(spreader.test_only_func_spreader_state() == SpreaderState::START);
// on_init_new and activate
spreader.test_only_on_init_new (order_def, pao_services);
@@ -28,12 +28,34 @@ using namespace spark;
void fill_book(bts::orderman::Book&, double*, uint16_t*, bts::api::Side);
class AltOrderGatewayForTest : public IAlternateOrderGateway{
public:
void place_order(SecurityKey,
OrderKey,
api::Side,
Price,
Quantity) override{
}
void modify_order(OrderKey,
Price,
Quantity) override{
}
void cancel_order(OrderKey) override{
}
OrderKey generate_key() override{
auto rv = static_cast<uint32_t>(bts::Timer::now().time_since_epoch().count());
return OrderKey(rv);
}
//virtual ~IAlternateOrderGateway() {}
};
class SpreaderManagerForTest : public ISpreaderManager
{
private:
bts::orderman::OrderKey _spreader_order_key;
SpreaderBookkeepingData _bookkeeping_data;
CacheWarmingState _cw_state;
AltOrderGatewayForTest _alt_order_gateway;
public:
SpreaderManagerForTest (bts::orderman::OrderKey spreader_order_key,
const api::orderman::OrderDefinition& order_def,
@@ -93,7 +115,7 @@ public:
return rv;
}
IAlternateOrderGateway* alt_order_gateway() override{
return nullptr;
return &_alt_order_gateway;
}
bool in_cache_warming_cycle() const override{
return false;
@@ -41,7 +41,7 @@ bts::orderman::Book* find_book(MDP3SecurityID id,
struct SimSpreader::PImpl {
const OrderDefinition order_def;
const SpreaderPreActivationOrderServices pao_services;
const SpreaderOrderServices so_services = SpreaderOrderServices(nullptr);
const SpreaderOrderServices so_services;
ISimServices* sim_services = nullptr;
SpreaderOrder spreader;
std::vector<bts::orderman::Book> books;
@@ -50,6 +50,7 @@ struct SimSpreader::PImpl {
:
order_def(order_def),
pao_services(sec),
so_services(nullptr),
spreader(),
books(){
for (const auto& l : sec.synthetic().legs())