scorex-utils 0.1.7

Author: kushti

build.sbt

@@ -38,7 +38,7 @@ libraryDependencies ++= Seq(
   "com.typesafe.scala-logging" %% "scala-logging" % "3.9.2",
   "org.whispersystems" % "curve25519-java" % "0.5.0",
   "org.bouncycastle" % "bcprov-jdk15on" % "1.64",
-  "org.scorexfoundation" %% "scorex-util" % "0.1.6"
+  "org.scorexfoundation" %% "scorex-util" % "0.1.7"
 )
 
 libraryDependencies ++= Seq(

src/main/scala/scorex/crypto/authds/avltree/batch/BatchAVLProver.scala

@@ -29,7 +29,7 @@ class BatchAVLProver[D <: Digest, HF <: CryptographicHash[D]](val keyLength: Int
                                                              (implicit val hf: HF = Blake2b256)
   extends AuthenticatedTreeOps[D] with ToStringHelper with ScorexLogging {
 
-  protected val labelLength = hf.DigestSize
+  protected val labelLength: Int = hf.DigestSize
 
   private[batch] var topNode: ProverNodes[D] = oldRootAndHeight.map(_._1).getOrElse({
     val t = new ProverLeaf(NegativeInfinityKey,
@@ -230,7 +230,7 @@ class BatchAVLProver[D <: Digest, HF <: CryptographicHash[D]](val keyLength: Int
       }
     }
 
-    loop(topNode, false)
+    loop(topNode, keyFound = false)
   }
 
   /**
@@ -442,7 +442,7 @@ class BatchAVLProver[D <: Digest, HF <: CryptographicHash[D]](val keyLength: Int
     var fail: Boolean = false
 
     def checkTreeHelper(rNode: ProverNodes[D]): (ProverLeaf[D], ProverLeaf[D], Int) = {
-      def myRequire(t: Boolean, s: String) = {
+      def myRequire(t: Boolean, s: String): Unit = {
         if (!t) {
           var x = rNode.key(0).toInt
           if (x < 0) x = x + 256

src/main/scala/scorex/crypto/authds/avltree/batch/BatchAVLVerifier.scala

@@ -5,7 +5,6 @@ import scorex.crypto.authds._
 import scorex.crypto.hash._
 import scorex.utils.ByteArray
 
-import scala.collection.mutable
 import scala.util.{Failure, Try}
 
 /**
@@ -33,7 +32,7 @@ class BatchAVLVerifier[D <: Digest, HF <: CryptographicHash[D]](startingDigest:
 
   override val collectChangedNodes: Boolean = false
 
-  protected val labelLength = hf.DigestSize
+  protected val labelLength: Int = hf.DigestSize
 
   /**
     * Returns Some[the current digest of the authenticated data structure],
@@ -169,8 +168,7 @@ class BatchAVLVerifier[D <: Digest, HF <: CryptographicHash[D]](startingDigest:
     // Now reconstruct the tree from the proof, which has the post order traversal
     // of the tree
     var numNodes = 0
-    var s = List.empty[VerifierNodes[D]]
-
+    var s = List.empty[VerifierNodes[D]] // Nodes and depths
     var i = 0
     var previousLeaf: Option[Leaf[D]] = None
     while (proof(i) != EndOfTreeInPackagedProof) {