From c5d4022845118fd58006514c352564a85952c55c Mon Sep 17 00:00:00 2001 From: Alexander Slesarenko Date: Thu, 24 Aug 2023 23:36:42 +0200 Subject: [PATCH] minimize-modules: CollsTests, CollGens moved to sigma package --- .../src/test/scala/sigma/{collection => }/CollGens.scala | 6 ++---- .../src/test/scala/sigma/{collection => }/CollsTests.scala | 3 +-- .../src/test/scala/special/collections/BenchmarkGens.scala | 4 +--- .../test/scala/org/ergoplatform/sdk/ExtensionsSpec.scala | 3 +-- 4 files changed, 5 insertions(+), 11 deletions(-) rename common/shared/src/test/scala/sigma/{collection => }/CollGens.scala (98%) rename common/shared/src/test/scala/sigma/{collection => }/CollsTests.scala (99%) diff --git a/common/shared/src/test/scala/sigma/collection/CollGens.scala b/common/shared/src/test/scala/sigma/CollGens.scala similarity index 98% rename from common/shared/src/test/scala/sigma/collection/CollGens.scala rename to common/shared/src/test/scala/sigma/CollGens.scala index a203124c14..278ddb0462 100644 --- a/common/shared/src/test/scala/sigma/collection/CollGens.scala +++ b/common/shared/src/test/scala/sigma/CollGens.scala @@ -1,15 +1,13 @@ -package sigma.collection +package sigma -import scala.language.implicitConversions import org.scalacheck.util.Buildable import org.scalacheck.{Arbitrary, Gen} -import sigma.{Coll, CollBuilder, CollOverArrayBuilder, PairColl} -import sigma._ import sigma.core.RType import spire.scalacompat.BuilderCompat import scala.collection.mutable import scala.collection.mutable.ArrayBuffer +import scala.language.implicitConversions trait CollGens { testSuite => import Gen._ diff --git a/common/shared/src/test/scala/sigma/collection/CollsTests.scala b/common/shared/src/test/scala/sigma/CollsTests.scala similarity index 99% rename from common/shared/src/test/scala/sigma/collection/CollsTests.scala rename to common/shared/src/test/scala/sigma/CollsTests.scala index 1f24d1959c..4b286b549a 100644 --- a/common/shared/src/test/scala/sigma/collection/CollsTests.scala +++ b/common/shared/src/test/scala/sigma/CollsTests.scala @@ -1,11 +1,10 @@ -package sigma.collection +package sigma import org.scalacheck.Gen import org.scalatest.exceptions.TestFailedException import org.scalatest.matchers.should.Matchers import org.scalatest.propspec.AnyPropSpec import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks -import sigma._ import sigma.core._ import scala.language.existentials diff --git a/sc/jvm/src/test/scala/special/collections/BenchmarkGens.scala b/sc/jvm/src/test/scala/special/collections/BenchmarkGens.scala index 3819772202..aced1cc381 100644 --- a/sc/jvm/src/test/scala/special/collections/BenchmarkGens.scala +++ b/sc/jvm/src/test/scala/special/collections/BenchmarkGens.scala @@ -1,8 +1,6 @@ package sigma -import org.scalameter.KeyValue -import org.scalameter.api.{Bench, Gen, _} -import sigma.collection.CollGens +import org.scalameter.api._ trait BenchmarkGens extends CollGens { suite: Bench[Double] => def maxSize = 100000 diff --git a/sdk/shared/src/test/scala/org/ergoplatform/sdk/ExtensionsSpec.scala b/sdk/shared/src/test/scala/org/ergoplatform/sdk/ExtensionsSpec.scala index c84918d128..cc555d6fab 100644 --- a/sdk/shared/src/test/scala/org/ergoplatform/sdk/ExtensionsSpec.scala +++ b/sdk/shared/src/test/scala/org/ergoplatform/sdk/ExtensionsSpec.scala @@ -3,9 +3,8 @@ package org.ergoplatform.sdk import org.scalatest.matchers.should.Matchers import org.scalatest.propspec.AnyPropSpec import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks -import sigma.Coll +import sigma.{Coll, CollGens} import org.ergoplatform.sdk.Extensions.{CollBuilderOps, CollOps, GenIterableOps, PairCollOps} -import sigma.collection.CollGens import sigma.core.RType import sigmastate.eval.CostingSigmaDslBuilder