Merge branch 'master' of github.com:ScorexFoundation/sigmastate-inter…

…preter into v2.0 Conflicts: src/main/scala/sigmastate/serialization/ErgoTreeSerializer.scala
ergoplatform · Mar 14, 2019 · c97d366 · c97d366
2 parents 94cc64d + 07bf22d
commit c97d366
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/main/scala/sigmastate/serialization/ErgoTreeSerializer.scala b/src/main/scala/sigmastate/serialization/ErgoTreeSerializer.scala
@@ -29,9 +29,9 @@ class ErgoTreeSerializer {
 
   def deserializeErgoTree(r: SigmaByteReader): ErgoTree  = {
     val (h, cs) = deserializeHeader(r)
+    val previousConstantStore = r.constantStore
     r.constantStore = new ConstantStore(cs)
     // reader with constant store attached is required (to get tpe for a constant placeholder)
-    val previousConstantStore = r.constantStore
     val root = ValueSerializer.deserialize(r).asSigmaProp
     r.constantStore = previousConstantStore
     ErgoTree(h, cs, root)