Skip to content

Commit

Permalink
Scala 2.11 compilation fix, ScalaDoc returned
Browse files Browse the repository at this point in the history
  • Loading branch information
kushti committed Aug 5, 2024
1 parent f851b62 commit 3f7e784
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package sigmastate.interpreter
import debox.cfor
import org.ergoplatform.ErgoLikeContext
import org.ergoplatform.validation.ValidationRules._
import scorex.crypto.encode.Base16
import sigma.VersionContext
import sigma.ast.SCollection.SByteArray
import sigma.ast.syntax._
Expand Down
17 changes: 8 additions & 9 deletions sc/shared/src/test/scala/sigma/LanguageSpecificationV6.scala
Original file line number Diff line number Diff line change
Expand Up @@ -419,17 +419,15 @@ class LanguageSpecificationV6 extends LanguageSpecificationBase { suite =>
cost = 1793,
expectedDetails = CostDetails.ZeroCost,
newCost = 2065,
newVersionedResults = expectedSuccessForAllTreeVersions(Helpers.decodeBytes("100108d27300"), 2065, costDetails(1)),
newVersionedResults = expectedSuccessForAllTreeVersions(Helpers.decodeBytes("100108d27300"), 2065, costDetails(1))
),
// for tree version > 0, the result depend on activated version
{
(Coll(t2.bytes: _*), 0) -> Expected(
Success(expectedTreeBytes_beforeV6),
cost = 1793,
expectedDetails = CostDetails.ZeroCost,
newCost = 2065,
newVersionedResults = expectedSuccessForAllTreeVersions(expectedTreeBytes_V6, 2065, costDetails(1)))
}
(Coll(t2.bytes: _*), 0) -> Expected(
Success(expectedTreeBytes_beforeV6),
cost = 1793,
expectedDetails = CostDetails.ZeroCost,
newCost = 2065,
newVersionedResults = expectedSuccessForAllTreeVersions(expectedTreeBytes_V6, 2065, costDetails(1)))
),
changedFeature(
changedInVersion = VersionContext.V6SoftForkVersion,
Expand Down Expand Up @@ -464,4 +462,5 @@ class LanguageSpecificationV6 extends LanguageSpecificationBase { suite =>
tree.constants.length shouldBe t2.constants.length
tree.root shouldBe t2.root
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ class SigmaBinderTest extends AnyPropSpec with ScalaCheckPropertyChecks with Mat
res
}

/** Checks that parsing and binding results in the expected value.
* @return the inferred type of the expression
*/
def checkBound(env: ScriptEnv, x: String, expected: SValue) = {
val bound = bind(env, x)
if (expected != bound) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import sigma.serialization.ErgoTreeSerializer
import sigmastate.utils.Helpers._

import java.math.BigInteger
import scala.reflect.internal.pickling.PickleFormat

class BasicOpsSpecification extends CompilerTestingCommons
with CompilerCrossVersionProps {
Expand Down

0 comments on commit 3f7e784

Please sign in to comment.