From 02752d9151fffd47178da60e96fffc3ad5805e4d Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Fri, 10 May 2019 16:14:06 -0400 Subject: [PATCH] SPARK-2064: simple sanity simplified --- src/client/spark_test/System/SpreaderTests.cs | 134 +++++++----------- 1 file changed, 53 insertions(+), 81 deletions(-) diff --git a/src/client/spark_test/System/SpreaderTests.cs b/src/client/spark_test/System/SpreaderTests.cs index a752f6cae..10a8a42d5 100644 --- a/src/client/spark_test/System/SpreaderTests.cs +++ b/src/client/spark_test/System/SpreaderTests.cs @@ -72,109 +72,81 @@ namespace bts.tests test_account, test_user ); + var spreader_order1_response = await OrderUtilities.send_order(_order_service, order1_def, -0.30, 1); + Assert.IsTrue(spreader_order1_response.success, "Failed to send first spreader order"); - var spreader_orders1 = await OrderUtilities.wait_for_filtered_orders(_order_service, - o => o.Where(ordi => ordi.Key == spreader_order1_response.value.OrderKey).Count() > 0, - ord => ord.Where(ordi => ordi.Key == spreader_order1_response.value.OrderKey)); - Assert.IsTrue(spreader_orders1.result.Count() > 0, "Can't find spreader order"); + var (spreader_order_is_working, working_spreader_order1) = await verify_order_status(spreader_order1_response.value.OrderKey, OrderStatus.Working); + Assert.IsTrue(spreader_order_is_working, "Spreader order is not Working"); - var working_spreader_order1 = spreader_orders1.result.Where(ordi => ordi.Key == spreader_order1_response.value.OrderKey).TryFirst(); - Assert.IsTrue(working_spreader_order1.HasValue, "Spreader order not found"); - Assert.IsTrue(working_spreader_order1.Value.State.Status == OrderStatus.Working, "Spreader order is not Working"); + var (quoting_order_is_working, working_quoting_order) = await verify_child_order_status(spreader_order1_response.value.OrderKey, OrderStatus.Working); + Assert.IsTrue(quoting_order_is_working, "Order is not Working"); + Assert.IsTrue(working_quoting_order.Value.State.Price == 18.6, "Quoting order has the wrong price"); - var quoting_orders = await OrderUtilities.wait_for_filtered_orders(_order_service, - o => o.Where(ordi => ordi.ParentKey == spreader_order1_response.value.OrderKey).Count() > 0, - ord => ord.Where(ordi => ordi.ParentKey == spreader_order1_response.value.OrderKey)); - - var quoting_order = quoting_orders.result.TryFirst(); - Assert.IsTrue(quoting_order.HasValue, "order not found"); - Assert.IsTrue(quoting_order.Value.State.Status == OrderStatus.Working, "Order is not Working"); - Assert.IsTrue(quoting_order.Value.State.Price == 18.6, "Quoting order has the wrong price"); - - var spreader_order1_cancel_ret = await OrderUtilities.cancel_orders(_order_service, new List {working_spreader_order1.Value}); - - var canceled_quoting_orders = await OrderUtilities.wait_for_filtered_orders(_order_service, - o => o.Where(ordi => ordi.ParentKey == spreader_order1_response.value.OrderKey && ordi.State.Status == OrderStatus.Canceled).Count() > 0, - ord => ord.Where(ordi => ordi.ParentKey == spreader_order1_response.value.OrderKey), - TimeSpan.FromSeconds(30)); - - var canceled_quoting_order = canceled_quoting_orders.result.TryFirst(); - Assert.IsTrue(canceled_quoting_order.HasValue, "order not found"); - Assert.IsTrue(canceled_quoting_order.Value.State.Status == OrderStatus.Canceled, "Quoting order may not have been canceled"); + Assert.IsTrue(await OrderUtilities.cancel_orders(_order_service, new List {working_spreader_order1.Value}), "Failed to cancel order"); + var (quoting_order_is_canceled, canceled_quoting_order) = await verify_child_order_status(spreader_order1_response.value.OrderKey, OrderStatus.Canceled); + Assert.IsTrue(quoting_order_is_canceled, "Quoting order may not have been canceled"); // Spreader Order 2 var spreader_order2_response = await OrderUtilities.send_order(_order_service, order1_def, -0.30, 1); + Assert.IsTrue(spreader_order2_response.success, "Failed to send spreader order 2"); - var spreader_orders2 = await OrderUtilities.wait_for_filtered_orders(_order_service, - o => o.Where(ordi => ordi.Key == spreader_order2_response.value.OrderKey).Count() > 0, - ord => ord.Where(ordi => ordi.Key == spreader_order2_response.value.OrderKey)); - Assert.IsTrue(spreader_orders2.result.Count() > 0, "Can't find spreader order 2"); + var (spreader_order2_is_working, working_spreader_order2) = await verify_order_status(spreader_order2_response.value.OrderKey, OrderStatus.Working); - var working_spreader_order2 = spreader_orders2.result.TryFirst(); - Assert.IsTrue(working_spreader_order2.HasValue, "Spreader order not found"); - Assert.IsTrue(working_spreader_order2.Value.State.Status == OrderStatus.Working, "Spreader order 2 is not Working"); + Assert.IsTrue(spreader_order2_is_working, "Spreader order 2 is not 'Working'"); var spreader_order2_change_response = await OrderUtilities.modify_order(_order_service, working_spreader_order2.Value, -0.6); - var spreader_orders2_after_change = await OrderUtilities.wait_for_filtered_orders(_order_service, - o => o.Where(ordi => ordi.Key == spreader_order2_response.value.OrderKey && ordi.State.Price == -0.6).Count() > 0, - ord => ord.Where(ordi => ordi.Key == spreader_order2_response.value.OrderKey)); - Assert.IsTrue(spreader_orders2_after_change.result.Count() > 0, "Can't find spreader order 2 after first price change"); + Assert.IsTrue(spreader_order2_change_response.success, "failed to modify spreader order"); - var spreader_order2_after_change = spreader_orders2_after_change.result.TryFirst(); - Assert.IsTrue(spreader_order2_after_change.HasValue, "order not found"); - Assert.IsTrue(spreader_order2_after_change.Value.State.Price == -0.6, "Failed to change price of spreader order"); - - var changed_quoting_order_price = 18.9; - - var changed_quoting_orders = await OrderUtilities.wait_for_filtered_orders(_order_service, - o => o.Where(ordi => ordi.ParentKey == spreader_order2_response.value.OrderKey && Math.Truncate(ordi.State.Price * 10.0) == 10.0 * changed_quoting_order_price).Count() > 0, - ord => ord.Where(ordi => ordi.ParentKey == spreader_order2_response.value.OrderKey), - TimeSpan.FromSeconds(30)); - - - - var changed_quoting_order = changed_quoting_orders.result.TryFirst(); - Assert.IsTrue(changed_quoting_order.HasValue, "order not found"); - Assert.IsTrue(Math.Truncate(changed_quoting_order.Value.State.Price * 10.0) == 10.0 * changed_quoting_order_price, "Quoting order has the wrong price"); + Assert.IsTrue(await verify_order_price(spreader_order2_response.value.OrderKey, -0.6), "Failed to change price of spreader order"); + // verify quoting order price + Assert.IsTrue(await verify_child_order_price(spreader_order2_response.value.OrderKey, 18.9), "Quoting order incorrect or not found"); //fill spreader order var spreader_order2_fill_change_response = await OrderUtilities.modify_order(_order_service, working_spreader_order2.Value, -0.2); - var spreader_orders2_fill_after_change = await OrderUtilities.wait_for_filtered_orders(_order_service, - o => o.Where(ordi => ordi.Key == spreader_order2_response.value.OrderKey && ordi.State.Price == -0.2).Count() > 0, - ord => ord.Where(ordi => ordi.Key == spreader_order2_response.value.OrderKey)); - Assert.IsTrue(spreader_orders2_fill_after_change.result.Count() > 0, "Can't find spreader order 2 after first price change"); + Assert.IsTrue(spreader_order2_fill_change_response.success, "failed to modify spreader order"); - var spreader_order2_fill_after_change = spreader_orders2_fill_after_change.result.TryFirst(); - Assert.IsTrue(spreader_order2_fill_after_change.HasValue, "order not found"); - Assert.IsTrue(spreader_order2_fill_after_change.Value.State.Price == -0.2, "Failed to change price of spreader order"); + Assert.IsTrue(await verify_order_price(spreader_order2_response.value.OrderKey, -0.2), "Failed to change price of spreader order"); - var filled_quoting_order_price = 18.5; - - var filled_quoting_orders = await OrderUtilities.wait_for_filtered_orders(_order_service, - o => o.Where(ordi => ordi.ParentKey == spreader_order2_response.value.OrderKey && Math.Truncate(ordi.State.Price * 10.0) == 10.0 * filled_quoting_order_price).Count() > 0, - ord => ord.Where(ordi => ordi.ParentKey == spreader_order2_response.value.OrderKey && Math.Truncate(ordi.State.Price * 10.0) == 10.0 * filled_quoting_order_price), - TimeSpan.FromSeconds(30)); - - var filled_quoting_order = filled_quoting_orders.result.TryFirst(); - Assert.IsTrue(filled_quoting_order.HasValue, "order not found"); - Assert.IsTrue(Math.Truncate(filled_quoting_order.Value.State.Price * 10.0) == 10.0 * filled_quoting_order_price, "Quoting order has the wrong price"); - - var hedging_order_price = 18.3; - - var hedging_orders = await OrderUtilities.wait_for_filtered_orders(_order_service, - o => o.Where(ordi => ordi.ParentKey == spreader_order2_response.value.OrderKey && Math.Truncate(ordi.State.Price * 10.0) == 10.0 * hedging_order_price).Count() > 0, - ord => ord.Where(ordi => ordi.ParentKey == spreader_order2_response.value.OrderKey && Math.Truncate(ordi.State.Price * 10.0) == 10.0 * hedging_order_price), - TimeSpan.FromSeconds(30)); - - var hedging_order = hedging_orders.result.TryFirst(); - Assert.IsTrue(hedging_order.HasValue, "order not found"); - Assert.IsTrue(Math.Truncate(hedging_order.Value.State.Price * 10.0) == 10.0 * hedging_order_price, "Hedging order has the wrong price"); + // verify quoting order price + Assert.IsTrue(await verify_child_order_price(spreader_order2_response.value.OrderKey, 18.5), "Quoting order incorrect or not found"); + // verify Hedging order price + Assert.IsTrue(await verify_child_order_price(spreader_order2_response.value.OrderKey, 18.3), "Hedging order incorrect or not found"); } + private async Task<(Boolean, OrderRecordImmutable?)> verify_child_order_status(uint parent_order_key, OrderStatus expected_status) { + var order = await get_order(ordi => ordi.ParentKey == parent_order_key && ordi.State.Status == expected_status); + return (order.HasValue && order.Value.State.Status == expected_status, order); + } + private async Task<(Boolean, OrderRecordImmutable?)> verify_order_status(uint order_key, OrderStatus expected_status) { + var order = await get_order(ordi => ordi.Key == order_key); + return (order.HasValue && order.Value.State.Status == expected_status, order); + } + + private async Task verify_order_price(uint order_key, double expected_price, double precision = 10) { + var order = await get_order(ordi => ordi.Key == order_key && Math.Truncate(ordi.State.Price * precision) == precision * expected_price); + return order.HasValue && (Math.Truncate(order.Value.State.Price * precision) == precision * expected_price); + } + + private async Task verify_child_order_price(uint parent_order_key, double expected_price, double precision = 10.0) + { + var order = await get_order(ordi => ordi.ParentKey == parent_order_key && Math.Truncate(ordi.State.Price * precision) == precision * expected_price); + return order.HasValue && (Math.Truncate(order.Value.State.Price * precision) == precision * expected_price); + } + + private async Task get_order(Func predicate) + { + var orders = await OrderUtilities.wait_for_filtered_orders(_order_service, + o => o.Where(predicate).Count() > 0, + ord => ord.Where(predicate), + TimeSpan.FromSeconds(30)); + return orders.result.TryFirst(); + } + + } } \ No newline at end of file