Merge pull request #32 from input-output-hk/randomWalk

Make BatchAVLProver.randomWalk function reproducable

Author: kushti

lock.sbt

@@ -1,7 +1,7 @@
 // DON'T EDIT THIS FILE.
-// This file is auto generated by sbt-lock 0.3.0.
+// This file is auto generated by sbt-lock 0.4.0.
 // https://github.com/tkawachi/sbt-lock/
-dependencyOverrides in ThisBuild ++= Set(
+dependencyOverrides in ThisBuild ++= Seq(
   "com.google.guava" % "guava" % "19.0",
   "org.bouncycastle" % "bcprov-jdk15on" % "1.58",
   "org.rudogma" % "supertagged_2.12" % "1.4",

project/build.properties

@@ -1,2 +1,2 @@
-sbt.version=0.13.15
+sbt.version=1.1.1
 

project/plugins.sbt

@@ -1,11 +1,12 @@
+
 logLevel := Level.Warn
 
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
+addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0")
 
-addSbtPlugin("com.github.tkawachi" % "sbt-lock" % "0.3.0")
+addSbtPlugin("com.github.tkawachi" % "sbt-lock" % "0.4.0")
 
-addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.8.0")
+addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
 
 //addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.3.5")
 
-addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.2.27")
+addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.3")

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

@@ -277,9 +277,9 @@ class BatchAVLProver[D <: Digest, HF <: ThreadUnsafeHash[D]](val keyLength: Int,
   }
 
 
-  def randomWalk(): Option[(ADKey, ADValue)] = {
+  def randomWalk(rand: Random = new Random): Option[(ADKey, ADValue)] = {
     def internalNodeFn(r: InternalProverNode[D], dummy: Unit.type) =
-      Random.nextBoolean() match {
+      rand.nextBoolean() match {
           case true =>
             (r.right, Unit)
           case false=>

src/test/scala/scorex/crypto/authds/avltree/batch/AVLBatchSpecification.scala

@@ -24,6 +24,23 @@ class AVLBatchSpecification extends PropSpec with GeneratorDrivenPropertyChecks
   def randomKey(size: Int = 32): ADKey = ADKey @@ Random.randomBytes(size)
   def randomValue(size: Int = 32): ADValue = ADValue @@ Random.randomBytes(size)
 
+  property("randomWalk") {
+    val TreeSize = 1000
+    val prover = new BatchAVLProver[T, Blake2b256Unsafe](KL, None)
+    val keyValues = (0 until TreeSize) map { i =>
+      (ADKey @@ Blake2b256(i.toString.getBytes).take(KL), ADValue @@ (i.toString.getBytes))
+    }
+    keyValues.foreach(kv => prover.performOneOperation(Insert(kv._1, kv._2)))
+    prover.generateProof()
+
+    forAll { seed: Long =>
+      val e1 = prover.randomWalk(new scala.util.Random(seed))
+      val e2 = prover.randomWalk(new scala.util.Random(seed))
+      e1.get._1 shouldEqual e2.get._1
+      e1.get._2 shouldEqual e2.get._2
+    }
+  }
+
   property("unauthenticatedLookup") {
     val p = new BatchAVLProver[Digest32, Blake2b256Unsafe](keyLength = 8, valueLengthOpt = None)