Small optimization for default pubkey comparison

MetacoSA · Sep 30, 2024 · 0bc86c8 · 0bc86c8
1 parent 8245b0d
commit 0bc86c8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/NBitcoin.Tests/Secp256k1Tests.cs b/NBitcoin.Tests/Secp256k1Tests.cs
@@ -4468,6 +4468,8 @@ public void musig_key_sort_vectors()
 			var root = JObject.Parse(File.ReadAllText("data/musig/key_sort_vectors.json"));
 			var pubkeys = GetArray<string>(root["pubkeys"]).Select(p => new PubKey(Encoders.Hex.DecodeData(p))).ToArray();
 			var sorted_pubkeys = GetArray<string>(root["sorted_pubkeys"]).Select(p => new PubKey(Encoders.Hex.DecodeData(p))).ToArray();
+			Array.Sort(pubkeys);
+			AssertEx.CollectionEquals(pubkeys, sorted_pubkeys);
 			Array.Sort(pubkeys, PubKeyComparer.Instance);
 			AssertEx.CollectionEquals(pubkeys, sorted_pubkeys);
 

diff --git a/NBitcoin/BIP174/PSBTUtils.cs b/NBitcoin/BIP174/PSBTUtils.cs
@@ -55,6 +55,7 @@ public static void WriteBIP32Derivations(this JsonTextWriter jsonWriter, HDKeyPa
 	/// <summary>
 	/// Lexicographical comparison of public keys.
 	/// Use <see cref="PubKeyComparer.Instance"/> to get an instance of this class."/>
+	/// <see cref="IComparable{T}"/> implementation for <see cref="PubKey"/> is using this comparer.
 	/// </summary>
 	public class PubKeyComparer : IComparer<PubKey>
 	{

diff --git a/NBitcoin/PubKey.cs b/NBitcoin/PubKey.cs
@@ -170,8 +170,7 @@ internal ECKey ECKey
 		}
 #endif
 
-
-		public int CompareTo(PubKey? other) => other is null ? 1 : BytesComparer.Instance.Compare(this.ToBytes(), other.ToBytes());
+		public int CompareTo(PubKey? other) => other is null ? 1 : PubKeyComparer.Instance.Compare(this, other);
 
 		public PubKey Compress()
 		{