minimize-modules: Removed CoreLibReflection.scala

ergoplatform · Aug 25, 2023 · 9676d88 · 9676d88
1 parent fdeda45
commit 9676d88
Show file tree

Hide file tree

Showing 7 changed files with 400 additions and 415 deletions.
diff --git a/common/shared/src/main/scala/sigma/CoreLibReflection.scala b/common/shared/src/main/scala/sigma/CoreLibReflection.scala
diff --git a/common/shared/src/main/scala/sigma/package.scala b/common/shared/src/main/scala/sigma/package.scala
@@ -8,8 +8,6 @@ import scala.reflect.ClassTag
   * @see [[RType]] class
   */
 package object sigma {
-  /** Forces reflection data initialization */
-  val coreLibReflection = CoreLibReflection
 
   val AnyType: RType[Any] = GeneralType[Any](ClassTag.Any)
 

diff --git a/common/shared/src/main/scala/sigma/reflection/CommonReflection.scala b/common/shared/src/main/scala/sigma/reflection/CommonReflection.scala
diff --git a/interpreter/shared/src/main/scala/sigmastate/InterpreterReflection.scala b/interpreter/shared/src/main/scala/sigmastate/InterpreterReflection.scala
@@ -2,9 +2,9 @@ package sigmastate
 
 import org.ergoplatform.ErgoBox.RegisterId
 import sigma.reflection.CommonReflection.registerClassEntry
-import sigma.reflection.{mkConstructor, mkMethod}
+import sigma.reflection.{CommonReflection, mkConstructor, mkMethod}
 import sigma.Coll
-import sigma.{AvlTree, CoreLibReflection, SigmaDslBuilder}
+import sigma.{AvlTree, SigmaDslBuilder}
 import sigmastate.SAvlTree.KeyValueColl
 import sigmastate.SCollection.{SBooleanArray, SByteArray, SIntArray}
 import sigmastate.Values._
@@ -21,7 +21,7 @@ import sigmastate.utxo._
   * Only information that is needed at runtime is registered.
   */
 object InterpreterReflection {
-  val reflection = CoreLibReflection
+  val reflection = CommonReflection
 
   registerClassEntry(classOf[AND],
     constructors = Array(

diff --git a/sc/shared/src/main/scala/scalan/GraphIRReflection.scala b/sc/shared/src/main/scala/scalan/GraphIRReflection.scala
@@ -3,7 +3,6 @@ package scalan
 import scalan.primitives.Thunks
 import sigma.reflection.CommonReflection.registerClassEntry
 import sigma.reflection.{CommonReflection, mkConstructor, mkMethod}
-import sigma.CoreLibReflection
 import sigmastate.eval.SigmaLibrary
 import sigma.Colls
 import sigma.SigmaDsl
@@ -18,7 +17,7 @@ import wrappers.scalan.WRTypes
   */
 object GraphIRReflection {
   /** Forces initialization of reflection data. */
-  val reflection = (CommonReflection, CoreLibReflection)
+  val reflection = CommonReflection
 
   { val clazz = classOf[wrappers.scala.WOptions#WOption[_]]
     val ctx = null.asInstanceOf[scalan.Library] // ok! type level only

diff --git a/sc/shared/src/test/scala/scalan/TestContexts.scala b/sc/shared/src/test/scala/scalan/TestContexts.scala
@@ -1,7 +1,7 @@
 package scalan
 
 import sigma.reflection.RMethod
-import sigma.{BaseNestedTests, BaseShouldTests, BaseTests, CoreLibReflection, TestUtils}
+import sigma.{BaseNestedTests, BaseShouldTests, BaseTests, TestUtils}
 
 trait TestContexts extends TestUtils {
 
@@ -35,7 +35,7 @@ trait TestContexts extends TestUtils {
 }
 
 abstract class BaseCtxTests extends BaseTests with TestContexts {
-  val reflection = (CoreLibReflection, GraphIRReflection)
+  val reflection = GraphIRReflection
 }
 
 abstract class BaseNestedCtxTests extends BaseNestedTests with TestContexts

diff --git a/sdk/shared/src/main/scala/org/ergoplatform/sdk/JavaHelpers.scala b/sdk/shared/src/main/scala/org/ergoplatform/sdk/JavaHelpers.scala
@@ -9,6 +9,7 @@ import org.ergoplatform.sdk.wallet.secrets.{DerivationPath, ExtendedSecretKey}
 import org.ergoplatform.sdk.wallet.{Constants, TokensMap}
 import org.ergoplatform.settings.ErgoAlgos
 import scorex.crypto.authds.ADKey
+import sigmastate.utils.Helpers._  // don't remove, required for Scala 2.11
 import scorex.util.encode.Base16
 import scorex.util.{ModifierId, bytesToId, idToBytes}
 import sigma.data.ExactIntegral.LongIsExactIntegral