diff --git a/src/client/spark_api/utils/IImmutableMessage.cs b/src/client/spark_api/utils/IImmutableMessage.cs index 72d30f57e..1c4debe24 100644 --- a/src/client/spark_api/utils/IImmutableMessage.cs +++ b/src/client/spark_api/utils/IImmutableMessage.cs @@ -8,13 +8,13 @@ using System.Text; using System.Threading.Tasks; namespace bts.api { - internal interface IImmutableMessage { + public interface IImmutableMessage { MessageDescriptor Descriptor { get; } int CalculateSize(); void WriteTo(CodedOutputStream output); } - internal static class ImmutableProtoExtensions { + public static class ImmutableProtoExtensions { public static void WriteTo(this IImmutableMessage message, Stream output) { var stream = new CodedOutputStream(output); message.WriteTo(stream); diff --git a/src/client/spark_sdk/samples/MarketDataClient.cs b/src/client/spark_sdk/samples/MarketDataClient.cs index 302a06e09..525be52e3 100644 --- a/src/client/spark_sdk/samples/MarketDataClient.cs +++ b/src/client/spark_sdk/samples/MarketDataClient.cs @@ -33,7 +33,7 @@ namespace bts.sdk static MDRequest load_request() { var req = new MDRequest(); - var prods = _md.Value.request_products(new ProductListRequest()).Products; + var prods = _md.Value.request_products(new VoidMessage()).Products; foreach(var prod in prods) req.Channels.Add(new SecurityChannel() { Exchange = prod.Exchange, Type = prod.Type, Symbol = prod.Symbol, Flags = 0 }); return req; diff --git a/src/lib/api/services/MarketDataRelay.proto b/src/lib/api/services/MarketDataRelay.proto index c502e9152..1a8d10138 100644 --- a/src/lib/api/services/MarketDataRelay.proto +++ b/src/lib/api/services/MarketDataRelay.proto @@ -1,10 +1,21 @@ syntax="proto3"; package bts.co2; +option csharp_namespace="bts.co2"; import "lib/api/apioptions.proto"; +import "lib/api/apicore.proto"; +import "lib/domain_model/Security.proto"; import "lib/md/protos/co2.proto"; +message ProductListReply { + repeated bts.api.Product products = 1; +} +message ExpirationNameList { + map names = 1; +} + service MarketDataRelay { option (bts.api.service_description)="Poll the market data service for updates"; rpc requestmd(bts.co2.MDRequest) returns (bts.co2.MDReply); - rpc request_products(bts.co2.ProductListRequest) returns (bts.co2.ProductListReply); + rpc request_products(bts.api.VoidMessage) returns (ProductListReply); + rpc request_names(bts.api.VoidMessage) returns (ExpirationNameList); } \ No newline at end of file diff --git a/src/lib/md/protos/co2.proto b/src/lib/md/protos/co2.proto index f324e2362..a173cf257 100644 --- a/src/lib/md/protos/co2.proto +++ b/src/lib/md/protos/co2.proto @@ -154,11 +154,6 @@ message RFQList { repeated QuoteRequestMessage items = 1; } -message ProductListRequest {} -message ProductListReply { - repeated bts.api.Product products = 1; -} - message CoconutReplayHeader { string magic = 1; uint32 version = 2; diff --git a/src/lib/md/relay/QueryServer.cpp b/src/lib/md/relay/QueryServer.cpp index c2291984f..e1ab797a0 100644 --- a/src/lib/md/relay/QueryServer.cpp +++ b/src/lib/md/relay/QueryServer.cpp @@ -12,6 +12,7 @@ #include "lib/config/protos/system.pb.h" #include "lib/md/protos/co2.pb.h" +#include "lib/api/apicore.pb.h" #include "lib/api/services/MarketDataRelay.server.pb.h" #include "lib/api/public/ServiceContext.h" @@ -338,8 +339,7 @@ struct MDRelayServer : bts::co2::MarketDataRelayBase { }); } - virtual void request_products(const ProductListRequest&, const std::function& reply) override - { + virtual void request_products(const api::VoidMessage&, const std::function& reply) override { ProductListReply list; std::set syms; get_system_md_symbols(syms); @@ -352,6 +352,10 @@ struct MDRelayServer : bts::co2::MarketDataRelayBase { } reply(list); } + + virtual void request_names(const api::VoidMessage&, const std::function& reply) override { + (void)reply; + } }; struct QueryServer {