Merge pull request #113 from greymistcube/refactor/dict-equality

Streamline `Dictionary` equality
planetarium · Oct 19, 2023 · ce4a8af · ce4a8af
2 parents c13391b + bdbeae8
commit ce4a8af
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 44 deletions.
diff --git a/Bencodex.Tests/Types/DictionaryTest.cs b/Bencodex.Tests/Types/DictionaryTest.cs
@@ -3,15 +3,10 @@
 using System.Collections.Immutable;
 using System.Linq;
 using System.Text;
-using Bencodex.Misc;
 using Bencodex.Types;
-using SharpYaml.Tokens;
 using Xunit;
 using static Bencodex.Misc.ImmutableByteArrayExtensions;
 using static Bencodex.Tests.TestUtils;
-using IEquatableDict = System.IEquatable<System.Collections.Immutable.IImmutableDictionary<
-    Bencodex.Types.IKey,
-    Bencodex.Types.IValue>>;
 
 namespace Bencodex.Tests.Types
 {

diff --git a/Bencodex/Types/Dictionary.cs b/Bencodex/Types/Dictionary.cs
@@ -17,7 +17,6 @@ namespace Bencodex.Types
     public sealed class Dictionary :
         IValue,
         IEquatable<Dictionary>,
-        IEquatable<IImmutableDictionary<IKey, IValue>>,
         IImmutableDictionary<IKey, IValue>
     {
         /// <summary>
@@ -1697,54 +1696,31 @@ public T GetValue<T>(byte[] name)
             return (T)this[name];
         }
 
-        /// <inheritdoc cref="object.Equals(object)"/>
-        public override bool Equals(object obj) =>
-            obj switch
-            {
-                null => false,
-                Dictionary d => Equals(d),
-                _ => false,
-            };
+        public override bool Equals(object obj) => obj is Dictionary d && Equals(d);
 
-        /// <inheritdoc cref="IEquatable{T}.Equals(T)"/>
-        public bool Equals(Dictionary other) =>
-            Fingerprint.Equals(other.Fingerprint);
+        public bool Equals(IValue other) => other is Dictionary d && Equals(d);
 
-        /// <inheritdoc cref="IEquatable{T}.Equals(T)"/>
-        bool IEquatable<IImmutableDictionary<IKey, IValue>>.Equals(
-            IImmutableDictionary<IKey, IValue> other
-        )
+        public bool Equals(Dictionary other)
         {
-            if (_dict.Count != other.Count)
-            {
-                return false;
-            }
-            else if (other is Dictionary od)
+            if (Count == other.Count)
             {
-                return od.Fingerprint.Equals(Fingerprint);
-            }
-
-            foreach (KeyValuePair<IKey, IValue> kv in _dict)
-            {
-                if (!other.TryGetValue(kv.Key, out IValue v))
+                foreach (KeyValuePair<IKey, IValue> kv in _dict)
                 {
-                    return false;
+                    if (!other.TryGetValue(kv.Key, out IValue v) ||
+                        !kv.Value.Equals(v))
+                    {
+                        return false;
+                    }
                 }
 
-                if (!kv.Value.Equals(v))
-                {
-                    return false;
-                }
+                return true;
+            }
+            else
+            {
+                return false;
             }
-
-            return true;
         }
 
-        /// <inheritdoc cref="IEquatable{T}.Equals(T)"/>
-        bool IEquatable<IValue>.Equals(IValue other) =>
-            other is Dictionary o &&
-            ((IEquatable<IImmutableDictionary<IKey, IValue>>)this).Equals(o);
-
         /// <inheritdoc cref="object.GetHashCode()"/>
         public override int GetHashCode()
             => unchecked(_dict.Aggregate(GetType().GetHashCode(), (accum, next)

diff --git a/CHANGES.md b/CHANGES.md
@@ -22,6 +22,8 @@ To be released.
     to be more consistent.  [[#106], [#110]]
  -  Removed `ByteArrayComparer` and `FingerprintComparer`.  [[#111]]
  -  Removed `IEquatable<IImmutableList<IValue>>` from `List`.  [[#104], [#112]]
+ -  Removed `IEquatable<IImmutableDictionary<IKey, IValue>>` from `Dictionary`.
+    [[#104], [#113]]
 
 [#104]: https://github.com/planetarium/bencodex.net/issues/104
 [#106]: https://github.com/planetarium/bencodex.net/issues/106
@@ -31,6 +33,7 @@ To be released.
 [#110]: https://github.com/planetarium/bencodex.net/pull/110
 [#111]: https://github.com/planetarium/bencodex.net/pull/111
 [#112]: https://github.com/planetarium/bencodex.net/pull/112
+[#113]: https://github.com/planetarium/bencodex.net/pull/113
 
 
 Version 0.14.0