ETCM-207: Flip parameter order in XorOrdering.

input-output-hk · Oct 19, 2020 · 3442908 · 3442908
1 parent ad80554
commit 3442908
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/...very/it/src/io/iohk/scalanet/discovery/ethereum/v4/DiscoveryKademliaIntegrationSpec.scala b/...very/it/src/io/iohk/scalanet/discovery/ethereum/v4/DiscoveryKademliaIntegrationSpec.scala
@@ -30,7 +30,7 @@ class DiscoveryKademliaIntegrationSpec extends KademliaIntegrationSpec("Discover
   }
 
   override def makeXorOrdering(baseId: BitVector): Ordering[Node] =
-    XorOrdering[Node](baseId)(_.id)
+    XorOrdering[Node](_.id)(baseId)
 
   override def startNode(
       selfRecord: PeerRecord,

diff --git a/scalanet/discovery/src/io/iohk/scalanet/discovery/ethereum/v4/DiscoveryService.scala b/scalanet/discovery/src/io/iohk/scalanet/discovery/ethereum/v4/DiscoveryService.scala
@@ -630,7 +630,7 @@ object DiscoveryService {
       */
     protected[v4] def lookup(target: NodeId): Task[SortedSet[Node]] = {
       implicit val nodeOrdering: Ordering[Node] =
-        XorOrdering[Node](target)(_.id)
+        XorOrdering[Node](_.id)(target)
 
       // Find the 16 closest nodes we know of.
       // We'll contact 'alpha' at a time but eventually try all of them

diff --git a/scalanet/discovery/src/io/iohk/scalanet/kademlia/XorOrdering.scala b/scalanet/discovery/src/io/iohk/scalanet/kademlia/XorOrdering.scala
@@ -28,7 +28,7 @@ object XorOrdering {
   // distance, but in pathological tests it's not intuitive that sets of
   // different nodes with the same ID but different attributes disappear
   // from the set.
-  def apply[T](base: BitVector)(f: T => BitVector): Ordering[T] = {
+  def apply[T](f: T => BitVector)(base: BitVector): Ordering[T] = {
     val xorOrdering = new XorOrdering(base)
     val tupleOrdering = Ordering.Tuple2(xorOrdering, Ordering.Int)
     Ordering.by[T, (BitVector, Int)] { x =>
@@ -39,7 +39,7 @@ object XorOrdering {
 
 object XorNodeOrdering {
   def apply[A](base: BitVector): Ordering[NodeRecord[A]] =
-    XorOrdering[NodeRecord[A]](base)(_.id)
+    XorOrdering[NodeRecord[A]](_.id)(base)
 }
 
 class XorNodeOrder[A](val base: BitVector) extends Order[NodeRecord[A]] {