selfLabelOpt removed

Author: kushti

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

@@ -11,6 +11,9 @@ sealed trait Node[D <: Digest] extends ToStringHelper {
 
   protected var labelOpt: Option[D] = None
 
+  /**
+    * Get digest of the node. If it was computed previously, read the digest from hash, otherwise, compute it.
+    */
   def label: D = labelOpt match {
     case None =>
       val l = computeLabel

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

@@ -134,7 +134,7 @@ 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)
+        new ProxyInternalNode[D](key, leftLabel, rightLabel, balance)
       case _ =>
         ???
     }

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

@@ -9,7 +9,6 @@ import scorex.crypto.hash.{CryptographicHash, Digest}
   * Internal node for which not children are stored but just their digests
   */
 class ProxyInternalNode[D <: Digest](protected var pk: ADKey,
-                                     val selfLabelOpt: Option[D],
                                      val leftLabel: D,
                                      val rightLabel: D,
                                      protected var pb: Balance)
@@ -20,19 +19,6 @@ class ProxyInternalNode[D <: Digest](protected var pk: ADKey,
     hf.hash(Array(InternalNodePrefix, b), leftLabel, rightLabel)
   }
 
-  /**
-    * Get digest of the node. If it was computed previously, read the digest from hash, otherwise,
-    * take externally provided label or compute if not provided.
-    */
-  override def label: D = labelOpt match {
-    case Some(l) =>
-      l
-    case None =>
-      val l = selfLabelOpt.getOrElse(computeLabel)
-      labelOpt = Some(l)
-      l
-  }
-
   private[serialization] def setChild(n: ProverNodes[D]): Unit = {
     if (n.label sameElements leftLabel) {
       l = n
@@ -53,6 +39,6 @@ class ProxyInternalNode[D <: Digest](protected var pk: ADKey,
 
 object ProxyInternalNode {
   def apply[D <: Digest](node: InternalProverNode[D])(implicit phf: CryptographicHash[D]): ProxyInternalNode[D] = {
-    new ProxyInternalNode[D](node.key, Some(node.label), node.left.label, node.right.label, node.balance)
+    new ProxyInternalNode[D](node.key, node.left.label, node.right.label, node.balance)
   }
 }