From 441abf1e6a15a39f1ef7bf5e4ee2a4a43bff327b Mon Sep 17 00:00:00 2001 From: Joel Grunbaum <joelgrun@gmail.com> Date: Thu, 20 Jan 2022 05:18:00 +0000 Subject: [PATCH] Added names and ready notice --- protocol.cpp | 65 ++++++++++++++++++++++++-------- 1 files changed, 49 insertions(+), 16 deletions(-) diff --git a/protocol.cpp b/protocol.cpp index a4b8475..f336597 100644 --- a/protocol.cpp +++ b/protocol.cpp @@ -175,28 +175,58 @@ json::DeletedMessage* message) { if (message->side == book::Buy) { - bs[message->product].bidSide.erase(message->id); + for (auto i = bs[message->product].bidSide.begin(); + i != bs[message->product].bidSide.end(); i++) { + if (i->id == message->id) { + bs[message->product].bidSide.erase(i); + break; + } + } } else { - bs[message->product].askSide.erase(message->id); + for (auto i = bs[message->product].askSide.begin(); + i != bs[message->product].askSide.end(); i++) { + if (i->id == message->id) { + bs[message->product].askSide.erase(i); + break; + } + } } } void tradeOrder(std::unordered_map<std::string, book::Book>& bs, json::TradeMessage* message) { - if (bs.find(message->passiveOrder) != bs.end()) { - if (message->tradeType == json::BUY_AGGRESSOR) { - if (message->passiveOrderRemaining > 0) { - bs[message->product].askSide.at(message->passiveOrder).volume = - message->passiveOrderRemaining; - } else { - bs[message->product].askSide.erase(message->passiveOrder); + if (message->tradeType == json::BUY_AGGRESSOR) { + if (message->passiveOrderRemaining > 0) { + for (auto& i : bs[message->product].askSide) { + if (i.id == message->passiveOrder) { + i.volume = message->passiveOrderRemaining; + break; + } } - } else if (message->tradeType == json::SELL_AGGRESSOR) { - if (message->passiveOrderRemaining > 0) { - bs[message->product].bidSide.at(message->passiveOrder).volume = - message->passiveOrderRemaining; - } else { - bs[message->product].bidSide.erase(message->passiveOrder); + } else { + for (auto i = bs[message->product].askSide.begin(); + i != bs[message->product].askSide.end(); i++) { + if (i->id == message->passiveOrder) { + bs[message->product].askSide.erase(i); + break; + } + } + } + } else if (message->tradeType == json::SELL_AGGRESSOR) { + if (message->passiveOrderRemaining > 0) { + for (auto& i : bs[message->product].bidSide) { + if (i.id == message->passiveOrder) { + i.volume = message->passiveOrderRemaining; + break; + } + } + } else { + for (auto i = bs[message->product].bidSide.begin(); + i != bs[message->product].bidSide.end(); i++) { + if (i->id == message->passiveOrder) { + bs[message->product].bidSide.erase(i); + break; + } } } } @@ -212,7 +242,10 @@ httplib::MultipartFormDataItems a = {{"message", message, "", ""}, {"username", USER, "", ""}, {"password", PASS, "", ""}}; - auto res = cli.Post("/execution", a); + auto res = cli.Post("/execution", + "message=" + message + "&username=" + USER + + "&password=" + PASS, + "application/x-www-form-urlencoded"); std::string b = res->body; std::queue<json::Message*> c = json::parse(b); return c.front(); -- Gitblit v1.9.3