Address RLP writer review comments

Author: flcl42

src/Nethermind/Nethermind.Network.Enr/NodeRecordSigner.cs

@@ -93,7 +93,8 @@ public NodeRecord Deserialize(ref RlpReader reader)
             int noSigSequenceLength = Rlp.LengthOfSequence(noSigContentLength);
             byte[] originalContent = new byte[noSigSequenceLength];
             RlpWriter writer = new(originalContent);
-            WriteOriginalContent(ref writer, noSigContentLength, reader.Read(noSigContentLength));
+            writer.StartSequence(noSigContentLength);
+            writer.WriteEncodedRlp(reader.Read(noSigContentLength));
             reader.Position = startPosition;
             nodeRecord.OriginalContentRlp = originalContent;
         }
@@ -103,14 +104,6 @@ public NodeRecord Deserialize(ref RlpReader reader)
 
         return nodeRecord;
     }
-
-    private static void WriteOriginalContent<TWriter>(ref TWriter writer, int contentLength, ReadOnlySpan<byte> content)
-        where TWriter : struct, IRlpWriteBackend, allows ref struct
-    {
-        writer.StartSequence(contentLength);
-        writer.Write(content);
-    }
-
     /// <summary>
     /// Verifies if the public key recovered from the <see cref="Signature"/> of this record matches
     /// the one that is included in the <value>Secp256k1</value> entry.

src/Nethermind/Nethermind.Network.Test/P2P/Subprotocols/Snap/Messages/RlpByteArrayListTests.cs

@@ -86,19 +86,6 @@ public void RlpWriter_WriteByteArrayList_WithWrapper_MatchesCanonicalEncoding(by
         Assert.That(buffer.AsSpan(0, writer.Position).ToArray(), Is.EqualTo(expected));
     }
 
-    [TestCaseSource(nameof(TestCases))]
-    public void ByteBuffer_WriteByteArrayList_WithWrapper_MatchesCanonicalEncoding(byte[][] items)
-    {
-        using RlpByteArrayList list = CreateList(items);
-        byte[] expected = EncodeItems(items);
-
-        using DisposableByteBuffer byteBuffer = Unpooled.Buffer(expected.Length).AsDisposable();
-        byteBuffer.WriteRlpByteArrayList(list);
-
-        Assert.That(byteBuffer.ReadableBytes, Is.EqualTo(expected.Length));
-        Assert.That(byteBuffer.AsSpan().ToArray(), Is.EqualTo(expected));
-    }
-
     [TestCaseSource(nameof(TestCases))]
     public void ByteBuffer_RlpWriter_WithWrapper_MatchesCanonicalEncoding(byte[][] items)
     {

src/Nethermind/Nethermind.Network/P2P/Subprotocols/Eth/V63/Messages/NodeDataMessageSerializer.cs

@@ -11,8 +11,12 @@ public class NodeDataMessageSerializer : IZeroInnerMessageSerializer<NodeDataMes
     {
         private static readonly RlpLimit RlpLimit = RlpLimit.For<NodeDataMessage>(NethermindSyncLimits.MaxHashesFetch, nameof(NodeDataMessage.Data));
 
-        public void Serialize(IByteBuffer byteBuffer, NodeDataMessage message) =>
-            byteBuffer.WriteRlpByteArrayList(message.Data);
+        public void Serialize(IByteBuffer byteBuffer, NodeDataMessage message)
+        {
+            byteBuffer.EnsureWritable(GetLength(message, out _));
+            ByteBufferRlpWriter writer = new(byteBuffer);
+            writer.WriteByteArrayList(message.Data);
+        }
 
         public NodeDataMessage Deserialize(IByteBuffer byteBuffer) =>
             new(byteBuffer.DecodeRlpByteArrayList());

src/Nethermind/Nethermind.Serialization.Rlp/ByteBufferExtensions.cs

@@ -4,7 +4,6 @@
 using System;
 using DotNetty.Buffers;
 using Nethermind.Core.Buffers;
-using Nethermind.Core.Collections;
 using Nethermind.Core.Extensions;
 
 namespace Nethermind.Serialization.Rlp
@@ -56,41 +55,6 @@ public static void WriteBytes(this IByteBuffer buffer, scoped ReadOnlySpan<byte>
             }
         }
 
-        public static bool TryWriteRlpByteArrayList(this IByteBuffer byteBuffer, IByteArrayList list)
-        {
-            if (list is not IRlpWrapper rlpWrapper) return false;
-            byteBuffer.WriteRlpWrapper(rlpWrapper);
-            return true;
-        }
-
-        public static void WriteRlpWrapper(this IByteBuffer byteBuffer, IRlpWrapper rlpWrapper)
-        {
-            byteBuffer.EnsureWritable(rlpWrapper.RlpLength);
-            ByteBufferRlpWriter writer = new(byteBuffer);
-            rlpWrapper.Write(ref writer);
-        }
-
-        public static void WriteRlpByteArrayList(this IByteBuffer byteBuffer, IByteArrayList list)
-        {
-            if (byteBuffer.TryWriteRlpByteArrayList(list))
-                return;
-
-            int contentLength = 0;
-            for (int i = 0; i < list.Count; i++)
-            {
-                contentLength += Rlp.LengthOf(list[i]);
-            }
-
-            int length = Rlp.LengthOfSequence(contentLength);
-            byteBuffer.EnsureWritable(length);
-            ByteBufferRlpWriter writer = new(byteBuffer);
-            writer.StartSequence(contentLength);
-            for (int i = 0; i < list.Count; i++)
-            {
-                writer.Encode(list[i]);
-            }
-        }
-
         public static RlpByteArrayList DecodeRlpByteArrayList(this IByteBuffer byteBuffer)
         {
             NettyBufferMemoryOwner? memoryOwner = new(byteBuffer);

src/Nethermind/Nethermind.Serialization.Rlp/RlpWriter.cs

@@ -66,10 +66,7 @@ void IRlpWriteBackend.Write(scoped ReadOnlySpan<byte> bytesToWrite)
         }
         else
         {
-            for (int i = 0; i < bytesToWrite.Length; i++)
-            {
-                _byteBuffer.WriteByte(bytesToWrite[i]);
-            }
+            _byteBuffer.WriteBytes(bytesToWrite);
         }
 
         _position += bytesToWrite.Length;

src/Nethermind/Nethermind.Serialization.Rlp/RlpWriterExtensions.cs

@@ -236,10 +236,12 @@ public void Encode(Rlp? rlp)
             }
             else
             {
-                writer.Write(rlp.Bytes);
+                writer.WriteEncodedRlp(rlp.Bytes);
             }
         }
 
+        public void WriteEncodedRlp(scoped ReadOnlySpan<byte> encodedRlp) => writer.Write(encodedRlp);
+
         public void Encode(Bloom? bloom)
         {
             if (ReferenceEquals(bloom, Bloom.Empty))