Skip to content

fix: correct Bytes.BytesComparer length comparison ordering #10353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asdacap merged 5 commits into from
Feb 6, 2026
Merged

fix: correct Bytes.BytesComparer length comparison ordering #10353

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a9e1349
fix: correct Bytes.BytesComparer length comparison ordering
asdacap Jan 29, 2026
4ad7da4
Switched to sequence compare to
asdacap Feb 4, 2026
428df71
Address comment
asdacap Feb 5, 2026
21b1ef8
Merge branch 'master' into fix/bytes-comparer-length-comparison
asdacap Feb 6, 2026
da3d957
fix: handle null y in BytesComparer when x is non-null
asdacap Feb 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/Nethermind/Nethermind.Core.Test/BytesTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ public class BytesTests
{
[TestCase("0x", "0x", 0)]
[TestCase(null, null, 0)]
[TestCase(null, "0x", 1)]
[TestCase("0x", null, -1)]
[TestCase(null, "0x", -1)]
[TestCase("0x", null, 1)]
[TestCase("0x01", "0x01", 0)]
[TestCase("0x01", "0x0102", 1)]
[TestCase("0x0102", "0x01", -1)]
[TestCase("0x01", "0x0102", -1)]
[TestCase("0x0102", "0x01", 1)]
public void Compares_bytes_properly(string? hexString1, string? hexString2, int expectedResult)
{
IComparer<byte[]> comparer = Bytes.Comparer;
Expand Down
37 changes: 6 additions & 31 deletions src/Nethermind/Nethermind.Core/Extensions/Bytes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,24 +73,24 @@ public override int Compare(byte[]? x, byte[]? y)

if (x is null)
{
return y is null ? 0 : 1;
return y is null ? 0 : -1;
}

if (y is null)
{
return -1;
return 1;
}

if (x.Length == 0)
{
return y.Length == 0 ? 0 : 1;
return y.Length == 0 ? 0 : -1;
}

for (int i = 0; i < x.Length; i++)
{
if (y.Length <= i)
{
return -1;
return 1;
}

int result = x[i].CompareTo(y[i]);
Comment thread
LukaszRozmej marked this conversation as resolved.
Outdated
Expand All @@ -100,37 +100,12 @@ public override int Compare(byte[]? x, byte[]? y)
}
}

return y.Length > x.Length ? 1 : 0;
return y.Length > x.Length ? -1 : 0;
}

public static int Compare(ReadOnlySpan<byte> x, ReadOnlySpan<byte> y)
Comment thread
LukaszRozmej marked this conversation as resolved.
{
if (Unsafe.AreSame(ref MemoryMarshal.GetReference(x), ref MemoryMarshal.GetReference(y)) &&
x.Length == y.Length)
{
return 0;
}

if (x.Length == 0)
{
return y.Length == 0 ? 0 : 1;
}

for (int i = 0; i < x.Length; i++)
{
if (y.Length <= i)
{
return -1;
}

int result = x[i].CompareTo(y[i]);
if (result != 0)
{
return result;
}
}

return y.Length > x.Length ? 1 : 0;
return x.SequenceCompareTo(y);
}
}

Expand Down