From ed3bc9f71ce4e00befa1706d8e27d6388a8dee5f Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 19 Feb 2020 16:32:50 -0600 Subject: [PATCH] Cancel and Cancel-Replace shoud use OrigClOrdID to lookup bts key --- src/client/spark_fix/session/OrderSession.cs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/client/spark_fix/session/OrderSession.cs b/src/client/spark_fix/session/OrderSession.cs index c72617d9f..86db04d27 100644 --- a/src/client/spark_fix/session/OrderSession.cs +++ b/src/client/spark_fix/session/OrderSession.cs @@ -58,9 +58,10 @@ create algo virtual public void OnMessage(OrderCancelRequest cancel, SessionID s) { - var id = cancel.OrderID.getValue(); - if(!uint.TryParse(id, out uint key)) - throw new IncorrectTagValue(QuickFix.Fields.Tags.OrderID); + var original_client_id = cancel.OrigClOrdID.getValue(); + if (!base._external_id_vs_bts_key.ContainsKey(original_client_id)) + throw new IncorrectTagValue(QuickFix.Fields.Tags.OrigClOrdID); + var key = base._external_id_vs_bts_key[original_client_id]; var resp = _orderservice.Value.cancel_order(new Cancel { OrderKey = key }); if (resp.ErrorCode != OrderError.Ok) { @@ -70,9 +71,10 @@ create algo virtual public void OnMessage(OrderCancelReplaceRequest replace, SessionID s) { - var id = replace.OrderID.getValue(); - if (!uint.TryParse(id, out uint key)) - throw new IncorrectTagValue(QuickFix.Fields.Tags.OrderID); + var original_client_id = replace.OrigClOrdID.getValue(); + if (!base._external_id_vs_bts_key.ContainsKey(original_client_id)) + throw new IncorrectTagValue(QuickFix.Fields.Tags.OrigClOrdID); + var key = base._external_id_vs_bts_key[original_client_id]; double price = Convert.ToDouble(replace.Price.getValue()); uint sz = Convert.ToUInt32(Math.Abs(replace.OrderQty.getValue())); var upd = new Update