diff --git a/src/client/spark/Orders/FillTupleSource.cs b/src/client/spark/Orders/FillTupleSource.cs index 09520c149..ce2067564 100644 --- a/src/client/spark/Orders/FillTupleSource.cs +++ b/src/client/spark/Orders/FillTupleSource.cs @@ -113,21 +113,19 @@ namespace mbts.spark { HashSet added_keys = new HashSet(fills.added.Select(f => f.FillKey)), removed_keys = new HashSet(fills.removed.Select(f => f.FillKey)); foreach (var kv in removed) { - _state.Remove(kv.Key); if (!added_keys.Contains(kv.Key)) { _order_fills.remove(kv.Value.fill.OrderKey, kv.Key); _security_fills.remove(kv.Value.fill.SecurityKey, kv.Key); } } foreach (var kv in added) { - _state.Add(kv.Key, kv.Value); if (!removed_keys.Contains(kv.Key)) { _order_fills.add(kv.Value.fill.OrderKey, kv.Key); _security_fills.add(kv.Value.fill.SecurityKey, kv.Key); } } _fills = fills.state; - _last_update = new IncrementalUpdate(added, removed); + _apply_changes(added, removed); // FillTuple get_fill_tuple(FillImmutable fill) => new FillTuple(fill, _orders.TryGetValue(fill.OrderKey, out OrderRecordImmutable o) ? o : new OrderRecordImmutable?(), @@ -165,7 +163,7 @@ namespace mbts.spark { } } _orders = orders.state; - _last_update = new IncrementalUpdate(added, removed); + _apply_changes(added, removed); // IEnumerable get_fill_tuples(OrderRecordImmutable? o, ISet fill_keys) => fill_keys.Select(k => { @@ -200,7 +198,7 @@ namespace mbts.spark { } } _securities = securities; - _last_update = new IncrementalUpdate(added, removed); + _apply_changes(added, removed); // IEnumerable get_fill_tuples(SecurityImmutable? s, ISet fill_keys) => fill_keys.Select(k => { @@ -208,6 +206,14 @@ namespace mbts.spark { return new FillTuple(fill, _orders.TryGetValue(fill.OrderKey, out OrderRecordImmutable o) ? o : new OrderRecordImmutable?(), s); }); } + + void _apply_changes(Dictionary added, Dictionary removed) { + foreach (var kv in removed) + _state.Remove(kv.Key); + foreach (var kv in added) + _state.Add(kv.Key, kv.Value); + _last_update = new IncrementalUpdate(added, removed); + } } } } \ No newline at end of file