(improvement) add some test for new methods

Author: Neo-vortex

src/Solnet.Programs/Models/NameService/TokenData.cs

@@ -53,8 +53,8 @@ public static TokenData Deserialize(byte[] input)
             var data = new ReadOnlySpan<byte>(input, 96, input.Length - 96);
             int offset = 0;
 
-            offset += data.GetBorshString(0, out var name);
-            offset += data.GetBorshString(offset, out var ticker);
+            offset += data.GetBorshStringSize(0, out var name);
+            offset += data.GetBorshStringSize(offset, out var ticker);
 
             var mint = data.GetPubKey(offset);
             offset += 32;
@@ -64,7 +64,7 @@ public static TokenData Deserialize(byte[] input)
             string website = null, logo = null;
 
             if (data.GetBool(offset++))
-                offset += data.GetBorshString(offset, out website);
+                offset += data.GetBorshStringSize(offset, out website);
 
             if (data.GetBool(offset++))
                 data.GetBorshString(offset, out logo);

src/Solnet.Programs/Utilities/Deserialization.cs

@@ -242,15 +242,32 @@ public static (string EncodedString, int Length) DecodeBincodeString(this ReadOn
         /// <param name="result">The decoded data./>.</param>
         /// <returns>The length in bytes that was read from the original buffer, including the</returns>
         /// <exception cref="ArgumentOutOfRangeException">Thrown when the offset is too big for the span.</exception>
-        public static int GetBorshString(this ReadOnlySpan<byte> data, int offset, out string result)
+        public static string GetBorshString(this ReadOnlySpan<byte> data, int offset, out string result)
         {
             if (offset + sizeof(uint) > data.Length)
                 throw new ArgumentOutOfRangeException(nameof(offset));
-
             int stringLength = (int)data.GetU32(offset);
             byte[] stringBytes = data.GetSpan(offset + sizeof(uint), stringLength).ToArray();
             result = Encoding.UTF8.GetString(stringBytes);
 
+            return result;
+        }
+        /// <summary>
+        /// Get size of the Borsh string
+        /// </summary>
+        /// <param name="data"></param>
+        /// <param name="offset"></param>
+        /// <param name="result"></param>
+        /// <returns></returns>
+        /// <exception cref="ArgumentOutOfRangeException"></exception>
+        public static int GetBorshStringSize(this ReadOnlySpan<byte> data, int offset, out string result)
+        {
+            if (offset + sizeof(uint) > data.Length)
+                throw new ArgumentOutOfRangeException(nameof(offset));
+
+            int stringLength = (int)data.GetU32(offset);
+            byte[] stringBytes = data.GetSpan(offset + sizeof(uint), stringLength).ToArray();
+            result = Encoding.UTF8.GetString(stringBytes);
             return stringLength + sizeof(uint);
         }
 

test/Solnet.Programs.Test/BpfLoaderProgramTest.cs

@@ -0,0 +1,38 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Solnet.Programs.Utilities;
+using System;
+
+namespace Solnet.Programs.Test;
+
+
+[TestClass]
+public class BpfLoaderProgramTest
+{
+    private string _expectedBorshStringResult =
+        "0B00000068656C6C6F20776F726C6400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000";
+    private string _expectedBorshStringResult2 =
+        "000B00000068656C6C6F20776F726C64000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000";
+    [TestMethod]
+    public  void BorshStringSerializationTest()
+    {
+        var sampleString = "hello world";
+        var buffer = new byte[100];
+        buffer.WriteBorshString( sampleString, 0);
+        Assert.AreEqual( Convert.ToHexString(buffer) ,_expectedBorshStringResult );
+        buffer = new byte[100];
+        buffer.WriteBorshString( sampleString, 1);
+        Assert.AreEqual( Convert.ToHexString(buffer) ,_expectedBorshStringResult2 );
+    }
+
+    [TestMethod]
+    public void BorshStringDeserializationTest()
+    {
+        var sampleString = "hello world";
+        var sample1 =  new ReadOnlySpan<byte>(Convert.FromHexString(_expectedBorshStringResult)) ;
+        sample1.GetBorshString(0, out var result);
+        Assert.AreEqual(sampleString,result );
+        sample1 =  new ReadOnlySpan<byte>(Convert.FromHexString(_expectedBorshStringResult2)) ;
+        sample1.GetBorshString(1, out var result2);
+        Assert.AreEqual(sampleString,result2 );
+    }
+}

test/Solnet.Programs.Test/Solnet.Programs.Test.csproj

@@ -4,6 +4,8 @@
     <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
+
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
   <ItemGroup>