GrpcModels,Core: move Match converter

Move Match type converter from RedisStorageLayer to
GrpcModels.ModelSerialization since it's not used in Redis,
but only in GRPC.

src/FX.Core/RedisStorageLayer.fs

@@ -34,48 +34,6 @@ module Serialization =
         override this.Write(writer, value, _options ) =
             writer.WriteStringValue(value.ToString())
 
-    type MatchTypeConverter() =
-        inherit JsonConverter<Match>()
-
-        override this.Read(reader, _typeToConvert, _options) =
-            if reader.TokenType <> JsonTokenType.StartObject then
-                raise <| JsonException()
-
-            // "Type" key
-            reader.Read() |> ignore
-            if reader.TokenType <> JsonTokenType.PropertyName || reader.GetString() <> "Type" then
-                raise <| JsonException()
-            // "Type" value
-            reader.Read() |> ignore
-            match reader.GetString() with
-            | "Full" ->
-                reader.Read() |> ignore
-                if reader.TokenType <> JsonTokenType.EndObject then
-                    raise <| JsonException()
-                Match.Full
-            | "Partial" -> 
-                // "Amount" key
-                reader.Read() |> ignore
-                if reader.TokenType <> JsonTokenType.PropertyName || reader.GetString() <> "Amount" then
-                    raise <| JsonException()
-                // "Amount" value
-                let amount = reader.GetDecimal()
-                reader.Read() |> ignore
-                if reader.TokenType <> JsonTokenType.EndObject then
-                    raise <| JsonException()
-                Match.Partial amount
-            | typeName -> raise <| JsonException("Unknown Match type: " + typeName)
-
-        override this.Write(writer, value, _options ) =
-            writer.WriteStartObject()
-            match value with
-            | Full ->
-                writer.WriteString("Type", "Full")
-            | Partial amount ->
-                writer.WriteString("Type", "Partial")
-                writer.WriteNumber("Amount", amount)
-            writer.WriteEndObject()
-
     // code from https://gist.github.com/mbuhot/c224f15e0266adf5ba8ca4e882f88a75
     // Converts Option<T> to/from JSON by projecting to null or T
     type OptionValueConverter<'T>() =
@@ -107,8 +65,7 @@ module Serialization =
     let serializationOptions =
         let options = JsonSerializerOptions()
         options.Converters.Add(SideTypeConverter())
-        options.Converters.Add(CurrencyTypeConverter())
-        options.Converters.Add(MatchTypeConverter())
+        options.Converters.Add(CurrencyTypeConverter()) 
         options.Converters.Add(OptionConverter())
         options
 

src/FX.GrpcModels/FX.GrpcModels.fsproj

@@ -7,6 +7,7 @@
 
   <ItemGroup>
     <Compile Include="Models.fs" />
+    <Compile Include="ModelSerialization.fs" />
     <Compile Include="Marshalling.fs" />
   </ItemGroup>
 

src/FX.GrpcModels/Marshalling.fs

@@ -4,7 +4,7 @@ open System
 open System.Reflection
 open System.Text.Json
 
-open FsharpExchangeDotNetStandard.Redis.Serialization
+open ModelSerialization
 
 module VersionHelper =
     let CURRENT_VERSION =

src/FX.GrpcModels/ModelSerialization.fs

@@ -0,0 +1,54 @@
+namespace GrpcModels
+
+open System.Text.Json
+open System.Text.Json.Serialization
+
+open FsharpExchangeDotNetStandard
+
+module ModelSerialization =
+    type MatchTypeConverter() =
+        inherit JsonConverter<Match>()
+
+        override this.Read(reader, _typeToConvert, _options) =
+            if reader.TokenType <> JsonTokenType.StartObject then
+                raise <| JsonException()
+
+            // "Type" key
+            reader.Read() |> ignore
+            if reader.TokenType <> JsonTokenType.PropertyName || reader.GetString() <> "Type" then
+                raise <| JsonException()
+            // "Type" value
+            reader.Read() |> ignore
+            match reader.GetString() with
+            | "Full" ->
+                reader.Read() |> ignore
+                if reader.TokenType <> JsonTokenType.EndObject then
+                    raise <| JsonException()
+                Match.Full
+            | "Partial" -> 
+                // "Amount" key
+                reader.Read() |> ignore
+                if reader.TokenType <> JsonTokenType.PropertyName || reader.GetString() <> "Amount" then
+                    raise <| JsonException()
+                // "Amount" value
+                let amount = reader.GetDecimal()
+                reader.Read() |> ignore
+                if reader.TokenType <> JsonTokenType.EndObject then
+                    raise <| JsonException()
+                Match.Partial amount
+            | typeName -> raise <| JsonException("Unknown Match type: " + typeName)
+
+        override this.Write(writer, value, _options ) =
+            writer.WriteStartObject()
+            match value with
+            | Full ->
+                writer.WriteString("Type", "Full")
+            | Partial amount ->
+                writer.WriteString("Type", "Partial")
+                writer.WriteNumber("Amount", amount)
+            writer.WriteEndObject()
+
+    let serializationOptions = 
+        let options = JsonSerializerOptions(Redis.Serialization.serializationOptions)
+        options.Converters.Add(MatchTypeConverter())
+        options