removing unused comparators

ergoplatform · Aug 31, 2023 · d80091b · d80091b
1 parent a057767
commit d80091b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/avldb/src/main/scala/scorex/db/ByteArrayUtils.scala b/avldb/src/main/scala/scorex/db/ByteArrayUtils.scala
@@ -2,15 +2,6 @@ package scorex.db
 
 object ByteArrayUtils {
 
-  import java.util.Comparator
-
-  // Java comparator
-  val BYTE_ARRAY_COMPARATOR: Comparator[Array[Byte]] = (o1: Array[Byte], o2: Array[Byte]) => compare(o1, o2)
-
-  // Scala comparator
-  implicit val ByteArrayOrdering: Ordering[Array[Byte]] =
-    (o1: Array[Byte], o2: Array[Byte]) => ByteArrayUtils.compare(o1, o2)
-
   def compare(o1: Array[Byte], o2: Array[Byte]): Int = {
     val len = Math.min(o1.length, o2.length)
     var i = 0

diff --git a/avldb/src/test/scala/scorex/db/ByteArrayUtilsSpec.scala b/avldb/src/test/scala/scorex/db/ByteArrayUtilsSpec.scala
@@ -13,13 +13,16 @@ class ByteArrayUtilsSpec extends AnyPropSpec with ScalaCheckPropertyChecks with
 
   property("compare works properly") {
 
+    val effOrdering: Ordering[Array[Byte]] =
+      (o1: Array[Byte], o2: Array[Byte]) => ByteArrayUtils.compare(o1, o2)
+
     //Simple and inefficient way to order byte arrays, based on
     // https://stackoverflow.com/questions/7109943/how-to-define-orderingarraybyte
     // but we compare unsigned bytes
     val ordering: Ordering[Array[Byte]] = Ordering.by((_: Array[Byte]).toIterable.map(_ & 0xFF))
 
     forAll(nonEmptyBytesGen, nonEmptyBytesGen) { case (bs1, bs2) =>
-      val efficientOrdering = Seq(bs1, bs2).sorted(ByteArrayUtils.ByteArrayOrdering)
+      val efficientOrdering = Seq(bs1, bs2).sorted(effOrdering)
       val simpleOrdering = Seq(bs1, bs2).sorted(ordering)
 
       efficientOrdering(0).sameElements(simpleOrdering(0)) shouldBe true