Adapted for ScriptRunner.applyGeneric()

wavesplatform · Oct 17, 2023 · e8f807e · e8f807e
1 parent 4885cf5
commit e8f807e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/node/src/main/scala/com/wavesplatform/transaction/smart/script/ScriptRunner.scala b/node/src/main/scala/com/wavesplatform/transaction/smart/script/ScriptRunner.scala
@@ -54,7 +54,8 @@ object ScriptRunner {
       blockchain.newEvaluatorMode,
       blockchain.isFeatureActivated(RideV6),
       enableExecutionLog,
-      blockchain.isFeatureActivated(ConsensusImprovements)
+      blockchain.isFeatureActivated(ConsensusImprovements),
+      blockchain.isFeatureActivated(LightNode)
     )
 
   def applyGeneric(
@@ -72,7 +73,8 @@ object ScriptRunner {
       newEvaluatorMode: Boolean,
       checkWeakPk: Boolean,
       enableExecutionLog: Boolean,
-      fixBigScriptField: Boolean
+      fixBigScriptField: Boolean,
+      fixedThrownError: Boolean
   ): (Log[Id], Int, Either[ExecutionError, EVALUATED]) = {
 
     def evalVerifier(
@@ -136,7 +138,7 @@ object ScriptRunner {
           newMode = newEvaluatorMode,
           onExceed,
           enableExecutionLog,
-          fixedThrownError = blockchain.isFeatureActivated(LightNode)
+          fixedThrownError
         )
 
       (log, limit - unusedComplexity, result)

diff --git a/node/src/test/scala/com/wavesplatform/state/diffs/smart/predef/MatcherBlockchainTest.scala b/node/src/test/scala/com/wavesplatform/state/diffs/smart/predef/MatcherBlockchainTest.scala
@@ -102,7 +102,8 @@ class MatcherBlockchainTest extends PropSpec with MockFactory with WithDomain {
           newEvaluatorMode = true,
           checkWeakPk = true,
           enableExecutionLog = false,
-          fixBigScriptField = true
+          fixBigScriptField = true,
+          fixedThrownError = true
         )
         ._3 shouldBe Right(CONST_BOOLEAN(true))
     }