LocalPeer: remove comparison operators based on preference

They are not needed anymore. Also fixes tests.
gokvik · Sep 24, 2024 · cd9a3c5 · cd9a3c5
1 parent 49dfd0e
commit cd9a3c5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 28 deletions.
diff --git a/include/kvik/local_peer.hpp b/include/kvik/local_peer.hpp
@@ -97,18 +97,6 @@ namespace kvik
             return !this->operator==(other);
         }
 
-        // Based on preference
-        bool operator<(const LocalPeer &other) const
-        {
-            return pref < other.pref;
-        }
-
-        // Based on preference
-        bool operator>(const LocalPeer &other) const
-        {
-            return pref > other.pref;
-        }
-
         bool empty() const
         {
             return addr.empty();

diff --git a/test/tests/local_peer.cpp b/test/tests/local_peer.cpp
@@ -21,54 +21,42 @@ TEST_CASE("Comparison", "[LocalPeer]")
     SECTION("Equality")
     {
         CHECK(peer1 == peer2);
-        CHECK_FALSE(peer1 < peer2);
-        CHECK_FALSE(peer1 > peer2);
     }
 
     SECTION("Different address")
     {
         peer2.addr.addr.push_back(0x01);
         CHECK(peer1 != peer2);
-        CHECK_FALSE(peer1 < peer2);
-        CHECK_FALSE(peer1 > peer2);
     }
 
     SECTION("Different channel")
     {
         // Treated as additional data
         peer2.channel = 1;
         CHECK(peer1 == peer2);
-        CHECK_FALSE(peer1 < peer2);
-        CHECK_FALSE(peer1 > peer2);
     }
 
     SECTION("Different time difference")
     {
         // Treated as additional data
         peer2.tsDiff = 100ms;
         CHECK(peer1 == peer2);
-        CHECK_FALSE(peer1 < peer2);
-        CHECK_FALSE(peer1 > peer2);
     }
 
-    SECTION("Less preference")
+    SECTION("Different preference")
     {
         // Treated as additional data
         peer1.pref = 0;
         peer2.pref = 100;
         CHECK(peer1 == peer2);
-        CHECK(peer1 < peer2);
-        CHECK_FALSE(peer1 > peer2);
     }
 
-    SECTION("Greater preference")
+    SECTION("Different RSSI")
     {
         // Treated as additional data
-        peer1.pref = 100;
-        peer2.pref = 0;
+        peer1.rssi = 0;
+        peer2.rssi = 100;
         CHECK(peer1 == peer2);
-        CHECK_FALSE(peer1 < peer2);
-        CHECK(peer1 > peer2);
     }
 }