removing checkType parameter which is always true

ergoplatform · Dec 6, 2024 · 2effbba · 2effbba
1 parent c1dc254
commit 2effbba
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/data/shared/src/main/scala/sigma/serialization/ErgoTreeSerializer.scala b/data/shared/src/main/scala/sigma/serialization/ErgoTreeSerializer.scala
@@ -127,12 +127,8 @@ class ErgoTreeSerializer(protocolVersion: Byte = VersionContext.V6SoftForkVersio
     val r = SigmaSerializer.startReader(bytes)
     deserializeErgoTree(r, SigmaSerializer.MaxPropositionSize)
   }
-
+  
   def deserializeErgoTree(r: SigmaByteReader, maxTreeSizeBytes: Int): ErgoTree = {
-    deserializeErgoTree(r, maxTreeSizeBytes, true)
-  }
-
-  private[sigma] def deserializeErgoTree(r: SigmaByteReader, maxTreeSizeBytes: Int, checkType: Boolean): ErgoTree = {
     val startPos = r.position
     val previousPositionLimit = r.positionLimit
     r.positionLimit = r.position + maxTreeSizeBytes
@@ -158,9 +154,7 @@ class ErgoTreeSerializer(protocolVersion: Byte = VersionContext.V6SoftForkVersio
         val isUsingBlockchainContext = r.wasUsingBlockchainContext // == true if there was a node using the blockchain context
         r.wasUsingBlockchainContext = wasUsingBlockchainContext_saved
 
-        if (checkType) {
-          CheckDeserializedScriptIsSigmaProp(root)
-        }
+        CheckDeserializedScriptIsSigmaProp(root)
 
         r.constantStore = previousConstantStore
         // now we know the end position of propositionBytes, read them all at once into array
@@ -391,8 +385,4 @@ class ErgoTreeSerializer(protocolVersion: Byte = VersionContext.V6SoftForkVersio
     (resBytes, nConstants)
   }
 
-}
-
-object ErgoTreeSerializer {
-  val DefaultSerializer = new ErgoTreeSerializer
-}
+}
diff --git a/interpreter/shared/src/main/scala/sigmastate/interpreter/Interpreter.scala b/interpreter/shared/src/main/scala/sigmastate/interpreter/Interpreter.scala
@@ -248,7 +248,7 @@ trait Interpreter {
       val context1 = context.withInitCost(currCost).asInstanceOf[CTX]
       val (propTree, context2) = trySoftForkable[(SigmaPropValue, CTX)](whenSoftFork = (TrueSigmaProp, context1)) {
         // Before ErgoTree V3 the deserialization cost was not added to the total cost
-        applyDeserializeContextJITC(if (VersionContext.current.activatedVersion >= VersionContext.V6SoftForkVersion) {
+        applyDeserializeContextJITC(if (VersionContext.current.isV6SoftForkActivated) {
           context1
         } else {
           context