diff --git a/src/server/sparkd/CMakeDeps.cmake b/src/server/sparkd/CMakeDeps.cmake index e06cee504..ff639c14b 100644 --- a/src/server/sparkd/CMakeDeps.cmake +++ b/src/server/sparkd/CMakeDeps.cmake @@ -1 +1 @@ -set(sources ;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/TestOrderman.cpp;event_grid/EventNode.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/Market.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/store_tests.cpp;main.cpp;md/platforms/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.cpp;md/platforms/mdp3_onixs/MDP3Listener.cpp;md/platforms/mdp3_onixs/MDP3Main.cpp;md/platforms/mdp3_onixs/MDP3Utils.cpp;md/platforms/mdp3_onixs/tests/mdp3_tests.cpp;md/run_md.cpp;orderman/components/FillRecorder.cpp;orderman/components/Gateway.cpp;orderman/components/MDSource.cpp;orderman/components/NativeOrderMan.cpp;orderman/components/OrderRecorder.cpp;orderman/components/SpreaderOrderMan.cpp;orderman/events/ExecutionReport.cpp;orderman/events/NativeOrderStateChange.cpp;orderman/events/SpreaderOrderStateChange.cpp;orderman/events/TimeChange.cpp;orderman/native_orders/NativeOrder.cpp;orderman/native_orders/NativeOrderBuilder.cpp;orderman/native_orders/NativeOrderFactory.cpp;orderman/persistence/FillDB.cpp;orderman/persistence/OrderDB.cpp;orderman/persistence/gen_order_id.cpp;orderman/service/OrderServiceServer.cpp;orderman/spreader_orders/SpreaderOrder.cpp;orderman/spreader_orders/SpreaderOrderBase.cpp;orderman/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForFirstConnStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/tests/hedger_tests.cpp;orderman/tests/quoter_tests.cpp;orderman/utils/fix_order_codec.cpp;orderman/utils/orderman_utils.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.cpp;risk_limits/AccountRiskLimiter.cpp;risk_limits/IRiskLimitObserver.cpp;risk_limits/OperatorRiskLimiter.cpp;risk_limits/RiskLimitManager.cpp;risk_limits/RiskLimiter.cpp;risk_limits/SymbolKey.cpp;risk_limits/tests/RiskLimitsTests.cpp;securities/SecurityDB.cpp;spreader/SingleFillHedger.cpp;spreader/SingleLegQuoter.cpp;spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;testing/catch_test_runner.cpp;user/AccountServiceServer.cpp;user/UserServiceServer.cpp;user/tests/UserAndAccountTests.cpp) \ No newline at end of file +set(sources ;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/TestOrderman.cpp;event_grid/EventNode.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/Market.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/store_tests.cpp;main.cpp;md/platforms/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.cpp;md/platforms/mdp3_onixs/MDP3Listener.cpp;md/platforms/mdp3_onixs/MDP3Main.cpp;md/platforms/mdp3_onixs/MDP3Utils.cpp;md/platforms/mdp3_onixs/tests/mdp3_tests.cpp;md/run_md.cpp;orderman/components/FillRecorder.cpp;orderman/components/Gateway.cpp;orderman/components/MDSource.cpp;orderman/components/NativeOrderMan.cpp;orderman/components/OrderRecorder.cpp;orderman/components/SpreaderOrderMan.cpp;orderman/events/ExecutionReport.cpp;orderman/events/NativeOrderStateChange.cpp;orderman/events/SpreaderOrderStateChange.cpp;orderman/events/TimeChange.cpp;orderman/native_orders/NativeOrder.cpp;orderman/native_orders/NativeOrderBuilder.cpp;orderman/native_orders/NativeOrderFactory.cpp;orderman/persistence/FillDB.cpp;orderman/persistence/OrderDB.cpp;orderman/persistence/gen_order_id.cpp;orderman/service/OrderServiceServer.cpp;orderman/spreader_orders/SpreaderOrder.cpp;orderman/spreader_orders/SpreaderOrderBase.cpp;orderman/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForFirstConnStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/tests/spreader_tests.cpp;orderman/utils/fix_order_codec.cpp;orderman/utils/orderman_utils.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.cpp;risk_limits/AccountRiskLimiter.cpp;risk_limits/IRiskLimitObserver.cpp;risk_limits/OperatorRiskLimiter.cpp;risk_limits/RiskLimitManager.cpp;risk_limits/RiskLimiter.cpp;risk_limits/SymbolKey.cpp;risk_limits/tests/RiskLimitsTests.cpp;securities/SecurityDB.cpp;spreader/SingleFillHedger.cpp;spreader/SingleLegQuoter.cpp;spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;testing/catch_test_runner.cpp;user/AccountServiceServer.cpp;user/UserServiceServer.cpp;user/tests/UserAndAccountTests.cpp) \ No newline at end of file diff --git a/src/server/sparkd/orderman/tests/hedger_tests.cpp b/src/server/sparkd/orderman/tests/hedger_tests.cpp deleted file mode 100644 index 7b6c97304..000000000 --- a/src/server/sparkd/orderman/tests/hedger_tests.cpp +++ /dev/null @@ -1,26 +0,0 @@ -#include -#include - -#include "server/sparkd/securities/SecurityDB.h" -#include "lib/domain_model/Security.h" -#include "lib/utils/bts_assert.h" -#include "server/sparkd/orderman/utils/orderman_utils.h" -#include "server/sparkd/orderman/native_orders/NativeOrderFactory.h" -#include "lib/api/services/OrderService.pb.h" -#include "server/sparkd/orderman/spreader_orders/SpreaderOrder.h" -#include "server/sparkd/spreader/SpreaderLegData.h" -#include "lib/utils/datetime.h" -#include "lib/utils/PBUtils.h" -#include "lib/utils/bts_chrono.h" - - -namespace bts { -namespace orderman { - -using namespace orderman; -using namespace api; -using namespace spark; - - -}} - diff --git a/src/server/sparkd/orderman/tests/quoter_tests.cpp b/src/server/sparkd/orderman/tests/spreader_tests.cpp similarity index 95% rename from src/server/sparkd/orderman/tests/quoter_tests.cpp rename to src/server/sparkd/orderman/tests/spreader_tests.cpp index 1dd10896d..41e02581d 100644 --- a/src/server/sparkd/orderman/tests/quoter_tests.cpp +++ b/src/server/sparkd/orderman/tests/spreader_tests.cpp @@ -235,19 +235,6 @@ TEST_CASE ("book traversal", "[spreader]") bts_assert (calc_quantity == Quantity (0)); } } -void verify_leg_data (SpreaderLegData& l, OrderKey order_key, size_t leg_index, uint32_t sec_key, uint32_t exp_yr, uint32_t exp_m, uint32_t exp_day, const std::string& symbol, double leg_mult, double price_mult, api::Side side) -{ - bts_assert(l.order_key() == order_key); - bts_assert(l.leg_property_data().leg_index() == leg_index); - bts_assert(l.leg_property_data().security_key() == sec_key); - bts_assert(l.leg_property_data().leg_contract().security().future().expiration_year() == exp_yr); - bts_assert(l.leg_property_data().leg_contract().security().future().expiration_month() == exp_m); - bts_assert(l.leg_property_data().leg_contract().security().future().expiration_day() == exp_day); - bts_assert(l.leg_property_data().leg_contract().security().symbol() == symbol); - bts_assert(l.leg_property_data().size_multiplier() == leg_mult); - bts_assert(l.leg_property_data().price_multiplier() == price_mult); - bts_assert(l.leg_property_data().trading_side() == side); -} //this is how the spreader organizes the data TEST_CASE ("spreader bookkeeping data", "[spreader]") { @@ -490,7 +477,9 @@ TEST_CASE ("compute hedge price quantity 2 legs", "[spreader]") bts_assert (out_hedge_quantity.value() == 26); bts_assert (out_hedge_price.value() == 2332.5); } - +/************************************************************************************************************/ +/*********************************************Quoter State Tests*********************************************/ +/************************************************************************************************************/ TEST_CASE ("quoter_START_state", "[spreader]") { Price spreader_price = Price (0.35); Quantity spreader_quantity (100); @@ -1091,6 +1080,57 @@ TEST_CASE ("cycle", "[spreader]") test_complete_quoter_state (quoter, QuoterState::END, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(0), Quantity(0), Quantity (0), true); LOG(OrderMan, Diag, "cycle"); } +/************************************************************************************************************/ +/*********************************************Hedger State Tests*********************************************/ +/************************************************************************************************************/ +TEST_CASE ("hedger_START_state", "[spreader]") +{ + Price hedger_price = Price (0.5); Quantity hedger_quantity (20); + SpreaderManagerForTest sm = create_spreader_manager_2_legs (bts::api::Venue::VENUE_GLBX, "ES", 2017, 12, 15, 1.0, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.25, + bts::api::Venue::VENUE_GLBX, "ES", 2017, 3, 15, 1.0, -1.0, 1.0, api::Side::SIDE_SELL, 1.0, 0.25); + SingleFillHedger hedger (sm, sm.get_leg_data (1), bts::orderman::SpreaderOrderBase::ChildOrder(), hedger_price, hedger_quantity, api::Side::SIDE_SELL); + test_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); + SECTION("0. transition_to_start") + { + test_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); + LOG(OrderMan, Diag, "hedger_START_state.transition_to_start"); + } + SECTION("1. init") + { + hedger.init (); + test_complete_hedger_state (hedger, HedgerState::WAITING_FOR_FIRST_ACK, hedger_price, hedger_quantity, Quantity (0), hedger_price, hedger_quantity, hedger_quantity); + LOG(OrderMan, Diag, "hedger_START_state.init"); + } +// SECTION("3. on_book") +// { +// double prices[] = {2000, 2000.25, 2000.5, 2000.75, 2002}; uint16_t sizes[] = {10, 5, 15, 5, 25}; +// fire_book_update_hedger (prices, sizes, api::Side::SIDE_SELL, hedger); +// test_complete_hedger_state (hedger, HedgerState::WAITING_FOR_FIRST_ACK, hedger_price, hedger_quantity, Quantity (0), hedger_price, hedger_quantity, hedger_quantity); +// LOG(OrderMan, Diag, "hedger_START_state.on_book"); +// } + SECTION("4. cancel_hedge") + { + hedger.cancel_hedge(); + test_complete_hedger_state (hedger, HedgerState::END, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); + LOG(OrderMan, Diag, "hedger_START_state.cancel_hedge"); + } + SECTION("5. terminate") + { + hedger.terminate (); + test_complete_hedger_state (hedger, HedgerState::END, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); + LOG(OrderMan, Diag, "hedger_START_state.terminate"); + } +} +TEST_CASE ("hedger_WAITING_FOR_FIRST_ACK_state", "[spreader]") +{ + Price hedger_price = Price (0.5); Quantity hedger_quantity (20); + SpreaderManagerForTest sm = create_spreader_manager_2_legs (bts::api::Venue::VENUE_GLBX, "ES", 2017, 12, 15, 1.0, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.25, + bts::api::Venue::VENUE_GLBX, "ES", 2017, 3, 15, 1.0, -1.0, 1.0, api::Side::SIDE_SELL, 1.0, 0.25); + SingleFillHedger hedger (sm, sm.get_leg_data (1), bts::orderman::SpreaderOrderBase::ChildOrder(), hedger_price, hedger_quantity, api::Side::SIDE_SELL); + test_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); + hedger.init (); + test_complete_hedger_state (hedger, HedgerState::WAITING_FOR_FIRST_ACK, hedger_price, hedger_quantity, Quantity (0), hedger_price, hedger_quantity, hedger_quantity); +} //TEST_CASE ("Spreader Order", "[spreader]") // void disabled_temp() // { diff --git a/src/server/sparkd/orderman/tests/tests_common.h b/src/server/sparkd/orderman/tests/tests_common.h index fee3633a9..142d1f1e5 100644 --- a/src/server/sparkd/orderman/tests/tests_common.h +++ b/src/server/sparkd/orderman/tests/tests_common.h @@ -149,7 +149,6 @@ Security make_spreader_security() bts_assert (rv.contract_spec().high_tick() == 0.25); return rv; } - ExecutionStrategy create_execution_strategy(uint32_t leg_1_id, uint32_t leg_2_id) { // leg 1 @@ -180,8 +179,7 @@ ExecutionStrategy create_execution_strategy(uint32_t leg_1_id, uint32_t leg_2_id rv.mutable_leg_params_map()->insert(google::protobuf::MapPair(leg_2_id, leg_2_spreaderparams)); bts_assert (rv.leg_params_map().size() == 2); return rv; -} - +} api::orderman::CreateSpreaderOrder create_spreader_order_creation(std::string account_name, std::string operator_id, Price price, Quantity quantity, api::Side side) { @@ -199,7 +197,6 @@ api::orderman::CreateSpreaderOrder create_spreader_order_creation(std::string ac rv.mutable_execution_strategy()->MergeFrom(execution_strategy); return rv; } - api::orderman::CreateOrderRequest make_spreader_order_create_request(api::Side side, Price price, Quantity quantity) { api::orderman::CreateOrderRequest result; @@ -371,4 +368,37 @@ void fire_book_update (double* prices, uint16_t* sizes, api::Side side, size_t l sm.set_book (book, leg_index); quoter.on_book (bts::orderman::NullTickToTradeCorID, leg_index, book); } +void verify_leg_data (SpreaderLegData& l, OrderKey order_key, size_t leg_index, uint32_t sec_key, uint32_t exp_yr, uint32_t exp_m, uint32_t exp_day, const std::string& symbol, double leg_mult, double price_mult, api::Side side) +{ + bts_assert(l.order_key() == order_key); + bts_assert(l.leg_property_data().leg_index() == leg_index); + bts_assert(l.leg_property_data().security_key() == sec_key); + bts_assert(l.leg_property_data().leg_contract().security().future().expiration_year() == exp_yr); + bts_assert(l.leg_property_data().leg_contract().security().future().expiration_month() == exp_m); + bts_assert(l.leg_property_data().leg_contract().security().future().expiration_day() == exp_day); + bts_assert(l.leg_property_data().leg_contract().security().symbol() == symbol); + bts_assert(l.leg_property_data().size_multiplier() == leg_mult); + bts_assert(l.leg_property_data().price_multiplier() == price_mult); + bts_assert(l.leg_property_data().trading_side() == side); +} + +void test_complete_hedger_state (const SingleFillHedger& hedger, HedgerState state, Price target_price, Quantity target_quantity, Quantity aggregated_filled_quantity, + Price out_price, Quantity, Quantity remaining_to_fill) +{ + bts_assert (hedger.test_only_func_hedger_state() == state); + const HedgePriceQuantityState& hedger_pq_state = hedger.test_only_func_price_quantity_state (); + bts_assert (hedger_pq_state.target_price() == target_price); + bts_assert (hedger_pq_state.target_quantity() == target_quantity); + bts_assert (hedger_pq_state.aggregated_filled_quantity() == aggregated_filled_quantity); + bts_assert (hedger_pq_state.out_price() == out_price); + bts_assert (hedger_pq_state.remaining_to_fill() == remaining_to_fill); +} + +void fire_book_update_hedger (double* prices, uint16_t* sizes, api::Side side, SingleFillHedger& hedger) +{ + Book book; + fill_book (book, prices, sizes, side); + hedger.on_book (bts::orderman::NullTickToTradeCorID, book); +} + }} \ No newline at end of file diff --git a/src/server/sparkd/spreader/SingleFillHedger.h b/src/server/sparkd/spreader/SingleFillHedger.h index d72ea40a3..9adc4f36d 100644 --- a/src/server/sparkd/spreader/SingleFillHedger.h +++ b/src/server/sparkd/spreader/SingleFillHedger.h @@ -49,6 +49,22 @@ public: bts::Quantity hedge_quantity, api::Side hedge_side); ~SingleFillHedger() {} + //1. leave the start state and submit the order + void init(); + //2. called by the spreader when there is an order update + // reported by the exchange + void on_order_update(const SpreaderOrderUpdateMessage& order_update_message); + //3. called when the market data associated + // with this security is changed + void on_book(TickToTradeCorID corid, const Book& book); + //4. called when the hedge order is cancelled, either + // manually or automatically + void cancel_hedge(); + //5. immediatly terminates this hedger, without any attempts + // to cancel the order + void terminate (); + //6. on the engine infrastructure time + void on_time(const bts::TimeStamp&); // true if the hedger has an active working order bool is_active_order() const; // returns true if the quoter is in the final state, from which @@ -57,29 +73,16 @@ public: // true if the hedger can accept a price change bool accepting_price_change() const; // this is the order quantity net of the fills (qty - filled_qty) - Quantity remaining_to_fill() const; - // hedger does not do anything until this - void init(); - // called by the spreader when there is an order update - // reported by the exchange - void on_order_update(const SpreaderOrderUpdateMessage& order_update_message); - // called when the market data associated - // with this security is changed - void on_book(TickToTradeCorID corid, const Book& book); - // called when the hedge order is cancelled, either - // manually or automatically - void cancel_hedge(); - // immediatly terminates this hedger, without any attempts - // to cancel the order - void terminate (); - // on the engine infrastructure time - void on_time(const bts::TimeStamp&); + Quantity remaining_to_fill() const; friend HedgerStartStateWorker; friend HedgerWaitingForFirstAckStateWorker; friend HedgerWaitingForFirstAckCancelledStateWorker; friend HedgerWorkingStateWorker; friend HedgerWaitingForCancelAckStateWorker; friend HedgerEndStateWorker; +public: + HedgerState test_only_func_hedger_state() const { return _worker->state (); } + const HedgePriceQuantityState& test_only_func_price_quantity_state () const {return _price_quantity_state;} }; }} diff --git a/src/server/sparkd/spreader/SingleLegQuoter.h b/src/server/sparkd/spreader/SingleLegQuoter.h index d8585978a..cd38a1156 100644 --- a/src/server/sparkd/spreader/SingleLegQuoter.h +++ b/src/server/sparkd/spreader/SingleLegQuoter.h @@ -84,7 +84,7 @@ public: //3. called when the market data associated // with this security is changed void on_book(orderman::TickToTradeCorID cid,size_t leg_index, const bts::orderman::Book&); - //4. called when the hedge order is cancelled, either + //4. called when the order is cancelled, either // manually or automatically void cancel_order(); //5. the quoter forgets everything and goes to the end state diff --git a/src/server/sparkd/spreader/SpreaderUtils.h b/src/server/sparkd/spreader/SpreaderUtils.h index fa1fa744d..9e3f6db6e 100644 --- a/src/server/sparkd/spreader/SpreaderUtils.h +++ b/src/server/sparkd/spreader/SpreaderUtils.h @@ -7,6 +7,7 @@ #include "server/sparkd/orderman/md/Book.h" #include "server/sparkd/spreader/LegPropertyData.h" #include "server/sparkd/spreader/QuoteLegPriceQuantityState.h" +#include "server/sparkd/spreader/SpreaderUtils.h" namespace bts { namespace orderman { diff --git a/src/server/sparkd/spreader/hedger/HedgePriceQuantityState.h b/src/server/sparkd/spreader/hedger/HedgePriceQuantityState.h index 91ab5a5d3..102f9195d 100644 --- a/src/server/sparkd/spreader/hedger/HedgePriceQuantityState.h +++ b/src/server/sparkd/spreader/hedger/HedgePriceQuantityState.h @@ -16,7 +16,8 @@ private: // filled part of the order, updated as fills come in Quantity _aggregated_filled_quantity; // the price of the "active" hedger order - Price _out_price; + Price _out_price; + Quantity _out_quantity; public: HedgePriceQuantityState(Price target_price, Quantity target_quantity, api::Side target_side) : @@ -24,24 +25,35 @@ public: _target_quantity(target_quantity), _side (target_side), _aggregated_filled_quantity(0), - _out_price (_target_price) + _out_price (0), + _out_quantity (0) { + } + Price target_price() const { return _target_price; } + Quantity target_quantity() const { return _target_quantity; } + api::Side side() const { return _side; } + Quantity aggregated_filled_quantity() const { return _aggregated_filled_quantity; } + Price out_price () const {return _out_price;} + Quantity out_quantity () const {return _out_quantity;} + // this is the order quantity net of the fills + Quantity remaining_to_fill() const + { + uint32_t rv = _aggregated_filled_quantity.value() >= _target_quantity.value() ? 0 : _target_quantity.value() - _aggregated_filled_quantity.value(); + return Quantity(rv); } // called as the hedge order gets filled void update_fill(Quantity fill_quantity) { _aggregated_filled_quantity = Quantity(_aggregated_filled_quantity.value() + fill_quantity.value()); } - Price target_price() const { return _target_price; } - Quantity target_quantity() const { return _target_quantity; } - api::Side side() const { return _side; } - Quantity aggregated_filled_quantity() const { return _aggregated_filled_quantity; } - Price out_price () const {return _out_price;} - // this is the order quantity net of the fills - Quantity remaining_to_fill() const + void update_out_price_quantity (Price out_price, Quantity out_quantity) { - uint32_t rv = _aggregated_filled_quantity.value() >= _target_quantity.value() ? 0 : _target_quantity.value() - _aggregated_filled_quantity.value(); - return Quantity(rv); - } + _out_price = out_price; + _out_quantity = out_quantity; + } + void clear_out_price_quantity () + { + update_out_price_quantity (Price (0), Quantity (0)); + } }; }} \ No newline at end of file diff --git a/src/server/sparkd/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp b/src/server/sparkd/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp index aec42beff..f52b1becc 100644 --- a/src/server/sparkd/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp +++ b/src/server/sparkd/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp @@ -15,7 +15,9 @@ void HedgerStartStateWorker::init() LOG(OrderMan, Diag, "HedgerStartStateWorker::init order_key: {}, placing order price: {} quantity: {}", _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->_order.create(bts::orderman::NullTickToTradeCorID, _hedger->_price_quantity_state.out_price(), _hedger->_price_quantity_state.target_quantity()); + _hedger->_price_quantity_state.update_out_price_quantity (_hedger->_price_quantity_state.target_price(), _hedger->_price_quantity_state.target_quantity()); + // TODO:temp + //_hedger->_order.create(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&)