Merge pull request #527 from ScorexFoundation/i526

More diversity of scripts in generators
ergoplatform · Jun 12, 2019 · cb095c7 · cb095c7
2 parents 981efcb + e1e2bae
commit cb095c7
Show file tree

Hide file tree

Showing 16 changed files with 651 additions and 634 deletions.
diff --git a/src/test/scala/org/ergoplatform/ErgoAddressSpecification.scala b/src/test/scala/org/ergoplatform/ErgoAddressSpecification.scala
@@ -9,13 +9,13 @@ import sigmastate.basics.DLogProtocol
 import sigmastate.basics.DLogProtocol.DLogProverInput
 import sigmastate.serialization.ErgoTreeSerializer.DefaultSerializer
 import sigmastate.serialization.ValueSerializer
-import sigmastate.serialization.generators.ValueGenerators
+import sigmastate.serialization.generators.ObjectGenerators
 import org.ergoplatform.ErgoScriptPredef._
 import org.ergoplatform.validation.ValidationSpecification
 import sigmastate.Values.ErgoTree
 
 class ErgoAddressSpecification extends PropSpec
-  with ValueGenerators
+  with ObjectGenerators
   with PropertyChecks
   with Matchers
   with TryValues

diff --git a/src/test/scala/org/ergoplatform/ErgoLikeTransactionSpec.scala b/src/test/scala/org/ergoplatform/ErgoLikeTransactionSpec.scala
@@ -8,15 +8,15 @@ import sigmastate.Values.ByteArrayConstant
 import sigmastate.helpers.SigmaTestingCommons
 import sigmastate.interpreter.{ContextExtension, ProverResult}
 import sigmastate.serialization.SigmaSerializer
-import sigmastate.serialization.generators.ValueGenerators
+import sigmastate.serialization.generators.ObjectGenerators
 import sigmastate.eval._
 import sigmastate.eval.Extensions._
 import sigmastate.SType._
 
 class ErgoLikeTransactionSpec extends PropSpec
   with GeneratorDrivenPropertyChecks
   with Matchers
-  with ValueGenerators
+  with ObjectGenerators
   with SigmaTestingCommons {
 
   property("ErgoLikeTransaction: Serializer round trip") {

diff --git a/src/test/scala/sigmastate/lang/SigmaCompilerTest.scala b/src/test/scala/sigmastate/lang/SigmaCompilerTest.scala
@@ -10,11 +10,11 @@ import sigmastate.interpreter.Interpreter.ScriptEnv
 import sigmastate.lang.Terms.{Lambda, MethodCall, ZKProofBlock, Apply, Ident}
 import sigmastate.lang.exceptions.{CosterException, InvalidArguments, TyperException}
 import sigmastate.serialization.ValueSerializer
-import sigmastate.serialization.generators.ValueGenerators
+import sigmastate.serialization.generators.ObjectGenerators
 import sigmastate.utxo.{GetVar, ExtractAmount, ByIndex, SelectField}
 import sigmastate.eval._
 
-class SigmaCompilerTest extends SigmaTestingCommons with LangTests with ValueGenerators {
+class SigmaCompilerTest extends SigmaTestingCommons with LangTests with ObjectGenerators {
   import CheckingSigmaBuilder._
   implicit lazy val IR: TestingIRContext = new TestingIRContext {
     beginPass(noConstPropagationPass)

diff --git a/src/test/scala/sigmastate/lang/SigmaSpecializerTest.scala b/src/test/scala/sigmastate/lang/SigmaSpecializerTest.scala
@@ -10,15 +10,15 @@ import sigmastate._
 import sigmastate.lang.SigmaPredef.PredefinedFuncRegistry
 import sigmastate.lang.Terms.{Ident, ZKProofBlock}
 import sigmastate.lang.exceptions.SpecializerException
-import sigmastate.serialization.generators.{ConcreteCollectionGenerators, TransformerGenerators, ValueGenerators}
+import sigmastate.serialization.generators.{ConcreteCollectionGenerators, TransformerGenerators, ObjectGenerators}
 import sigmastate.utxo._
 import sigmastate.lang.Terms._
 
 class SigmaSpecializerTest extends PropSpec
   with PropertyChecks
   with Matchers
   with LangTests
-  with ValueGenerators
+  with ObjectGenerators
   with ConcreteCollectionGenerators
   with TransformerGenerators {
 

diff --git a/src/test/scala/sigmastate/lang/SigmaTyperTest.scala b/src/test/scala/sigmastate/lang/SigmaTyperTest.scala
@@ -13,10 +13,10 @@ import sigmastate.interpreter.Interpreter.ScriptEnv
 import sigmastate.lang.SigmaPredef._
 import sigmastate.lang.Terms.Select
 import sigmastate.lang.exceptions.TyperException
-import sigmastate.serialization.generators.ValueGenerators
+import sigmastate.serialization.generators.ObjectGenerators
 import sigmastate.utxo.{ExtractCreationInfo, Append}
 
-class SigmaTyperTest extends PropSpec with PropertyChecks with Matchers with LangTests with ValueGenerators {
+class SigmaTyperTest extends PropSpec with PropertyChecks with Matchers with LangTests with ObjectGenerators {
 
   private val predefFuncRegistry = new PredefinedFuncRegistry(StdSigmaBuilder)
   import predefFuncRegistry._

diff --git a/src/test/scala/sigmastate/serialization/SerializationSpecification.scala b/src/test/scala/sigmastate/serialization/SerializationSpecification.scala
@@ -14,7 +14,7 @@ trait SerializationSpecification extends PropSpec
   with GeneratorDrivenPropertyChecks
   with TableDrivenPropertyChecks
   with Matchers
-  with ValueGenerators
+  with ObjectGenerators
   with ConcreteCollectionGenerators
   with OpcodesGen
   with TransformerGenerators

diff --git a/src/test/scala/sigmastate/serialization/SigSerializerSpecification.scala b/src/test/scala/sigmastate/serialization/SigSerializerSpecification.scala
@@ -10,12 +10,12 @@ import sigmastate._
 import sigmastate.basics.DLogProtocol.ProveDlog
 import sigmastate.basics.ProveDHTuple
 import sigmastate.helpers.{ContextEnrichingTestProvingInterpreter, SigmaTestingCommons}
-import sigmastate.serialization.generators.ValueGenerators
+import sigmastate.serialization.generators.ObjectGenerators
 import sigmastate.utxo.Transformer
 
 import scala.util.Random
 
-class SigSerializerSpecification extends SigmaTestingCommons with ValueGenerators {
+class SigSerializerSpecification extends SigmaTestingCommons with ObjectGenerators {
   implicit lazy val IR = new TestingIRContext
   private lazy implicit val arbExprGen: Arbitrary[SigmaBoolean] = Arbitrary(exprTreeGen)
 

diff --git a/src/test/scala/sigmastate/serialization/generators/ConcreteCollectionGenerators.scala b/src/test/scala/sigmastate/serialization/generators/ConcreteCollectionGenerators.scala
@@ -4,7 +4,7 @@ import org.scalacheck.{Arbitrary, Gen}
 import sigmastate._
 import sigmastate.Values.{ConcreteCollection, EvaluatedValue, Value}
 
-trait ConcreteCollectionGenerators { self: ValueGenerators =>
+trait ConcreteCollectionGenerators { self: ObjectGenerators =>
   val minCollLength = 1
   val maxCollLength = 10