Better spreader order state reporting.
This commit is contained in:
1 parent
5072cceb8b
commit
cb8fea89fd
9 files changed
+57
-23
No files matched your search
+1
-1
Submodule externals updated: a15b17370e...466db3141f.
@@ -139,8 +139,8 @@ message NativeOrderState {
|
||||
}
|
||||
|
||||
message SpreaderOrderState {
|
||||
double target_price = 1;
|
||||
uint32 target_quantity = 2 ;
|
||||
double price = 1;
|
||||
uint32 quantity = 2 ;
|
||||
string account_name = 3;
|
||||
string operator_id = 4;
|
||||
}
|
||||
|
||||
@@ -111,7 +111,7 @@ int TestOrderman::execute(std::vector<std::string> const &)
|
||||
while (true) {
|
||||
std::cout <<
|
||||
"create native order: n sec_key b/s price quantity\n"
|
||||
"create spreader order: s sec_key b/s price quantity\n"
|
||||
"create spreader order: s b/s price quantity\n"
|
||||
"update order: u price quantity\n"
|
||||
"cancel order: x\n"
|
||||
"change current order: o order_key n|s\n";
|
||||
|
||||
@@ -40,9 +40,15 @@ SpreaderOrderMan::SpreaderOrderMan (securities::SecurityDB &sec_db,
|
||||
: me(new PImpl(sec_db,native_order_factory))
|
||||
{
|
||||
for (auto const &os : existing_orders)
|
||||
if (os.has_spreader())
|
||||
me->spreader_orders[OrderKey(os.order_key()) ] =
|
||||
std::make_unique<SpreaderOrder>(sec_db,me->native_order_factory,os);
|
||||
if (os.has_spreader()) {
|
||||
auto spreader = std::make_unique<SpreaderOrder>(sec_db,me->native_order_factory,os);
|
||||
spreader->init_signals(spreader_order_state_change_signal,
|
||||
create_native_order_signal,
|
||||
update_native_order_signal,
|
||||
cancel_native_order_signal,
|
||||
md_subscription_signal);
|
||||
me->spreader_orders[OrderKey(os.order_key()) ] = std::move(spreader);
|
||||
}
|
||||
}
|
||||
|
||||
SpreaderOrderMan::~SpreaderOrderMan() {}
|
||||
@@ -50,8 +56,9 @@ SpreaderOrderMan::~SpreaderOrderMan() {}
|
||||
void SpreaderOrderMan::on(event_grid::event::Init const&)
|
||||
{
|
||||
LOG(OrderMan,Diag, "SpreaderOrderMan init");
|
||||
for (auto const &kvp : me->spreader_orders)
|
||||
for (auto const &kvp : me->spreader_orders) {
|
||||
kvp.second->init();
|
||||
}
|
||||
}
|
||||
|
||||
void SpreaderOrderMan::on(event::CreateSpreaderOrder const&cso)
|
||||
@@ -65,6 +72,11 @@ void SpreaderOrderMan::on(event::CreateSpreaderOrder const&cso)
|
||||
order = std::make_unique<SpreaderOrder> (me->sec_db,
|
||||
me->native_order_factory,
|
||||
cso.order_key,cso.create);
|
||||
order->init_signals(spreader_order_state_change_signal,
|
||||
create_native_order_signal,
|
||||
update_native_order_signal,
|
||||
cancel_native_order_signal,
|
||||
md_subscription_signal);
|
||||
order->init();
|
||||
if (me->gateway_ready)
|
||||
order->on_connect();
|
||||
|
||||
@@ -31,8 +31,8 @@ api::orderman::OrderState to_pb(SpreaderOrderHeader const&header,SpreaderOrderSt
|
||||
if (current_state.reject_msg)
|
||||
result.set_reject_msg(*current_state.reject_msg);
|
||||
|
||||
spreader.set_target_price(current_state.target_price.value());
|
||||
spreader.set_target_quantity(current_state.target_quantity.value());
|
||||
spreader.set_price(current_state.price.value());
|
||||
spreader.set_quantity(current_state.quantity.value());
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -533,14 +533,6 @@ void OrderServiceServer::update_order(const api::orderman::UpdateOrderRequest& u
|
||||
api::orderman::UpdateOrderResponse resp;
|
||||
resp.set_order_key(update.order_key());
|
||||
|
||||
if (!update.has_native()) {
|
||||
resp.set_error_code(api::orderman::OE_UNSUPPORTED_ORDER_TYPE);
|
||||
on_reply(resp);
|
||||
return;
|
||||
}
|
||||
|
||||
auto const&native = update.native();
|
||||
|
||||
if (me->state == State::DISCONNECTED) {
|
||||
resp.set_error_code(api::orderman::OE_GATEWAY_NOT_READY);
|
||||
on_reply(resp);
|
||||
@@ -560,6 +552,7 @@ void OrderServiceServer::update_order(const api::orderman::UpdateOrderRequest& u
|
||||
}
|
||||
|
||||
if (update.has_native()) {
|
||||
auto const&native = update.native();
|
||||
auto it = me->native_order_objs.find(OrderKey(update.order_key()));
|
||||
if (it == me->native_order_objs.end()) {
|
||||
resp.set_error_code(api::orderman::OE_UNKNOWN_ORDER);
|
||||
|
||||
@@ -1,20 +1,36 @@
|
||||
#include "SpreaderOrder.h"
|
||||
#include "lib/logging/logging.h"
|
||||
#include "lib/utils/PBUtils.h"
|
||||
#include "server/sparkd/orderman/spreader_orders/SpreaderOrderState.h"
|
||||
|
||||
namespace bts {
|
||||
namespace orderman {
|
||||
|
||||
struct SpreaderOrder::PImpl
|
||||
{
|
||||
PImpl()
|
||||
PImpl(api::orderman::OrderStatus status,
|
||||
Price price, Quantity quantity,
|
||||
std::string const &reject_msg)
|
||||
:status(status),
|
||||
price(price),
|
||||
quantity(quantity),
|
||||
reject_msg(reject_msg)
|
||||
{}
|
||||
|
||||
api::orderman::OrderStatus status;
|
||||
Price price;
|
||||
Quantity quantity;
|
||||
std::string reject_msg;
|
||||
};
|
||||
|
||||
SpreaderOrder::SpreaderOrder(securities::SecurityDB &db,
|
||||
NativeOrderFactory &f,
|
||||
api::orderman::OrderState const&os)
|
||||
: SpreaderOrderBase(db,f,os) , me (new PImpl())
|
||||
: SpreaderOrderBase(db,f,os) ,
|
||||
me (new PImpl(os.order_status(),
|
||||
Price(os.spreader().price()),
|
||||
Quantity(os.spreader().quantity()),
|
||||
os.reject_msg()))
|
||||
{
|
||||
LOG(OrderMan,Diag,"recovered SpreaderOrder from state. state: {}",
|
||||
utils::pb::to_string(os));
|
||||
@@ -24,7 +40,11 @@ SpreaderOrder::SpreaderOrder(securities::SecurityDB &db,
|
||||
NativeOrderFactory &f,
|
||||
OrderKey k,
|
||||
api::orderman::CreateOrderRequest const&cor)
|
||||
: SpreaderOrderBase(db,f,k,cor) , me (new PImpl())
|
||||
: SpreaderOrderBase(db,f,k,cor) ,
|
||||
me (new PImpl(api::orderman::OS_UNACKNOWLEDGED,
|
||||
Price(cor.spreader().price()),
|
||||
Quantity(cor.spreader().quantity()),
|
||||
std::string("")))
|
||||
{
|
||||
LOG(OrderMan,Diag,"creating new SpreaderOrder. request: {}",
|
||||
utils::pb::to_string(cor));
|
||||
@@ -32,9 +52,17 @@ SpreaderOrder::SpreaderOrder(securities::SecurityDB &db,
|
||||
|
||||
SpreaderOrder::~SpreaderOrder () {}
|
||||
|
||||
void SpreaderOrder::report_state()
|
||||
{
|
||||
report_state_change(
|
||||
SpreaderOrderState {
|
||||
me->status, me->price,me->quantity,me->reject_msg.empty()? nullptr:&me->reject_msg});
|
||||
}
|
||||
|
||||
void SpreaderOrder::init()
|
||||
{
|
||||
LOG(OrderMan,Diag,"Init");
|
||||
report_state();
|
||||
}
|
||||
|
||||
void SpreaderOrder::on_connect()
|
||||
|
||||
@@ -44,6 +44,7 @@ public:
|
||||
void on_external_error(std::string const&);
|
||||
|
||||
private:
|
||||
void report_state();
|
||||
struct PImpl;
|
||||
std::unique_ptr<PImpl> me;
|
||||
};
|
||||
|
||||
@@ -9,8 +9,8 @@ class SpreaderOrderState
|
||||
{
|
||||
public:
|
||||
api::orderman::OrderStatus order_status;
|
||||
Price target_price;
|
||||
Quantity target_quantity;
|
||||
Price price;
|
||||
Quantity quantity;
|
||||
std::string *reject_msg;
|
||||
};
|
||||
|
||||
|
||||
Reference in new issue
Block a user