activationType flag for LSV* tests

Author: kushti

sc/shared/src/test/scala/sigma/LanguageSpecificationV5.scala

@@ -4876,7 +4876,7 @@ class LanguageSpecificationV5 extends LanguageSpecificationBase { suite =>
             Vector(),
             Map()
           )
-        )),
+        ), activationType = 0),
       preGeneratedSamples = Some(samples))
 
     // test vectors to reproduce v4.x bug (see https://github.com/ScorexFoundation/sigmastate-interpreter/issues/603)
@@ -5136,6 +5136,7 @@ class LanguageSpecificationV5 extends LanguageSpecificationBase { suite =>
             )
           )
         ),
+        activationType = 0,
         allowNewToSucceed = true
       ),
       preGeneratedSamples = Some(ArraySeq.empty))
@@ -6059,7 +6060,9 @@ class LanguageSpecificationV5 extends LanguageSpecificationBase { suite =>
         (x: Coll[Boolean]) => SigmaDsl.xorOf(x),
         (x: Coll[Boolean]) => SigmaDsl.xorOf(x),
         "{ (x: Coll[Boolean]) => xorOf(x) }",
-        FuncValue(Vector((1, SBooleanArray)), XorOf(ValUse(1, SBooleanArray)))))
+        FuncValue(Vector((1, SBooleanArray)), XorOf(ValUse(1, SBooleanArray))),
+        activationType = 0
+      ))
   }
 
   property("LogicalNot equivalence") {
@@ -6334,7 +6337,7 @@ class LanguageSpecificationV5 extends LanguageSpecificationBase { suite =>
         (x: (Coll[Byte], Coll[Byte])) => SigmaDsl.xor(x._1, x._2),
         (x: (Coll[Byte], Coll[Byte])) => SigmaDsl.xor(x._1, x._2),
         "{ (x: (Coll[Byte], Coll[Byte])) => xor(x._1, x._2) }",
-        if (lowerMethodCallsInTests)
+        {if (lowerMethodCallsInTests)
           FuncValue(
             Vector((1, STuple(Vector(SByteArray, SByteArray)))),
             Xor(
@@ -6366,7 +6369,8 @@ class LanguageSpecificationV5 extends LanguageSpecificationBase { suite =>
               ),
               Map()
             )
-          )
+          )},
+        activationType = 0
       ))
   }
 
@@ -8965,6 +8969,7 @@ class LanguageSpecificationV5 extends LanguageSpecificationBase { suite =>
             LongConstant(5L)
           )
         ),
+        activationType = 0,
         allowNewToSucceed = true),
       preGeneratedSamples = Some(Nil))
   }
@@ -9538,7 +9543,7 @@ class LanguageSpecificationV5 extends LanguageSpecificationBase { suite =>
             ),
             ConcreteCollection(Array(BoolToSigmaProp(FalseLeaf)), SSigmaProp)
           )
-        )))
+        ), activationType = 0))
   }
 
   // Original issue: https://github.com/ScorexFoundation/sigmastate-interpreter/issues/604
@@ -9687,6 +9692,7 @@ class LanguageSpecificationV5 extends LanguageSpecificationBase { suite =>
               )
             )
           ),
+          activationType = 0,
           allowDifferentErrors = true,
           allowNewToSucceed = true
         ),

sc/shared/src/test/scala/sigma/LanguageSpecificationV6.scala

@@ -1417,7 +1417,8 @@ class LanguageSpecificationV6 extends LanguageSpecificationBase { suite =>
             ),
             ConcreteCollection(Array(BoolToSigmaProp(FalseLeaf)), SSigmaProp)
           )
-        )
+        ),
+        activationType = 1
       )
     )
 

sc/shared/src/test/scala/sigma/SigmaDslTesting.scala

@@ -130,6 +130,9 @@ class SigmaDslTesting extends AnyPropSpec
     /** Version in which the feature is first implemented of changed. */
     def sinceVersion: Byte
 
+    /** 0 = script version based activation, 1 = tree version based activation */
+    def activationType: Byte
+
     /** Script containing this feature. */
     def script: String
 
@@ -407,8 +410,8 @@ class SigmaDslTesting extends AnyPropSpec
       }
 
       val (expectedResult, expectedCost) = if (
-        (activatedVersionInTests < VersionContext.V6SoftForkVersion && activatedVersionInTests < sinceVersion) ||
-          (activatedVersionInTests < sinceVersion && ergoTreeVersionInTests < sinceVersion)
+        (activationType == 0 && activatedVersionInTests < sinceVersion) ||
+          (activationType == 1 && ergoTreeVersionInTests < sinceVersion)
       ) {
         (expected.oldResult, expected.verificationCostOpt)
       } else {
@@ -519,6 +522,8 @@ class SigmaDslTesting extends AnyPropSpec
 
     override def sinceVersion: Byte = 0
 
+    override val activationType = 0
+
     override def isSupportedIn(vc: VersionContext): Boolean = true
 
     /** in v5.x the old and the new interpreters are the same */
@@ -687,6 +692,7 @@ class SigmaDslTesting extends AnyPropSpec
     printExpectedExpr: Boolean = true,
     logScript: Boolean = LogScriptDefault,
     allowNewToSucceed: Boolean = false,
+    override val activationType: Byte = 1,
     override val allowDifferentErrors: Boolean = false
   )(implicit IR: IRContext, override val evalSettings: EvalSettings, val tA: RType[A], val tB: RType[B])
     extends Feature[A, B] { feature =>
@@ -777,10 +783,16 @@ class SigmaDslTesting extends AnyPropSpec
     override def checkExpected(input: A, expected: Expected[B]): Unit = {
       // check the new implementation with Scala semantic function
       val newRes = VersionContext.withVersions(activatedVersionInTests, ergoTreeVersionInTests) {
-          checkEq(scalaFuncNew)(newF)(input)
+        checkEq(scalaFuncNew)(newF)(input)
+      }
+
+      val checkOld = if(changedInVersion < V6SoftForkVersion) {
+        VersionContext.current.activatedVersion < changedInVersion
+      } else {
+        VersionContext.current.ergoTreeVersion < changedInVersion
       }
 
-      if (VersionContext.current.activatedVersion < changedInVersion && VersionContext.current.ergoTreeVersion < changedInVersion) {
+      if (checkOld) {
         // check the old implementation with Scala semantic
         val expectedOldRes = expected.value
 
@@ -880,6 +892,7 @@ class SigmaDslTesting extends AnyPropSpec
     override val scalaFuncNew: A => B,
     expectedExpr: Option[SValue],
     printExpectedExpr: Boolean = true,
+    override val activationType: Byte = 1,
     logScript: Boolean = LogScriptDefault
   )(implicit IR: IRContext, override val evalSettings: EvalSettings, val tA: RType[A], val tB: RType[B])
     extends Feature[A, B] {
@@ -1155,12 +1168,15 @@ class SigmaDslTesting extends AnyPropSpec
        script: String,
        expectedExpr: SValue = null,
        allowNewToSucceed: Boolean = false,
-       allowDifferentErrors: Boolean = false
+       allowDifferentErrors: Boolean = false,
+       activationType: Byte = 1
       )
       (implicit IR: IRContext, evalSettings: EvalSettings): Feature[A, B] = {
     ChangedFeature(changedInVersion, script, scalaFunc, scalaFuncNew, Option(expectedExpr),
       allowNewToSucceed = allowNewToSucceed,
-      allowDifferentErrors = allowDifferentErrors)
+      allowDifferentErrors = allowDifferentErrors,
+      activationType = activationType
+    )
   }
 
   /** Describes a NEW language feature which must NOT be supported in v4 and