Bumping solnet version, removing wrappers, fixing bug parsing tx erro…

…rs and changes to optimize ser/des (#60)
bmresearch · Nov 24, 2021 · 75bb6e8 · 75bb6e8
1 parent 1b2ec84
commit 75bb6e8
Show file tree

Hide file tree

Showing 16 changed files with 31 additions and 57 deletions.
diff --git a/SharedBuildProperties.props b/SharedBuildProperties.props
@@ -2,7 +2,7 @@
          xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <Product>Solnet.Serum</Product>
-        <Version>1.0.5</Version>
+        <Version>1.0.6</Version>
         <Copyright>Copyright 2021 &#169; Solnet</Copyright>
         <Authors>blockmountain</Authors>
         <PublisherName>blockmountain</PublisherName>

diff --git a/Solnet.Serum.Examples/Solnet.Serum.Examples.csproj b/Solnet.Serum.Examples/Solnet.Serum.Examples.csproj
@@ -12,8 +12,8 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="Solnet.Rpc" Version="0.4.11" />
-      <PackageReference Include="Solnet.Wallet" Version="0.4.11" />
-      <PackageReference Include="Solnet.KeyStore" Version="0.4.11" />
+      <PackageReference Include="Solnet.Rpc" Version="0.4.14" />
+      <PackageReference Include="Solnet.Wallet" Version="0.4.14" />
+      <PackageReference Include="Solnet.KeyStore" Version="0.4.14" />
     </ItemGroup>
 </Project>
diff --git a/Solnet.Serum.Examples/SubscribeEventQueue.cs b/Solnet.Serum.Examples/SubscribeEventQueue.cs
@@ -1,4 +1,4 @@
-using Solnet.Rpc;
+using Solnet.Programs.Models;
 using Solnet.Rpc.Core.Sockets;
 using Solnet.Serum.Models;
 using Solnet.Wallet;

diff --git a/Solnet.Serum.Examples/SubscribeOpenOrders.cs b/Solnet.Serum.Examples/SubscribeOpenOrders.cs
@@ -1,3 +1,4 @@
+using Solnet.Programs.Models;
 using Solnet.Rpc;
 using Solnet.Serum.Models;
 using System;

diff --git a/Solnet.Serum.Examples/SubscribeOrderBook.cs b/Solnet.Serum.Examples/SubscribeOrderBook.cs
@@ -1,5 +1,6 @@
 // unset
 
+using Solnet.Programs.Models;
 using Solnet.Rpc;
 using Solnet.Serum.Models;
 using System;

diff --git a/Solnet.Serum.Test/MarketManagerStreamingTest.cs b/Solnet.Serum.Test/MarketManagerStreamingTest.cs
@@ -1,5 +1,6 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
+using Solnet.Programs.Models;
 using Solnet.Rpc;
 using Solnet.Serum.Models;
 using Solnet.Wallet;

diff --git a/Solnet.Serum.Test/MarketManagerTestBase.cs b/Solnet.Serum.Test/MarketManagerTestBase.cs
@@ -1,12 +1,12 @@
 using Moq;
+using Solnet.Programs.Models;
 using Solnet.Rpc;
 using Solnet.Rpc.Core.Http;
 using Solnet.Rpc.Core.Sockets;
 using Solnet.Rpc.Messages;
 using Solnet.Rpc.Models;
 using Solnet.Rpc.Types;
 using Solnet.Serum.Models;
-using Solnet.Wallet;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -64,7 +64,8 @@ protected void MockGetAccountInfoAsync(Mock<IRpcClient> rpcMock, string address,
             rpcMock
                 .Setup(s => s.GetAccountInfoAsync(
                     It.Is<string>(s1 => s1 == address),
-                    It.Is<Commitment>(c => c == commitment)))
+                    It.Is<Commitment>(c => c == commitment),
+                    It.IsAny<BinaryEncoding>()))
                 .Callback(() => { })
                 .ReturnsAsync(new RequestResult<ResponseValue<AccountInfo>>(
                     new HttpResponseMessage(HttpStatusCode.OK),

diff --git a/Solnet.Serum.Test/SerumClientStreamingTest.cs b/Solnet.Serum.Test/SerumClientStreamingTest.cs
@@ -1,19 +1,18 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
+using Solnet.Programs.Models;
 using Solnet.Rpc;
 using Solnet.Rpc.Core.Sockets;
 using Solnet.Rpc.Messages;
 using Solnet.Rpc.Models;
 using Solnet.Rpc.Types;
 using Solnet.Serum.Models;
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Net.WebSockets;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Threading;
-using System.Threading.Tasks;
 
 namespace Solnet.Serum.Test
 {

diff --git a/Solnet.Serum.Test/SerumClientTest.cs b/Solnet.Serum.Test/SerumClientTest.cs
@@ -112,7 +112,8 @@ private static Mock<IRpcClient> SetupGetAccountInfo(string responseContent, stri
             rpcMock
                 .Setup(s => s.GetAccountInfoAsync(
                         It.Is<string>(s1 => s1 == address),
-                        It.Is<Commitment>(c => c == commitment)))
+                        It.Is<Commitment>(c => c == commitment),
+                        It.IsAny<BinaryEncoding>()))
                 .ReturnsAsync(new RequestResult<ResponseValue<AccountInfo>>(
                         new HttpResponseMessage(HttpStatusCode.OK),
                         JsonSerializer.Deserialize<ResponseValue<AccountInfo>>(responseContent, JsonSerializerOptions)) 

diff --git a/Solnet.Serum/ISerumClient.cs b/Solnet.Serum/ISerumClient.cs
@@ -1,3 +1,4 @@
+using Solnet.Programs.Models;
 using Solnet.Rpc;
 using Solnet.Rpc.Types;
 using Solnet.Serum.Models;

diff --git a/Solnet.Serum/MarketManager.cs b/Solnet.Serum/MarketManager.cs
@@ -1,13 +1,13 @@
 using Microsoft.Extensions.Logging;
 using Solnet.Programs;
+using Solnet.Programs.Models;
 using Solnet.Rpc;
 using Solnet.Rpc.Builders;
 using Solnet.Rpc.Core.Http;
 using Solnet.Rpc.Core.Sockets;
 using Solnet.Rpc.Messages;
 using Solnet.Rpc.Models;
 using Solnet.Rpc.Types;
-using Solnet.Rpc.Utilities;
 using Solnet.Serum.Models;
 using Solnet.Wallet;
 using System;
@@ -16,7 +16,6 @@
 using System.Numerics;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using System.Threading;
 using System.Threading.Tasks;
 
 namespace Solnet.Serum
@@ -952,16 +951,14 @@ private async Task<SignatureConfirmation> SendTransactionAndSubscribeSignature(b
 
             if (req.ServerErrorCode != 0)
             {
-                if (req.ErrorData != null)
-                {
-                    bool exists = req.ErrorData.TryGetValue("data", out object value);
-                    if (!exists) return sigConf;
-                    string elem = ((JsonElement)value).ToString();
-                    if (elem == null) return sigConf;
-                    SimulationLogs simulationLogs =
-                        JsonSerializer.Deserialize<SimulationLogs>(elem, _jsonSerializerOptions);
-                    sigConf.ChangeState(simulationLogs);
-                }
+                object value = null;
+                var exists = req.ErrorData?.TryGetValue("data", out value) ?? false;
+                if (!exists) return sigConf;
+                var elem = ((JsonElement)value).ToString();
+                if (elem == null) return sigConf;
+                var simulationLogs =
+                    JsonSerializer.Deserialize<SimulationLogs>(elem, _jsonSerializerOptions);
+                sigConf.ChangeState(simulationLogs);
 
                 return sigConf;
             }

diff --git a/Solnet.Serum/Models/SlabLeafNode.cs b/Solnet.Serum/Models/SlabLeafNode.cs
@@ -89,8 +89,8 @@ public class SlabLeafNode : SlabNode
         /// <returns>The SlabNode structure.</returns>
         public static new SlabLeafNode Deserialize(ReadOnlySpan<byte> data)
         {
-            Span<byte> key = data.GetSpan(SlabNode.Layout.KeyOffset, Layout.KeyLength);
-            ulong price = ((ReadOnlySpan<byte>)key).GetU64(Layout.PriceOffset);
+            ReadOnlySpan<byte> key = data.GetSpan(SlabNode.Layout.KeyOffset, Layout.KeyLength);
+            ulong price = key.GetU64(Layout.PriceOffset);
 
             return new SlabLeafNode
             {

diff --git a/Solnet.Serum/Models/SlabNode.cs b/Solnet.Serum/Models/SlabNode.cs
@@ -66,7 +66,7 @@ public static SlabNode Deserialize(ReadOnlySpan<byte> data)
             if (tag is (byte)NodeType.Uninitialized or (byte)NodeType.LastFreeNode or (byte)NodeType.FreeNode)
                 return null;
 
-            Span<byte> blob = data.GetSpan(Layout.BlobOffset, Layout.BlobSpanLength);
+            ReadOnlySpan<byte> blob = data.GetSpan(Layout.BlobOffset, Layout.BlobSpanLength);
 
             return tag switch
             {

diff --git a/Solnet.Serum/Models/Wrappers.cs b/Solnet.Serum/Models/Wrappers.cs
@@ -8,35 +8,6 @@
 
 namespace Solnet.Serum.Models
 {
-    /// <summary>
-    /// Wraps a subscription with a generic type to hold either order book or trade events.
-    /// </summary>
-    public class Subscription
-    {
-        /// <summary>
-        /// The address associated with this data.
-        /// </summary>
-        public PublicKey Address;
-
-        /// <summary>
-        /// The underlying subscription state.
-        /// </summary>
-        public SubscriptionState SubscriptionState;
-    }
-
-    /// <summary>
-    /// Wraps the base subscription to have the underlying data of the subscription, which is sometimes needed to perform
-    /// some logic before returning data to the subscription caller.
-    /// </summary>
-    /// <typeparam name="T">The type of the subscription.</typeparam>
-    internal class SubscriptionWrapper<T> : Subscription
-    {
-        /// <summary>
-        /// The underlying data.
-        /// </summary>
-        public T Data;
-    }
-
     /// <summary>
     /// Wraps the base request result and subscription state, provides an event handler to be notified when the given signature
     /// is <see cref="Commitment.Confirmed"/>, with additional information in the context of the transaction and the execution of it's instructions.

diff --git a/Solnet.Serum/SerumClient.cs b/Solnet.Serum/SerumClient.cs
@@ -1,6 +1,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Console;
 using Solnet.Programs;
+using Solnet.Programs.Models;
 using Solnet.Rpc;
 using Solnet.Rpc.Core.Http;
 using Solnet.Rpc.Core.Sockets;

diff --git a/Solnet.Serum/Solnet.Serum.csproj b/Solnet.Serum/Solnet.Serum.csproj
@@ -19,9 +19,9 @@
         <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0.0" />
         <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0.0" />
         <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0.0" />
-        <PackageReference Include="Solnet.Programs" Version="0.4.11" />
-        <PackageReference Include="Solnet.Rpc" Version="0.4.11" />
-        <PackageReference Include="Solnet.Wallet" Version="0.4.11" />
+        <PackageReference Include="Solnet.Programs" Version="0.4.14" />
+        <PackageReference Include="Solnet.Rpc" Version="0.4.14" />
+        <PackageReference Include="Solnet.Wallet" Version="0.4.14" />
     </ItemGroup>