merging issues

Author: kushti

.travis.yml

@@ -1,3 +1,8 @@
+language: scala
+jdk:
+- oraclejdk9
+scala:
+- 2.12.7
 sudo: required
 branches:
   only:
@@ -7,4 +12,6 @@ services:
   - docker
 before_install:
   - docker build -t scrypto:test .
-script: docker run --rm -it scrypto:test sbt test
+script:
+  - sbt test:compile
+  - docker run --rm -it scrypto:test sbt test

build.sbt

@@ -5,7 +5,7 @@ name := "scrypto"
 lazy val commonSettings = Seq(
   organization := "org.scorexfoundation",
   version := "2.1.5",
-  scalaVersion := "2.12.5",
+  scalaVersion := "2.12.7",
   resolvers += Resolver.sonatypeRepo("public"),
   licenses := Seq("CC0" -> url("https://creativecommons.org/publicdomain/zero/1.0/legalcode")),
   homepage := Some(url("https://github.com/input-output-hk/scrypto")),

project/build.properties

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

src/main/scala/scorex/crypto/authds/avltree/batch/serialization/BatchAVLProverSerializer.scala

@@ -103,7 +103,7 @@ class BatchAVLProverSerializer[D <: Digest, HF <: CryptographicHash[D]](implicit
       case l: ProverLeaf[D] =>
         Bytes.concat(Array(0.toByte), l.key, l.nextLeafKey, l.value)
       case n: ProxyInternalNode[D] if n.isEmpty =>
-        Bytes.concat(Array(2.toByte, n.balance), n.key, n.leftLabel, n.rightLabel)
+        Bytes.concat(Array(2.toByte, n.balance), n.key, n.leftLabel, n.rightLabel, n.label)
       case n: InternalProverNode[D] =>
         val leftBytes = loop(n.left)
         val rightBytes = loop(n.right)
@@ -134,7 +134,8 @@ class BatchAVLProverSerializer[D <: Digest, HF <: CryptographicHash[D]](implicit
         val key = ADKey @@ bytes.slice(2, keyLength + 2)
         val leftLabel = hf.byteArrayToDigest(bytes.slice(keyLength + 2, keyLength + 2 + labelLength)).get
         val rightLabel = hf.byteArrayToDigest(bytes.slice(keyLength + 2 + labelLength, keyLength + 2 + 2 * labelLength)).get
-        new ProxyInternalNode[D](key, None, leftLabel, rightLabel, balance)
+        val selfLabel = hf.byteArrayToDigest(bytes.slice(keyLength + 2 + 2 * labelLength, keyLength + 2 + 3 * labelLength)).get
+        new ProxyInternalNode[D](key, Some(selfLabel), leftLabel, rightLabel, balance)
       case _ =>
         ???
     }

src/main/scala/scorex/crypto/authds/avltree/batch/serialization/ProxyInternalNode.scala

@@ -12,7 +12,9 @@ class ProxyInternalNode[D <: Digest](protected var pk: ADKey,
                                     (implicit val phf: CryptographicHash[D])
   extends InternalProverNode(k = pk, l = null, r = null, b = pb)(phf) {
 
-  override def label: D = if (isEmpty) selfLabelOpt.getOrElse(leftLabel) else super.label
+  override def computeLabel: D = hf.prefixedHash(1: Byte, Array(b), leftLabel, rightLabel)
+
+  override def label: D = if (isEmpty) selfLabelOpt.getOrElse(computeLabel) else super.label
 
   def mutate(n: ProverNodes[D]): Unit = {
     if (n.label sameElements leftLabel) {

src/test/scala/scorex/crypto/authds/avltree/batch/serialization/AVLBatchSerializationSpecification.scala

@@ -1,6 +1,6 @@
 package scorex.crypto.authds.avltree.batch.serialization
 
-import org.scalacheck.Gen
+import org.scalacheck.{Gen, Shrink}
 import org.scalatest.PropSpec
 import org.scalatest.prop.GeneratorDrivenPropertyChecks
 import scorex.crypto.authds.avltree.batch._
@@ -18,6 +18,8 @@ class AVLBatchSerializationSpecification extends PropSpec with GeneratorDrivenPr
   type HF = Blake2b256.type
   implicit val hf: HF = Blake2b256
 
+  implicit def noShrink[A]: Shrink[A] = Shrink(_ => Stream.empty)
+
   def randomKey(size: Int = 32): ADKey = ADKey @@ Random.randomBytes(size)
 
   def randomValue(size: Int = 32): ADValue = ADValue @@ Random.randomBytes(size)
@@ -79,6 +81,22 @@ class AVLBatchSerializationSpecification extends PropSpec with GeneratorDrivenPr
     }
   }
 
+  property("manifest serialization") {
+    val serializer = new BatchAVLProverSerializer[D, HF]
+    forAll(Gen.choose(100, 100000)) { treeSize: Int =>
+      val tree = generateProver(treeSize)
+      val kl = tree.keyLength
+      val digest = tree.digest
+      val sliced = serializer.slice(tree)
+
+      val manifest = sliced._1
+      val manifestBytes = serializer.manifestToBytes(manifest)
+      val deserializedManifest = serializer.manifestFromBytes(manifestBytes).get
+
+      deserializedManifest.oldRootAndHeight._1.label shouldBe manifest.oldRootAndHeight._1.label
+    }
+  }
+
   def leftTree(n: ProverNodes[D]): Seq[ProverNodes[D]] = n match {
     case n: ProxyInternalNode[D] if n.isEmpty =>
       Seq(n)