From 185ad78790016bde98ae01917762ba12b49d03a2 Mon Sep 17 00:00:00 2001 From: Marcus Vinicius Girolneto Sousa Date: Mon, 7 Oct 2024 14:56:38 -0300 Subject: [PATCH] Updating metagraph testnet --- .../com/my/dor_metagraph/data_l1/Main.scala | 47 ++++--------------- .../scala/com/my/dor_metagraph/l0/Main.scala | 35 ++++++-------- .../l0/custom_routes/CustomRoutes.scala | 2 +- .../dor_metagraph/l0/rewards/DorRewards.scala | 18 +++---- .../bounties/AnalyticsBountyRewards.scala | 6 +-- .../l0/rewards/bounties/BountyRewards.scala | 6 +-- .../rewards/bounties/DailyBountyRewards.scala | 6 +-- .../l0/rewards/collateral/Collateral.scala | 4 +- .../rewards/validators/ValidatorNodes.scala | 2 +- .../validators/ValidatorNodesAPI.scala | 4 +- .../validators/ValidatorNodesRewards.scala | 4 +- .../dor_metagraph/l0/BountyRewardsTest.scala | 2 +- .../dor_metagraph/l0/BuildRewardsTest.scala | 24 +++++----- .../my/dor_metagraph/l0/CollateralTest.scala | 4 +- .../scala/com/my/dor_metagraph/l1/Main.scala | 8 ++-- .../my/dor_metagraph/shared_data/Errors.scala | 4 +- .../LifecycleSharedFunctions.scala | 14 +++--- .../my/dor_metagraph/shared_data/Utils.scala | 12 ++--- .../calculated_state/CalculatedState.scala | 2 +- .../CalculatedStateService.scala | 4 +- .../shared_data/combiners/DeviceCheckIn.scala | 6 +-- .../shared_data/decoders/Decoders.scala | 8 ++-- .../deserializers/Deserializers.scala | 6 +-- .../external_apis/ClusterApi.scala | 4 +- .../shared_data/serializers/Serializers.scala | 6 +-- .../shared_data/types/Codecs.scala | 2 +- .../shared_data/types/Types.scala | 8 ++-- .../validations/TypeValidators.scala | 4 +- .../shared_data/validations/Validations.scala | 6 +-- .../shared_data/BountiesTest.scala | 2 +- .../shared_data/CombinersTest.scala | 6 +-- .../shared_data/TypeValidatorsTest.scala | 4 +- .../dor_metagraph/shared_data/UtilsTest.scala | 2 +- metagraph/project/Dependencies.scala | 4 +- 34 files changed, 119 insertions(+), 157 deletions(-) diff --git a/metagraph/modules/data_l1/src/main/scala/com/my/dor_metagraph/data_l1/Main.scala b/metagraph/modules/data_l1/src/main/scala/com/my/dor_metagraph/data_l1/Main.scala index 9ecf722..dbae291 100644 --- a/metagraph/modules/data_l1/src/main/scala/com/my/dor_metagraph/data_l1/Main.scala +++ b/metagraph/modules/data_l1/src/main/scala/com/my/dor_metagraph/data_l1/Main.scala @@ -1,10 +1,7 @@ package com.my.dor_metagraph.data_l1 -import cats.data.NonEmptyList import cats.effect.{IO, Resource} -import cats.syntax.applicative.catsSyntaxApplicativeId import cats.syntax.option.catsSyntaxOptionId -import cats.syntax.validated._ import com.my.dor_metagraph.shared_data.LifecycleSharedFunctions import com.my.dor_metagraph.shared_data.calculated_state.CalculatedStateService import com.my.dor_metagraph.shared_data.decoders.Decoders @@ -12,16 +9,14 @@ import com.my.dor_metagraph.shared_data.deserializers.Deserializers import com.my.dor_metagraph.shared_data.serializers.Serializers import com.my.dor_metagraph.shared_data.types.Types.{CheckInDataCalculatedState, CheckInStateOnChain, CheckInUpdate} import io.circe.{Decoder, Encoder} +import io.constellationnetwork.currency.dataApplication._ +import io.constellationnetwork.currency.dataApplication.dataApplication.{DataApplicationBlock, DataApplicationValidationErrorOr} +import io.constellationnetwork.currency.l1.CurrencyL1App +import io.constellationnetwork.ext.cats.effect.ResourceIO +import io.constellationnetwork.schema.cluster.ClusterId +import io.constellationnetwork.schema.semver.{MetagraphVersion, TessellationVersion} +import io.constellationnetwork.security.signature.Signed import org.http4s.{EntityDecoder, HttpRoutes} -import org.tessellation.currency.dataApplication._ -import org.tessellation.currency.dataApplication.dataApplication.{DataApplicationBlock, DataApplicationValidationErrorOr} -import org.tessellation.currency.l1.CurrencyL1App -import org.tessellation.ext.cats.effect.ResourceIO -import org.tessellation.schema.SnapshotOrdinal -import org.tessellation.schema.cluster.ClusterId -import org.tessellation.schema.semver.{MetagraphVersion, TessellationVersion} -import org.tessellation.security.hash.Hash -import org.tessellation.security.signature.Signed import java.util.UUID @@ -29,7 +24,7 @@ object Main extends CurrencyL1App( "currency-data_l1", "currency data L1 node", ClusterId(UUID.fromString("517c3a05-9219-471b-a54c-21b7d72f4ae5")), - tessellationVersion = TessellationVersion.unsafeFrom(org.tessellation.BuildInfo.version), + tessellationVersion = TessellationVersion.unsafeFrom(io.constellationnetwork.BuildInfo.version), metagraphVersion = MetagraphVersion.unsafeFrom(com.my.dor_metagraph.data_l1.BuildInfo.version) ) { @@ -37,23 +32,11 @@ object Main extends CurrencyL1App( calculatedStateService: CalculatedStateService[IO] ): BaseDataApplicationL1Service[IO] = BaseDataApplicationL1Service( new DataApplicationL1Service[IO, CheckInUpdate, CheckInStateOnChain, CheckInDataCalculatedState] { - override def validateData( - state : DataState[CheckInStateOnChain, CheckInDataCalculatedState], - updates: NonEmptyList[Signed[CheckInUpdate]] - )(implicit context: L1NodeContext[IO]): IO[DataApplicationValidationErrorOr[Unit]] = - ().validNec.pure[IO] - override def validateUpdate( update: CheckInUpdate )(implicit context: L1NodeContext[IO]): IO[DataApplicationValidationErrorOr[Unit]] = LifecycleSharedFunctions.validateUpdate[IO](update) - override def combine( - state : DataState[CheckInStateOnChain, CheckInDataCalculatedState], - updates: List[Signed[CheckInUpdate]] - )(implicit context: L1NodeContext[IO]): IO[DataState[CheckInStateOnChain, CheckInDataCalculatedState]] = - state.pure[IO] - override def routes(implicit context: L1NodeContext[IO]): HttpRoutes[IO] = HttpRoutes.empty @@ -102,20 +85,6 @@ object Main extends CurrencyL1App( ): IO[Either[Throwable, CheckInUpdate]] = IO(Deserializers.deserializeUpdate(bytes)) - override def getCalculatedState(implicit context: L1NodeContext[IO]): IO[(SnapshotOrdinal, CheckInDataCalculatedState)] = - calculatedStateService.getCalculatedState.map(calculatedState => (calculatedState.ordinal, calculatedState.state)) - - override def setCalculatedState( - ordinal: SnapshotOrdinal, - state : CheckInDataCalculatedState - )(implicit context: L1NodeContext[IO]): IO[Boolean] = - calculatedStateService.setCalculatedState(ordinal, state) - - override def hashCalculatedState( - state: CheckInDataCalculatedState - )(implicit context: L1NodeContext[IO]): IO[Hash] = - calculatedStateService.hashCalculatedState(state) - override def serializeCalculatedState( state: CheckInDataCalculatedState ): IO[Array[Byte]] = diff --git a/metagraph/modules/l0/src/main/scala/com/my/dor_metagraph/l0/Main.scala b/metagraph/modules/l0/src/main/scala/com/my/dor_metagraph/l0/Main.scala index 5a40f67..c1cd563 100644 --- a/metagraph/modules/l0/src/main/scala/com/my/dor_metagraph/l0/Main.scala +++ b/metagraph/modules/l0/src/main/scala/com/my/dor_metagraph/l0/Main.scala @@ -2,9 +2,7 @@ package com.my.dor_metagraph.l0 import cats.data.NonEmptyList import cats.effect.{IO, Resource} -import cats.syntax.applicative._ import cats.syntax.option._ -import cats.syntax.validated._ import com.my.dor_metagraph.l0.custom_routes.CustomRoutes import com.my.dor_metagraph.l0.rewards.DorRewards import com.my.dor_metagraph.l0.rewards.bounties.{AnalyticsBountyRewards, DailyBountyRewards} @@ -16,20 +14,20 @@ import com.my.dor_metagraph.shared_data.deserializers.Deserializers import com.my.dor_metagraph.shared_data.serializers.Serializers import com.my.dor_metagraph.shared_data.types.Types.{CheckInDataCalculatedState, CheckInStateOnChain, CheckInUpdate} import io.circe.{Decoder, Encoder} +import io.constellationnetwork.currency.dataApplication._ +import io.constellationnetwork.currency.dataApplication.dataApplication.{DataApplicationBlock, DataApplicationValidationErrorOr} +import io.constellationnetwork.currency.l0.CurrencyL0App +import io.constellationnetwork.currency.schema.currency.{CurrencyIncrementalSnapshot, CurrencySnapshotStateProof} +import io.constellationnetwork.ext.cats.effect.ResourceIO +import io.constellationnetwork.node.shared.domain.rewards.Rewards +import io.constellationnetwork.node.shared.snapshot.currency.CurrencySnapshotEvent +import io.constellationnetwork.schema.SnapshotOrdinal +import io.constellationnetwork.schema.cluster.ClusterId +import io.constellationnetwork.schema.semver.{MetagraphVersion, TessellationVersion} +import io.constellationnetwork.security.SecurityProvider +import io.constellationnetwork.security.hash.Hash +import io.constellationnetwork.security.signature.Signed import org.http4s.{EntityDecoder, HttpRoutes} -import org.tessellation.currency.dataApplication._ -import org.tessellation.currency.dataApplication.dataApplication.{DataApplicationBlock, DataApplicationValidationErrorOr} -import org.tessellation.currency.l0.CurrencyL0App -import org.tessellation.currency.schema.currency.{CurrencyIncrementalSnapshot, CurrencySnapshotStateProof} -import org.tessellation.ext.cats.effect.ResourceIO -import org.tessellation.node.shared.domain.rewards.Rewards -import org.tessellation.node.shared.snapshot.currency.CurrencySnapshotEvent -import org.tessellation.schema.SnapshotOrdinal -import org.tessellation.schema.cluster.ClusterId -import org.tessellation.schema.semver.{MetagraphVersion, TessellationVersion} -import org.tessellation.security.SecurityProvider -import org.tessellation.security.hash.Hash -import org.tessellation.security.signature.Signed import java.util.UUID @@ -37,7 +35,7 @@ object Main extends CurrencyL0App( "currency-l0", "currency L0 node", ClusterId(UUID.fromString("517c3a05-9219-471b-a54c-21b7d72f4ae5")), - tessellationVersion = TessellationVersion.unsafeFrom(org.tessellation.BuildInfo.version), + tessellationVersion = TessellationVersion.unsafeFrom(io.constellationnetwork.BuildInfo.version), metagraphVersion = MetagraphVersion.unsafeFrom(com.my.dor_metagraph.l0.BuildInfo.version) ) { private def makeBaseDataApplicationL0Service( @@ -48,11 +46,6 @@ object Main extends CurrencyL0App( override def genesis: DataState[CheckInStateOnChain, CheckInDataCalculatedState] = DataState(CheckInStateOnChain(List.empty), CheckInDataCalculatedState(Map.empty)) - override def validateUpdate( - update: CheckInUpdate - )(implicit context: L0NodeContext[IO]): IO[DataApplicationValidationErrorOr[Unit]] = - ().validNec.pure[IO] - override def validateData( state : DataState[CheckInStateOnChain, CheckInDataCalculatedState], updates: NonEmptyList[Signed[CheckInUpdate]] diff --git a/metagraph/modules/l0/src/main/scala/com/my/dor_metagraph/l0/custom_routes/CustomRoutes.scala b/metagraph/modules/l0/src/main/scala/com/my/dor_metagraph/l0/custom_routes/CustomRoutes.scala index 434d7f1..902c1be 100644 --- a/metagraph/modules/l0/src/main/scala/com/my/dor_metagraph/l0/custom_routes/CustomRoutes.scala +++ b/metagraph/modules/l0/src/main/scala/com/my/dor_metagraph/l0/custom_routes/CustomRoutes.scala @@ -10,7 +10,7 @@ import org.http4s.circe.CirceEntityCodec.circeEntityEncoder import org.http4s.dsl.Http4sDsl import org.http4s.server.middleware.CORS import org.http4s.{HttpRoutes, Response} -import org.tessellation.routes.internal.{InternalUrlPrefix, PublicRoutes} +import io.constellationnetwork.routes.internal.{InternalUrlPrefix, PublicRoutes} case class CustomRoutes[F[_] : Async](calculatedStateService: CalculatedStateService[F]) extends Http4sDsl[F] with PublicRoutes[F] { diff --git a/metagraph/modules/l0/src/main/scala/com/my/dor_metagraph/l0/rewards/DorRewards.scala b/metagraph/modules/l0/src/main/scala/com/my/dor_metagraph/l0/rewards/DorRewards.scala index 93ceeef..3a6ae9a 100644 --- a/metagraph/modules/l0/src/main/scala/com/my/dor_metagraph/l0/rewards/DorRewards.scala +++ b/metagraph/modules/l0/src/main/scala/com/my/dor_metagraph/l0/rewards/DorRewards.scala @@ -8,15 +8,15 @@ import com.my.dor_metagraph.l0.rewards.validators.ValidatorNodes import com.my.dor_metagraph.l0.rewards.validators.ValidatorNodesRewards.getValidatorNodesTransactions import com.my.dor_metagraph.shared_data.Utils.buildTransactionsSortedSet import com.my.dor_metagraph.shared_data.types.Types._ -import org.tessellation.currency.dataApplication.DataCalculatedState -import org.tessellation.currency.schema.currency.{CurrencyIncrementalSnapshot, CurrencySnapshotStateProof} -import org.tessellation.node.shared.domain.rewards.Rewards -import org.tessellation.node.shared.infrastructure.consensus.trigger.{ConsensusTrigger, EventTrigger, TimeTrigger} -import org.tessellation.node.shared.snapshot.currency.CurrencySnapshotEvent -import org.tessellation.schema.address.Address -import org.tessellation.schema.balance.Balance -import org.tessellation.schema.transaction.{RewardTransaction, Transaction} -import org.tessellation.security.signature.Signed +import io.constellationnetwork.currency.dataApplication.DataCalculatedState +import io.constellationnetwork.currency.schema.currency.{CurrencyIncrementalSnapshot, CurrencySnapshotStateProof} +import io.constellationnetwork.node.shared.domain.rewards.Rewards +import io.constellationnetwork.node.shared.infrastructure.consensus.trigger.{ConsensusTrigger, EventTrigger, TimeTrigger} +import io.constellationnetwork.node.shared.snapshot.currency.CurrencySnapshotEvent +import io.constellationnetwork.schema.address.Address +import io.constellationnetwork.schema.balance.Balance +import io.constellationnetwork.schema.transaction.{RewardTransaction, Transaction} +import io.constellationnetwork.security.signature.Signed import org.typelevel.log4cats.slf4j.Slf4jLogger import scala.collection.immutable.{SortedMap, SortedSet} diff --git a/metagraph/modules/l0/src/main/scala/com/my/dor_metagraph/l0/rewards/bounties/AnalyticsBountyRewards.scala b/metagraph/modules/l0/src/main/scala/com/my/dor_metagraph/l0/rewards/bounties/AnalyticsBountyRewards.scala index 6665410..622cfee 100644 --- a/metagraph/modules/l0/src/main/scala/com/my/dor_metagraph/l0/rewards/bounties/AnalyticsBountyRewards.scala +++ b/metagraph/modules/l0/src/main/scala/com/my/dor_metagraph/l0/rewards/bounties/AnalyticsBountyRewards.scala @@ -9,9 +9,9 @@ import com.my.dor_metagraph.l0.rewards.collateral.Collateral.getDeviceCollateral import com.my.dor_metagraph.shared_data.Utils._ import com.my.dor_metagraph.shared_data.bounties.AnalyticsSubscriptionBounty import com.my.dor_metagraph.shared_data.types.Types._ -import org.tessellation.schema.address.Address -import org.tessellation.schema.balance.Balance -import org.tessellation.schema.transaction.RewardTransaction +import io.constellationnetwork.schema.address.Address +import io.constellationnetwork.schema.balance.Balance +import io.constellationnetwork.schema.transaction.RewardTransaction import org.typelevel.log4cats.SelfAwareStructuredLogger import org.typelevel.log4cats.slf4j.Slf4jLogger diff --git a/metagraph/modules/l0/src/main/scala/com/my/dor_metagraph/l0/rewards/bounties/BountyRewards.scala b/metagraph/modules/l0/src/main/scala/com/my/dor_metagraph/l0/rewards/bounties/BountyRewards.scala index 4563d77..f67bb40 100644 --- a/metagraph/modules/l0/src/main/scala/com/my/dor_metagraph/l0/rewards/bounties/BountyRewards.scala +++ b/metagraph/modules/l0/src/main/scala/com/my/dor_metagraph/l0/rewards/bounties/BountyRewards.scala @@ -5,9 +5,9 @@ import cats.syntax.functor._ import cats.syntax.option.catsSyntaxOptionId import com.my.dor_metagraph.shared_data.Utils.{PosLongOps, RewardTransactionOps} import com.my.dor_metagraph.shared_data.types.Types._ -import org.tessellation.schema.address.Address -import org.tessellation.schema.balance.Balance -import org.tessellation.schema.transaction.RewardTransaction +import io.constellationnetwork.schema.address.Address +import io.constellationnetwork.schema.balance.Balance +import io.constellationnetwork.schema.transaction.RewardTransaction abstract class BountyRewards[F[_] : Async] { diff --git a/metagraph/modules/l0/src/main/scala/com/my/dor_metagraph/l0/rewards/bounties/DailyBountyRewards.scala b/metagraph/modules/l0/src/main/scala/com/my/dor_metagraph/l0/rewards/bounties/DailyBountyRewards.scala index 28b5449..94ea6f9 100644 --- a/metagraph/modules/l0/src/main/scala/com/my/dor_metagraph/l0/rewards/bounties/DailyBountyRewards.scala +++ b/metagraph/modules/l0/src/main/scala/com/my/dor_metagraph/l0/rewards/bounties/DailyBountyRewards.scala @@ -8,9 +8,9 @@ import com.my.dor_metagraph.l0.rewards.collateral.Collateral.getDeviceCollateral import com.my.dor_metagraph.shared_data.Utils._ import com.my.dor_metagraph.shared_data.bounties.{CommercialLocationBounty, UnitDeployedBounty} import com.my.dor_metagraph.shared_data.types.Types._ -import org.tessellation.schema.address.Address -import org.tessellation.schema.balance.Balance -import org.tessellation.schema.transaction.RewardTransaction +import io.constellationnetwork.schema.address.Address +import io.constellationnetwork.schema.balance.Balance +import io.constellationnetwork.schema.transaction.RewardTransaction import org.typelevel.log4cats.SelfAwareStructuredLogger import org.typelevel.log4cats.slf4j.Slf4jLogger diff --git a/metagraph/modules/l0/src/main/scala/com/my/dor_metagraph/l0/rewards/collateral/Collateral.scala b/metagraph/modules/l0/src/main/scala/com/my/dor_metagraph/l0/rewards/collateral/Collateral.scala index 7402577..98936c2 100644 --- a/metagraph/modules/l0/src/main/scala/com/my/dor_metagraph/l0/rewards/collateral/Collateral.scala +++ b/metagraph/modules/l0/src/main/scala/com/my/dor_metagraph/l0/rewards/collateral/Collateral.scala @@ -3,8 +3,8 @@ package com.my.dor_metagraph.l0.rewards.collateral import com.my.dor_metagraph.shared_data.Utils.toTokenAmountFormat import com.my.dor_metagraph.shared_data.types.Types._ import eu.timepit.refined.types.numeric.NonNegLong -import org.tessellation.schema.address.Address -import org.tessellation.schema.balance.Balance +import io.constellationnetwork.schema.address.Address +import io.constellationnetwork.schema.balance.Balance object Collateral { def getDeviceCollateral( diff --git a/metagraph/modules/l0/src/main/scala/com/my/dor_metagraph/l0/rewards/validators/ValidatorNodes.scala b/metagraph/modules/l0/src/main/scala/com/my/dor_metagraph/l0/rewards/validators/ValidatorNodes.scala index 1fc1b12..a733cdd 100644 --- a/metagraph/modules/l0/src/main/scala/com/my/dor_metagraph/l0/rewards/validators/ValidatorNodes.scala +++ b/metagraph/modules/l0/src/main/scala/com/my/dor_metagraph/l0/rewards/validators/ValidatorNodes.scala @@ -1,6 +1,6 @@ package com.my.dor_metagraph.l0.rewards.validators -import org.tessellation.schema.address.Address +import io.constellationnetwork.schema.address.Address trait ValidatorNodes[F[_]] { def getValidatorNodes: F[(List[Address], List[Address])] diff --git a/metagraph/modules/l0/src/main/scala/com/my/dor_metagraph/l0/rewards/validators/ValidatorNodesAPI.scala b/metagraph/modules/l0/src/main/scala/com/my/dor_metagraph/l0/rewards/validators/ValidatorNodesAPI.scala index 1f35b0e..40803b5 100644 --- a/metagraph/modules/l0/src/main/scala/com/my/dor_metagraph/l0/rewards/validators/ValidatorNodesAPI.scala +++ b/metagraph/modules/l0/src/main/scala/com/my/dor_metagraph/l0/rewards/validators/ValidatorNodesAPI.scala @@ -5,8 +5,8 @@ import cats.effect.std.Env import cats.syntax.all._ import com.my.dor_metagraph.shared_data.Utils.getEnv import com.my.dor_metagraph.shared_data.external_apis.ClusterApi.getValidatorNodesAddresses -import org.tessellation.schema.address.Address -import org.tessellation.security.SecurityProvider +import io.constellationnetwork.schema.address.Address +import io.constellationnetwork.security.SecurityProvider class ValidatorNodesAPI[F[_] : Async : SecurityProvider : Env] extends ValidatorNodes[F] { diff --git a/metagraph/modules/l0/src/main/scala/com/my/dor_metagraph/l0/rewards/validators/ValidatorNodesRewards.scala b/metagraph/modules/l0/src/main/scala/com/my/dor_metagraph/l0/rewards/validators/ValidatorNodesRewards.scala index e68c123..661a6b9 100644 --- a/metagraph/modules/l0/src/main/scala/com/my/dor_metagraph/l0/rewards/validators/ValidatorNodesRewards.scala +++ b/metagraph/modules/l0/src/main/scala/com/my/dor_metagraph/l0/rewards/validators/ValidatorNodesRewards.scala @@ -5,8 +5,8 @@ import cats.syntax.applicative._ import cats.syntax.flatMap._ import cats.syntax.functor._ import com.my.dor_metagraph.shared_data.Utils.{PosLongEffectOps, RewardTransactionOps} -import org.tessellation.schema.address.Address -import org.tessellation.schema.transaction.RewardTransaction +import io.constellationnetwork.schema.address.Address +import io.constellationnetwork.schema.transaction.RewardTransaction import org.typelevel.log4cats.SelfAwareStructuredLogger import org.typelevel.log4cats.slf4j.Slf4jLogger diff --git a/metagraph/modules/l0/src/test/scala/com/my/dor_metagraph/l0/BountyRewardsTest.scala b/metagraph/modules/l0/src/test/scala/com/my/dor_metagraph/l0/BountyRewardsTest.scala index 6d3fd8c..878fe09 100644 --- a/metagraph/modules/l0/src/test/scala/com/my/dor_metagraph/l0/BountyRewardsTest.scala +++ b/metagraph/modules/l0/src/test/scala/com/my/dor_metagraph/l0/BountyRewardsTest.scala @@ -4,7 +4,7 @@ import cats.syntax.option._ import com.my.dor_metagraph.l0.rewards.bounties.{AnalyticsBountyRewards, DailyBountyRewards} import com.my.dor_metagraph.shared_data.types.Types._ import eu.timepit.refined.auto._ -import org.tessellation.schema.address.Address +import io.constellationnetwork.schema.address.Address import weaver.SimpleIOSuite object BountyRewardsTest extends SimpleIOSuite { diff --git a/metagraph/modules/l0/src/test/scala/com/my/dor_metagraph/l0/BuildRewardsTest.scala b/metagraph/modules/l0/src/test/scala/com/my/dor_metagraph/l0/BuildRewardsTest.scala index ee03b76..bd5ce57 100644 --- a/metagraph/modules/l0/src/test/scala/com/my/dor_metagraph/l0/BuildRewardsTest.scala +++ b/metagraph/modules/l0/src/test/scala/com/my/dor_metagraph/l0/BuildRewardsTest.scala @@ -11,18 +11,18 @@ import com.my.dor_metagraph.shared_data.Utils.toTokenAmountFormat import com.my.dor_metagraph.shared_data.types.Types.{AnalyticsBountyInformation, CheckInDataCalculatedState, DeviceInfo, DorAPIResponse} import eu.timepit.refined.auto._ import eu.timepit.refined.types.numeric.NonNegLong -import org.tessellation.currency.schema.currency.{CurrencyIncrementalSnapshot, CurrencySnapshotStateProof} -import org.tessellation.node.shared.infrastructure.consensus.trigger.TimeTrigger -import org.tessellation.schema.address.Address -import org.tessellation.schema.balance.Balance -import org.tessellation.schema.epoch.EpochProgress -import org.tessellation.schema.height.{Height, SubHeight} -import org.tessellation.schema.transaction.RewardTransaction -import org.tessellation.schema.{ActiveTip, BlockReference, DeprecatedTip, ID, SnapshotOrdinal, SnapshotTips} -import org.tessellation.security.hash.{Hash, ProofsHash} -import org.tessellation.security.hex.Hex -import org.tessellation.security.signature.Signed -import org.tessellation.security.signature.signature.{Signature, SignatureProof} +import io.constellationnetwork.currency.schema.currency.{CurrencyIncrementalSnapshot, CurrencySnapshotStateProof} +import io.constellationnetwork.node.shared.infrastructure.consensus.trigger.TimeTrigger +import io.constellationnetwork.schema.address.Address +import io.constellationnetwork.schema.balance.Balance +import io.constellationnetwork.schema.epoch.EpochProgress +import io.constellationnetwork.schema.height.{Height, SubHeight} +import io.constellationnetwork.schema.transaction.RewardTransaction +import io.constellationnetwork.schema.{ActiveTip, BlockReference, DeprecatedTip, ID, SnapshotOrdinal, SnapshotTips} +import io.constellationnetwork.security.hash.{Hash, ProofsHash} +import io.constellationnetwork.security.hex.Hex +import io.constellationnetwork.security.signature.Signed +import io.constellationnetwork.security.signature.signature.{Signature, SignatureProof} import weaver.SimpleIOSuite import scala.collection.immutable.{SortedMap, SortedSet} diff --git a/metagraph/modules/l0/src/test/scala/com/my/dor_metagraph/l0/CollateralTest.scala b/metagraph/modules/l0/src/test/scala/com/my/dor_metagraph/l0/CollateralTest.scala index 17d2e05..e4a7b03 100644 --- a/metagraph/modules/l0/src/test/scala/com/my/dor_metagraph/l0/CollateralTest.scala +++ b/metagraph/modules/l0/src/test/scala/com/my/dor_metagraph/l0/CollateralTest.scala @@ -4,8 +4,8 @@ import com.my.dor_metagraph.l0.rewards.collateral.Collateral.getDeviceCollateral import com.my.dor_metagraph.shared_data.Utils.toTokenAmountFormat import eu.timepit.refined.auto._ import eu.timepit.refined.types.numeric.NonNegLong -import org.tessellation.schema.address.Address -import org.tessellation.schema.balance.Balance +import io.constellationnetwork.schema.address.Address +import io.constellationnetwork.schema.balance.Balance import weaver.SimpleIOSuite object CollateralTest extends SimpleIOSuite { diff --git a/metagraph/modules/l1/src/main/scala/com/my/dor_metagraph/l1/Main.scala b/metagraph/modules/l1/src/main/scala/com/my/dor_metagraph/l1/Main.scala index f84349f..16dd668 100644 --- a/metagraph/modules/l1/src/main/scala/com/my/dor_metagraph/l1/Main.scala +++ b/metagraph/modules/l1/src/main/scala/com/my/dor_metagraph/l1/Main.scala @@ -1,8 +1,8 @@ package com.my.dor_metagraph.l1 -import org.tessellation.currency.l1.CurrencyL1App -import org.tessellation.schema.cluster.ClusterId -import org.tessellation.schema.semver.{MetagraphVersion, TessellationVersion} +import io.constellationnetwork.currency.l1.CurrencyL1App +import io.constellationnetwork.schema.cluster.ClusterId +import io.constellationnetwork.schema.semver.{MetagraphVersion, TessellationVersion} import java.util.UUID @@ -10,6 +10,6 @@ object Main extends CurrencyL1App( "currency-l1", "currency L1 node", ClusterId(UUID.fromString("517c3a05-9219-471b-a54c-21b7d72f4ae5")), - tessellationVersion = TessellationVersion.unsafeFrom(org.tessellation.BuildInfo.version), + tessellationVersion = TessellationVersion.unsafeFrom(io.constellationnetwork.BuildInfo.version), metagraphVersion = MetagraphVersion.unsafeFrom(com.my.dor_metagraph.l1.BuildInfo.version) ) {} diff --git a/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/Errors.scala b/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/Errors.scala index dd38467..c9fe49b 100644 --- a/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/Errors.scala +++ b/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/Errors.scala @@ -1,8 +1,8 @@ package com.my.dor_metagraph.shared_data import cats.syntax.validated.catsSyntaxValidatedIdBinCompat0 -import org.tessellation.currency.dataApplication.DataApplicationValidationError -import org.tessellation.currency.dataApplication.dataApplication.DataApplicationValidationErrorOr +import io.constellationnetwork.currency.dataApplication.DataApplicationValidationError +import io.constellationnetwork.currency.dataApplication.dataApplication.DataApplicationValidationErrorOr object Errors { private type DataApplicationValidationType = DataApplicationValidationErrorOr[Unit] diff --git a/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/LifecycleSharedFunctions.scala b/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/LifecycleSharedFunctions.scala index 421fdde..2820636 100644 --- a/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/LifecycleSharedFunctions.scala +++ b/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/LifecycleSharedFunctions.scala @@ -7,13 +7,13 @@ import com.my.dor_metagraph.shared_data.Utils.getFirstAddressFromProofs import com.my.dor_metagraph.shared_data.combiners.DeviceCheckIn.combineDeviceCheckIn import com.my.dor_metagraph.shared_data.types.Types.{CheckInDataCalculatedState, CheckInStateOnChain, CheckInUpdate} import com.my.dor_metagraph.shared_data.validations.Validations.{deviceCheckInValidationsL0, deviceCheckInValidationsL1} -import org.tessellation.currency.dataApplication.dataApplication.DataApplicationValidationErrorOr -import org.tessellation.currency.dataApplication.{DataState, L0NodeContext} -import org.tessellation.ext.cats.syntax.next.catsSyntaxNext -import org.tessellation.schema.epoch.EpochProgress._ -import org.tessellation.schema.epoch._ -import org.tessellation.security.SecurityProvider -import org.tessellation.security.signature.Signed +import io.constellationnetwork.currency.dataApplication.dataApplication.DataApplicationValidationErrorOr +import io.constellationnetwork.currency.dataApplication.{DataState, L0NodeContext} +import io.constellationnetwork.ext.cats.syntax.next.catsSyntaxNext +import io.constellationnetwork.schema.epoch.EpochProgress._ +import io.constellationnetwork.schema.epoch._ +import io.constellationnetwork.security.SecurityProvider +import io.constellationnetwork.security.signature.Signed import org.typelevel.log4cats.SelfAwareStructuredLogger import org.typelevel.log4cats.slf4j.Slf4jLogger diff --git a/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/Utils.scala b/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/Utils.scala index d71dd95..d2569dc 100644 --- a/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/Utils.scala +++ b/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/Utils.scala @@ -12,12 +12,12 @@ import com.my.dor_metagraph.shared_data.types.Codecs.checkInfoCodec import com.my.dor_metagraph.shared_data.types.Types._ import eu.timepit.refined.types.all.{NonNegLong, PosLong} import io.bullet.borer.Cbor -import org.tessellation.schema.ID.Id -import org.tessellation.schema.address.Address -import org.tessellation.schema.transaction.{RewardTransaction, TransactionAmount} -import org.tessellation.security.SecurityProvider -import org.tessellation.security.hex.Hex -import org.tessellation.security.signature.signature.SignatureProof +import io.constellationnetwork.schema.ID.Id +import io.constellationnetwork.schema.address.Address +import io.constellationnetwork.schema.transaction.{RewardTransaction, TransactionAmount} +import io.constellationnetwork.security.SecurityProvider +import io.constellationnetwork.security.hex.Hex +import io.constellationnetwork.security.signature.signature.SignatureProof import org.typelevel.log4cats.SelfAwareStructuredLogger import org.typelevel.log4cats.slf4j.Slf4jLogger diff --git a/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/calculated_state/CalculatedState.scala b/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/calculated_state/CalculatedState.scala index ad0056f..7bafab9 100644 --- a/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/calculated_state/CalculatedState.scala +++ b/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/calculated_state/CalculatedState.scala @@ -2,7 +2,7 @@ package com.my.dor_metagraph.shared_data.calculated_state import com.my.dor_metagraph.shared_data.types.Types.CheckInDataCalculatedState import eu.timepit.refined.types.all.NonNegLong -import org.tessellation.schema.SnapshotOrdinal +import io.constellationnetwork.schema.SnapshotOrdinal case class CalculatedState(ordinal: SnapshotOrdinal, state: CheckInDataCalculatedState) diff --git a/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/calculated_state/CalculatedStateService.scala b/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/calculated_state/CalculatedStateService.scala index 5ff2d5f..0f7e92e 100644 --- a/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/calculated_state/CalculatedStateService.scala +++ b/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/calculated_state/CalculatedStateService.scala @@ -5,8 +5,8 @@ import cats.effect.kernel.Async import cats.syntax.functor._ import com.my.dor_metagraph.shared_data.types.Types.CheckInDataCalculatedState import io.circe.syntax.EncoderOps -import org.tessellation.schema.SnapshotOrdinal -import org.tessellation.security.hash.Hash +import io.constellationnetwork.schema.SnapshotOrdinal +import io.constellationnetwork.security.hash.Hash import java.nio.charset.StandardCharsets diff --git a/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/combiners/DeviceCheckIn.scala b/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/combiners/DeviceCheckIn.scala index 2d7ae25..83cf92e 100644 --- a/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/combiners/DeviceCheckIn.scala +++ b/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/combiners/DeviceCheckIn.scala @@ -1,9 +1,9 @@ package com.my.dor_metagraph.shared_data.combiners import com.my.dor_metagraph.shared_data.types.Types._ -import org.tessellation.currency.dataApplication.DataState -import org.tessellation.schema.address.Address -import org.tessellation.schema.epoch.EpochProgress +import io.constellationnetwork.currency.dataApplication.DataState +import io.constellationnetwork.schema.address.Address +import io.constellationnetwork.schema.epoch.EpochProgress object DeviceCheckIn { def combineDeviceCheckIn( diff --git a/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/decoders/Decoders.scala b/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/decoders/Decoders.scala index 38cda4b..2ec61a5 100644 --- a/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/decoders/Decoders.scala +++ b/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/decoders/Decoders.scala @@ -11,10 +11,10 @@ import com.my.dor_metagraph.shared_data.types.Codecs._ import com.my.dor_metagraph.shared_data.types.Types._ import io.bullet.borer.Cbor import org.http4s.{DecodeResult, EntityDecoder, MediaType} -import org.tessellation.schema.ID.Id -import org.tessellation.security.hex.Hex -import org.tessellation.security.signature.Signed -import org.tessellation.security.signature.signature.{Signature, SignatureProof} +import io.constellationnetwork.schema.ID.Id +import io.constellationnetwork.security.hex.Hex +import io.constellationnetwork.security.signature.Signed +import io.constellationnetwork.security.signature.signature.{Signature, SignatureProof} import org.typelevel.log4cats.SelfAwareStructuredLogger import org.typelevel.log4cats.slf4j.Slf4jLogger diff --git a/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/deserializers/Deserializers.scala b/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/deserializers/Deserializers.scala index 49ff217..705118b 100644 --- a/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/deserializers/Deserializers.scala +++ b/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/deserializers/Deserializers.scala @@ -2,9 +2,9 @@ package com.my.dor_metagraph.shared_data.deserializers import com.my.dor_metagraph.shared_data.types.Types.{CheckInDataCalculatedState, CheckInStateOnChain, CheckInUpdate} import io.circe.{Decoder, parser} -import org.tessellation.currency.dataApplication.DataUpdate -import org.tessellation.currency.dataApplication.dataApplication.DataApplicationBlock -import org.tessellation.security.signature.Signed +import io.constellationnetwork.currency.dataApplication.DataUpdate +import io.constellationnetwork.currency.dataApplication.dataApplication.DataApplicationBlock +import io.constellationnetwork.security.signature.Signed import java.nio.charset.StandardCharsets diff --git a/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/external_apis/ClusterApi.scala b/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/external_apis/ClusterApi.scala index 7bac365..f82ee5c 100644 --- a/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/external_apis/ClusterApi.scala +++ b/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/external_apis/ClusterApi.scala @@ -6,8 +6,8 @@ import com.my.dor_metagraph.shared_data.Utils.getDagAddressFromPublicKey import com.my.dor_metagraph.shared_data.types.Types.ClusterInfoResponse import eu.timepit.refined.auto._ import io.circe.parser.decode -import org.tessellation.schema.address.Address -import org.tessellation.security.SecurityProvider +import io.constellationnetwork.schema.address.Address +import io.constellationnetwork.security.SecurityProvider import org.typelevel.log4cats.SelfAwareStructuredLogger import org.typelevel.log4cats.slf4j.Slf4jLogger diff --git a/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/serializers/Serializers.scala b/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/serializers/Serializers.scala index 3182beb..5a65932 100644 --- a/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/serializers/Serializers.scala +++ b/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/serializers/Serializers.scala @@ -3,9 +3,9 @@ package com.my.dor_metagraph.shared_data.serializers import com.my.dor_metagraph.shared_data.types.Types.{CheckInDataCalculatedState, CheckInStateOnChain, CheckInUpdate} import io.circe.Encoder import io.circe.syntax.EncoderOps -import org.tessellation.currency.dataApplication.DataUpdate -import org.tessellation.currency.dataApplication.dataApplication.DataApplicationBlock -import org.tessellation.security.signature.Signed +import io.constellationnetwork.currency.dataApplication.DataUpdate +import io.constellationnetwork.currency.dataApplication.dataApplication.DataApplicationBlock +import io.constellationnetwork.security.signature.Signed import java.nio.charset.StandardCharsets diff --git a/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/types/Codecs.scala b/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/types/Codecs.scala index e77339d..3ea65b1 100644 --- a/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/types/Codecs.scala +++ b/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/types/Codecs.scala @@ -3,7 +3,7 @@ package com.my.dor_metagraph.shared_data.types import com.my.dor_metagraph.shared_data.types.Types.{DeviceCheckInInfo, DeviceCheckInWithSignature} import io.bullet.borer.derivation.MapBasedCodecs.{deriveCodec, deriveEncoder} import io.bullet.borer.{Codec, Decoder, Encoder, Reader} -import org.tessellation.security.hex.Hex +import io.constellationnetwork.security.hex.Hex object Codecs { private def readNextString( diff --git a/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/types/Types.scala b/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/types/Types.scala index 74b988f..14a001f 100644 --- a/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/types/Types.scala +++ b/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/types/Types.scala @@ -3,10 +3,10 @@ package com.my.dor_metagraph.shared_data.types import com.my.dor_metagraph.shared_data.Utils.toTokenAmountFormat import derevo.circe.magnolia.{decoder, encoder} import derevo.derive -import org.tessellation.currency.dataApplication.{DataCalculatedState, DataOnChainState, DataUpdate} -import org.tessellation.schema.address.Address -import org.tessellation.schema.balance.Balance -import org.tessellation.schema.transaction.RewardTransaction +import io.constellationnetwork.currency.dataApplication.{DataCalculatedState, DataOnChainState, DataUpdate} +import io.constellationnetwork.schema.address.Address +import io.constellationnetwork.schema.balance.Balance +import io.constellationnetwork.schema.transaction.RewardTransaction import java.time.Instant diff --git a/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/validations/TypeValidators.scala b/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/validations/TypeValidators.scala index 4e7c607..fb35506 100644 --- a/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/validations/TypeValidators.scala +++ b/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/validations/TypeValidators.scala @@ -2,8 +2,8 @@ package com.my.dor_metagraph.shared_data.validations import com.my.dor_metagraph.shared_data.Errors._ import com.my.dor_metagraph.shared_data.types.Types.{CheckInDataCalculatedState, CheckInUpdate, MinimumCheckInSeconds} -import org.tessellation.currency.dataApplication.dataApplication.DataApplicationValidationErrorOr -import org.tessellation.schema.address.Address +import io.constellationnetwork.currency.dataApplication.dataApplication.DataApplicationValidationErrorOr +import io.constellationnetwork.schema.address.Address import java.time.Instant import java.time.temporal.ChronoUnit diff --git a/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/validations/Validations.scala b/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/validations/Validations.scala index 003ef43..750a66d 100644 --- a/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/validations/Validations.scala +++ b/metagraph/modules/shared_data/src/main/scala/com/my/dor_metagraph/shared_data/validations/Validations.scala @@ -7,9 +7,9 @@ import cats.syntax.functor.toFunctorOps import com.my.dor_metagraph.shared_data.Utils.getFirstAddressFromProofs import com.my.dor_metagraph.shared_data.types.Types.{CheckInDataCalculatedState, CheckInUpdate} import com.my.dor_metagraph.shared_data.validations.TypeValidators._ -import org.tessellation.currency.dataApplication.dataApplication.DataApplicationValidationErrorOr -import org.tessellation.security.SecurityProvider -import org.tessellation.security.signature.signature.SignatureProof +import io.constellationnetwork.currency.dataApplication.dataApplication.DataApplicationValidationErrorOr +import io.constellationnetwork.security.SecurityProvider +import io.constellationnetwork.security.signature.signature.SignatureProof object Validations { def deviceCheckInValidationsL0[F[_] : Async]( diff --git a/metagraph/modules/shared_data/src/test/scala/com/my/dor_metagraph/shared_data/BountiesTest.scala b/metagraph/modules/shared_data/src/test/scala/com/my/dor_metagraph/shared_data/BountiesTest.scala index 6ba30a2..1d18bdc 100644 --- a/metagraph/modules/shared_data/src/test/scala/com/my/dor_metagraph/shared_data/BountiesTest.scala +++ b/metagraph/modules/shared_data/src/test/scala/com/my/dor_metagraph/shared_data/BountiesTest.scala @@ -3,7 +3,7 @@ package com.my.dor_metagraph.shared_data import cats.syntax.option._ import com.my.dor_metagraph.shared_data.bounties.{CommercialLocationBounty, UnitDeployedBounty} import com.my.dor_metagraph.shared_data.types.Types.DorAPIResponse -import org.tessellation.schema.address.Address +import io.constellationnetwork.schema.address.Address import weaver.SimpleIOSuite object BountiesTest extends SimpleIOSuite { diff --git a/metagraph/modules/shared_data/src/test/scala/com/my/dor_metagraph/shared_data/CombinersTest.scala b/metagraph/modules/shared_data/src/test/scala/com/my/dor_metagraph/shared_data/CombinersTest.scala index b97842a..4d39c44 100644 --- a/metagraph/modules/shared_data/src/test/scala/com/my/dor_metagraph/shared_data/CombinersTest.scala +++ b/metagraph/modules/shared_data/src/test/scala/com/my/dor_metagraph/shared_data/CombinersTest.scala @@ -4,9 +4,9 @@ import cats.syntax.option._ import com.my.dor_metagraph.shared_data.combiners.DeviceCheckIn.combineDeviceCheckIn import com.my.dor_metagraph.shared_data.types.Types._ import eu.timepit.refined.auto._ -import org.tessellation.currency.dataApplication.DataState -import org.tessellation.schema.address.Address -import org.tessellation.schema.epoch.EpochProgress +import io.constellationnetwork.currency.dataApplication.DataState +import io.constellationnetwork.schema.address.Address +import io.constellationnetwork.schema.epoch.EpochProgress import weaver.SimpleIOSuite object CombinersTest extends SimpleIOSuite { diff --git a/metagraph/modules/shared_data/src/test/scala/com/my/dor_metagraph/shared_data/TypeValidatorsTest.scala b/metagraph/modules/shared_data/src/test/scala/com/my/dor_metagraph/shared_data/TypeValidatorsTest.scala index 2c0ab80..3f2afe2 100644 --- a/metagraph/modules/shared_data/src/test/scala/com/my/dor_metagraph/shared_data/TypeValidatorsTest.scala +++ b/metagraph/modules/shared_data/src/test/scala/com/my/dor_metagraph/shared_data/TypeValidatorsTest.scala @@ -4,8 +4,8 @@ import cats.syntax.option._ import com.my.dor_metagraph.shared_data.types.Types._ import com.my.dor_metagraph.shared_data.validations.TypeValidators._ import eu.timepit.refined.auto._ -import org.tessellation.currency.dataApplication.DataState -import org.tessellation.schema.address.Address +import io.constellationnetwork.currency.dataApplication.DataState +import io.constellationnetwork.schema.address.Address import weaver.SimpleIOSuite object TypeValidatorsTest extends SimpleIOSuite { diff --git a/metagraph/modules/shared_data/src/test/scala/com/my/dor_metagraph/shared_data/UtilsTest.scala b/metagraph/modules/shared_data/src/test/scala/com/my/dor_metagraph/shared_data/UtilsTest.scala index 1876fba..de9767a 100644 --- a/metagraph/modules/shared_data/src/test/scala/com/my/dor_metagraph/shared_data/UtilsTest.scala +++ b/metagraph/modules/shared_data/src/test/scala/com/my/dor_metagraph/shared_data/UtilsTest.scala @@ -2,7 +2,7 @@ package com.my.dor_metagraph.shared_data import cats.effect.{IO, Resource} import com.my.dor_metagraph.shared_data.Utils.getDagAddressFromPublicKey -import org.tessellation.security.SecurityProvider +import io.constellationnetwork.security.SecurityProvider import weaver.MutableIOSuite object UtilsTest extends MutableIOSuite { diff --git a/metagraph/project/Dependencies.scala b/metagraph/project/Dependencies.scala index cab0505..beae09a 100644 --- a/metagraph/project/Dependencies.scala +++ b/metagraph/project/Dependencies.scala @@ -3,11 +3,11 @@ import sbt._ object Dependencies { object V { - val tessellation = "2.8.0" + val tessellation = "99.99.99" val decline = "2.4.1" } - def tessellation(artifact: String): ModuleID = "org.constellation" %% s"tessellation-$artifact" % V.tessellation + def tessellation(artifact: String): ModuleID = "io.constellationnetwork" %% s"tessellation-$artifact" % V.tessellation def decline(artifact: String = ""): ModuleID = "com.monovore" %% {