🐛 ♻️

Author: andersstorhaug

TronDotNet/Lite3.Core.C.cs

@@ -143,7 +143,7 @@ private static Status VerifyKey(
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     private static Status VerifyValue(ReadOnlySpan<byte> buffer, ref int offset)
     {
-        if (ValueSize > buffer.Length || offset > buffer.Length - ValueSize)
+        if (ValueHeaderSize > buffer.Length || offset > buffer.Length - ValueHeaderSize)
         {
             _logger.LogError("VALUE OUT OF BOUNDS");
             return Status.ValueOutOfBounds;
@@ -156,7 +156,7 @@ private static Status VerifyValue(ReadOnlySpan<byte> buffer, ref int offset)
             return Status.ValueKindInvalid;
         }
 
-        var valueEntrySize = ValueSize + ValueKindSizes[(int)kind];
+        var valueEntrySize = ValueHeaderSize + ValueKindSizes[(int)kind];
         if (valueEntrySize > buffer.Length || offset > buffer.Length - valueEntrySize)
         {
             _logger.LogError("VALUE OUT OF BOUNDS");
@@ -167,7 +167,7 @@ private static Status VerifyValue(ReadOnlySpan<byte> buffer, ref int offset)
         {
             var byteCount = 0;
             for (var i = 0; i < ValueKindSizes[(int)ValueKind.Bytes]; i++)
-                byteCount |= buffer[offset + ValueSize + i] << (8 * i);
+                byteCount |= buffer[offset + ValueHeaderSize + i] << (8 * i);
 
             valueEntrySize += byteCount;
 
@@ -614,7 +614,7 @@ public static Status InitializeArray(Span<byte> buffer, out int position)
     ///     <para>
     ///         <b>Note</b>: this function expects the caller to write to:
     ///         <list type="number">
-    ///             <item><see cref="ValueEntry.Type" />: the value type (length of <see cref="ValueSize" />).</item>
+    ///             <item><see cref="ValueEntry.Type" />: the value type (length of <see cref="ValueHeaderSize" />).</item>
     ///             <item><see cref="ValueEntry.Value" />: the actual value (length of <see cref="valueLength" />).</item>
     ///         </list>
     ///     </para>
@@ -656,7 +656,7 @@ private static Status SetImpl(
             ((keyData.Size >> (16 - KeyTagKeySizeShift) != 0 ? 1 : 0) << 1) +
             (keyData.Size >> (8 - KeyTagKeySizeShift) != 0 ? 1 : 0) +
             (keyData.Size != 0 ? 1 : 0);
-        var baseEntrySize = keyTagSize + (int)keyData.Size + ValueSize + valueLength;
+        var baseEntrySize = keyTagSize + (int)keyData.Size + ValueHeaderSize + valueLength;
 
         if ((offset & NodeAlignmentMask) != 0)
         {
@@ -958,7 +958,7 @@ private static Status SetImpl(
 
                     valueStartOffset = position;
                     value = new ValueEntry(buffer, position);
-                    position += ValueSize + valueLength;
+                    position += ValueHeaderSize + valueLength;
 
                     _logger.LogProbe("OK");
                     return 0;

TronDotNet/Lite3.Core.H.cs

@@ -103,7 +103,7 @@ public readonly ref struct ReadOnlyValueEntry(ReadOnlySpan<byte> buffer, int sta
         private readonly ReadOnlySpan<byte> _buffer = buffer;
         internal ValueKind Type => (ValueKind)_buffer[Offset];
         public readonly int Offset = startOffset;
-        internal readonly int ValueOffset = startOffset + ValueSize;
+        internal readonly int ValueOffset = startOffset + ValueHeaderSize;
         internal ReadOnlySpan<byte> Value => _buffer[ValueOffset..];
     }
 
@@ -112,10 +112,10 @@ internal ref struct ValueEntry(Span<byte> buffer, int startOffset)
     {
         private Span<byte> _buffer = buffer;
         public ref byte Type => ref _buffer[startOffset];
-        public Span<byte> Value => _buffer[(startOffset + ValueSize)..];
+        public Span<byte> Value => _buffer[(startOffset + ValueHeaderSize)..];
     }
 
-    private const int ValueSize = 1;
+    internal const int ValueHeaderSize = 1;
 
     /// <remarks><em>Ported from C <c>lite3_type_sizes</c>.</em></remarks>
     internal static readonly int[] ValueKindSizes =
@@ -126,8 +126,8 @@ internal ref struct ValueEntry(Span<byte> buffer, int startOffset)
         8, // F64
         4, // Bytes
         4, // String
-        NodeSize - ValueSize, // Object
-        NodeSize - ValueSize, // Array
+        NodeSize - ValueHeaderSize, // Object
+        NodeSize - ValueHeaderSize, // Array
         0 // Invalid
     ];
 

TronDotNet/Tron.cs

@@ -108,10 +108,7 @@ public string GetStringValue(TronContext context)
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public int GetSize()
         {
-            var result = Lite3.GetValueSize(value);
-            if (value.Type is Lite3.ValueKind.String or Lite3.ValueKind.Bytes)
-                result += Lite3.ValueKindSizes[(int)value.Type];
-            return result;
+            return Lite3.ValueHeaderSize + Lite3.GetValueSize(value);
         }
 
         /// <inheritdoc cref="Lite3.ValueIsNull" />