From 57ff0d1e4d99ddd796d29ed665e90f602e15d5f5 Mon Sep 17 00:00:00 2001 From: stanislavlyalin Date: Wed, 7 Jun 2023 19:05:27 +0300 Subject: [PATCH] Refactoring: removed env implicits --- .../rchain/casper/MultiParentCasper.scala | 6 +- .../casper/protocol/client/ListenAtName.scala | 2 +- .../casper/rholang/InterpreterUtil.scala | 7 +- .../casper/genesis/contracts/TestUtil.scala | 7 +- .../coop/rchain/casper/helper/RhoSpec.scala | 3 +- .../rchain/node/api/ReplGrpcService.scala | 2 +- .../rholang/build/CompiledRholangSource.scala | 2 +- .../rholang/interpreter/Interpreter.scala | 2 +- .../rholang/interpreter/RholangCLI.scala | 2 +- .../interpreter/compiler/Compiler.scala | 25 +- .../interpreter/compiler/normalize.scala | 262 +++++++++--------- .../CollectionNormalizeMatcher.scala | 5 +- .../normalizer/NameNormalizeMatcher.scala | 6 +- .../processes/PBundleNormalizer.scala | 6 +- .../processes/PCollectNormalizer.scala | 5 +- .../processes/PConjunctionNormalizer.scala | 6 +- .../processes/PContrNormalizer.scala | 4 +- .../processes/PDisjunctionNormalizer.scala | 6 +- .../processes/PEvalNormalizer.scala | 5 +- .../normalizer/processes/PIfNormalizer.scala | 4 +- .../processes/PInputNormalizer.scala | 6 +- .../normalizer/processes/PLetNormalizer.scala | 4 +- .../processes/PMatchNormalizer.scala | 6 +- .../processes/PMatchesNormalizer.scala | 6 +- .../processes/PMethodNormalizer.scala | 4 +- .../processes/PNegationNormalizer.scala | 6 +- .../normalizer/processes/PNewNormalizer.scala | 5 +- .../normalizer/processes/PParNormalizer.scala | 5 +- .../processes/PSendNormalizer.scala | 4 +- .../processes/PSendSynchNormalizer.scala | 5 +- .../rholang/interpreter/ParBuilderUtil.scala | 2 +- 31 files changed, 181 insertions(+), 239 deletions(-) diff --git a/casper/src/main/scala/coop/rchain/casper/MultiParentCasper.scala b/casper/src/main/scala/coop/rchain/casper/MultiParentCasper.scala index 1c9647d37c0..33d3133a582 100644 --- a/casper/src/main/scala/coop/rchain/casper/MultiParentCasper.scala +++ b/casper/src/main/scala/coop/rchain/casper/MultiParentCasper.scala @@ -279,14 +279,12 @@ object MultiParentCasper { def deploy[F[_]: Sync: BlockDagStorage: Log]( d: Signed[DeployData] - ): F[Either[ParsingError, DeployId]] = { - import coop.rchain.models.rholang.implicits._ + ): F[Either[ParsingError, DeployId]] = InterpreterUtil - .mkTerm(d.data.term, NormalizerEnv(d)) + .mkTerm(d.data.term) .flatMap(_ => addDeploy(d)) .attempt .map(_.leftMap(err => parsingError(s"Error in parsing term: \n$err"))) - } private def addDeploy[F[_]: Sync: BlockDagStorage: Log](deploy: Signed[DeployData]): F[DeployId] = for { diff --git a/casper/src/main/scala/coop/rchain/casper/protocol/client/ListenAtName.scala b/casper/src/main/scala/coop/rchain/casper/protocol/client/ListenAtName.scala index c9aecce576a..c8d130f36a1 100644 --- a/casper/src/main/scala/coop/rchain/casper/protocol/client/ListenAtName.scala +++ b/casper/src/main/scala/coop/rchain/casper/protocol/client/ListenAtName.scala @@ -36,7 +36,7 @@ object ListenAtName { private def buildParId[F[_]: Sync](name: Name): F[Par] = name match { case PubName(content) => - InterpreterUtil.mkTerm(content, NormalizerEnv.Empty) + InterpreterUtil.mkTerm(content) case PrivName(content) => Sync[F].delay { RhoName(content.getBytes) diff --git a/casper/src/main/scala/coop/rchain/casper/rholang/InterpreterUtil.scala b/casper/src/main/scala/coop/rchain/casper/rholang/InterpreterUtil.scala index 4714cb1e5dd..ad9828b1f77 100644 --- a/casper/src/main/scala/coop/rchain/casper/rholang/InterpreterUtil.scala +++ b/casper/src/main/scala/coop/rchain/casper/rholang/InterpreterUtil.scala @@ -21,10 +21,9 @@ import coop.rchain.crypto.hash.Blake2b512Random import coop.rchain.crypto.signatures.Signed import coop.rchain.metrics.{Metrics, Span} import coop.rchain.models.BlockHash.BlockHash -import coop.rchain.models.NormalizerEnv.ToEnvMap import coop.rchain.models.Validator.Validator import coop.rchain.models.syntax._ -import coop.rchain.models.{BlockMetadata, NormalizerEnv, Par} +import coop.rchain.models.{BlockMetadata, Par} import coop.rchain.rholang.interpreter.SystemProcesses.BlockData import coop.rchain.rholang.interpreter.compiler.Compiler import coop.rchain.rholang.interpreter.errors.InterpreterError @@ -44,9 +43,7 @@ object InterpreterUtil { private[this] val ReplayBlockMetricsSource = Metrics.Source(CasperMetricsSource, "replay-block") - def mkTerm[F[_]: Sync, Env](rho: String, normalizerEnv: NormalizerEnv[Env])( - implicit ev: ToEnvMap[Env] - ): F[Par] = Compiler[F].sourceToADT(rho, normalizerEnv.toEnv) + def mkTerm[F[_]: Sync, Env](rho: String): F[Par] = Compiler[F].sourceToADT(rho) // TODO: most of this function is legacy code, it should be refactored with separation of errors that are // handled (with included data e.g. hash not equal) and fatal errors which should NOT be handled diff --git a/casper/src/test/scala/coop/rchain/casper/genesis/contracts/TestUtil.scala b/casper/src/test/scala/coop/rchain/casper/genesis/contracts/TestUtil.scala index 429bbba9eac..3bce643a97b 100644 --- a/casper/src/test/scala/coop/rchain/casper/genesis/contracts/TestUtil.scala +++ b/casper/src/test/scala/coop/rchain/casper/genesis/contracts/TestUtil.scala @@ -14,14 +14,13 @@ object TestUtil { def eval[F[_]: Sync, Env]( source: CompiledRholangSource[Env], runtime: RhoRuntime[F] - )(implicit rand: Blake2b512Random): F[Unit] = eval(source.code, runtime, source.env) + )(implicit rand: Blake2b512Random): F[Unit] = eval(source.code, runtime) def eval[F[_]: Sync]( code: String, - runtime: RhoRuntime[F], - normalizerEnv: Map[String, Par] + runtime: RhoRuntime[F] )(implicit rand: Blake2b512Random): F[Unit] = - Compiler[F].sourceToADT(code, normalizerEnv) >>= (evalTerm(_, runtime)) + Compiler[F].sourceToADT(code) >>= (evalTerm(_, runtime)) private def evalTerm[F[_]: FlatMap]( term: Par, diff --git a/casper/src/test/scala/coop/rchain/casper/helper/RhoSpec.scala b/casper/src/test/scala/coop/rchain/casper/helper/RhoSpec.scala index 10e7bbc164d..cf76bd280fd 100644 --- a/casper/src/test/scala/coop/rchain/casper/helper/RhoSpec.scala +++ b/casper/src/test/scala/coop/rchain/casper/helper/RhoSpec.scala @@ -182,9 +182,8 @@ class RhoSpec( deploy: Signed[DeployData], runtime: RhoRuntime[F] ): F[Unit] = { - import coop.rchain.models.rholang.implicits._ val rand = Tools.unforgeableNameRng(deploy.pk, deploy.data.timestamp) - eval(deploy.data.term, runtime, NormalizerEnv(deploy).toEnv)(Sync[F], rand) + eval(deploy.data.term, runtime)(Sync[F], rand) } private val rhoSpecDeploy: Signed[DeployData] = { diff --git a/node/src/main/scala/coop/rchain/node/api/ReplGrpcService.scala b/node/src/main/scala/coop/rchain/node/api/ReplGrpcService.scala index a4e555713b9..dcb24212aa2 100644 --- a/node/src/main/scala/coop/rchain/node/api/ReplGrpcService.scala +++ b/node/src/main/scala/coop/rchain/node/api/ReplGrpcService.scala @@ -20,7 +20,7 @@ object ReplGrpcService { Sync[F] .attempt( Compiler[F] - .sourceToADT(source, Map.empty[String, Par]) + .sourceToADT(source) ) .flatMap { case Left(er) => diff --git a/rholang/src/main/scala/coop/rchain/rholang/build/CompiledRholangSource.scala b/rholang/src/main/scala/coop/rchain/rholang/build/CompiledRholangSource.scala index 2d843e68e31..bb72141b893 100644 --- a/rholang/src/main/scala/coop/rchain/rholang/build/CompiledRholangSource.scala +++ b/rholang/src/main/scala/coop/rchain/rholang/build/CompiledRholangSource.scala @@ -14,7 +14,7 @@ abstract class CompiledRholangSource[Env](val code: String, val normalizerEnv: N val path: String import coop.rchain.catscontrib.effect.implicits.sEval - val term: Par = Compiler[Eval].sourceToADT(code, normalizerEnv.toEnv).value + val term: Par = Compiler[Eval].sourceToADT(code).value final def env = normalizerEnv.toEnv } diff --git a/rholang/src/main/scala/coop/rchain/rholang/interpreter/Interpreter.scala b/rholang/src/main/scala/coop/rchain/rholang/interpreter/Interpreter.scala index 0375e84744f..42e4660d8c7 100644 --- a/rholang/src/main/scala/coop/rchain/rholang/interpreter/Interpreter.scala +++ b/rholang/src/main/scala/coop/rchain/rholang/interpreter/Interpreter.scala @@ -56,7 +56,7 @@ class InterpreterImpl[F[_]: Sync: Span](implicit C: _cost[F], mergeChs: Ref[F, S _ <- Span[F].traceI("charge-parsing-cost") { charge[F](parsingCost) } parsed <- Span[F].traceI("build-normalized-term") { Compiler[F] - .sourceToADT(term, normalizerEnv) + .sourceToADT(term) .handleErrorWith { case err: InterpreterError => ParserError(err).raiseError[F, Par] } diff --git a/rholang/src/main/scala/coop/rchain/rholang/interpreter/RholangCLI.scala b/rholang/src/main/scala/coop/rchain/rholang/interpreter/RholangCLI.scala index 7c4c8a7bf18..3d90024a447 100644 --- a/rholang/src/main/scala/coop/rchain/rholang/interpreter/RholangCLI.scala +++ b/rholang/src/main/scala/coop/rchain/rholang/interpreter/RholangCLI.scala @@ -205,7 +205,7 @@ object RholangCLI { import coop.rchain.catscontrib.effect.implicits.sEval Compiler[Eval] - .sourceToADT(source, Map.empty[String, Par]) + .sourceToADT(source) .attempt .value .toTry diff --git a/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/Compiler.scala b/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/Compiler.scala index 18ae07b665e..f3b6327dcc9 100644 --- a/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/Compiler.scala +++ b/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/Compiler.scala @@ -15,20 +15,11 @@ import java.io.{Reader, StringReader} trait Compiler[F[_]] { def sourceToADT(source: String): F[Par] = - sourceToADT(source, Map.empty[String, Par]) + sourceToADT(new StringReader(source)) - def sourceToADT(source: String, normalizerEnv: Map[String, Par]): F[Par] = - sourceToADT(new StringReader(source), normalizerEnv) + def sourceToADT(reader: Reader): F[Par] - def sourceToADT(reader: Reader): F[Par] = - sourceToADT(reader, Map.empty[String, Par]) - - def sourceToADT(reader: Reader, normalizerEnv: Map[String, Par]): F[Par] - - def astToADT(proc: Proc): F[Par] = - astToADT(proc, Map.empty[String, Par]) - - def astToADT(proc: Proc, normalizerEnv: Map[String, Par]): F[Par] + def astToADT(proc: Proc): F[Par] def sourceToAST(source: String): F[Proc] = sourceToAST(new StringReader(source)) @@ -43,15 +34,15 @@ object Compiler { implicit def parBuilder[F[_]](implicit F: Sync[F]): Compiler[F] = new Compiler[F] { - def sourceToADT(reader: Reader, normalizerEnv: Map[String, Par]): F[Par] = + def sourceToADT(reader: Reader): F[Par] = for { proc <- sourceToAST(reader) - par <- astToADT(proc, normalizerEnv) + par <- astToADT(proc) } yield par - def astToADT(proc: Proc, normalizerEnv: Map[String, Par]): F[Par] = + def astToADT(proc: Proc): F[Par] = for { - par <- normalizeTerm(proc)(normalizerEnv) + par <- normalizeTerm(proc) sortedPar <- Sortable[Par].sortMatch(par) } yield sortedPar.term @@ -75,7 +66,7 @@ object Compiler { } } yield proc - private def normalizeTerm(term: Proc)(implicit normalizerEnv: Map[String, Par]): F[Par] = + private def normalizeTerm(term: Proc): F[Par] = ProcNormalizeMatcher .normalizeMatch[F]( term, diff --git a/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalize.scala b/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalize.scala index 3643d797e79..706407739a5 100644 --- a/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalize.scala +++ b/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalize.scala @@ -17,143 +17,143 @@ object ProcNormalizeMatcher { /** * Rholang normalizer entry point */ - def normalizeMatch[F[_]: Sync](p: Proc, input: ProcVisitInputs)( - implicit env: Map[String, Par] - ): F[ProcVisitOutputs] = Sync[F].defer { - def unaryExp[T](subProc: Proc, input: ProcVisitInputs, constructor: Par => T)( - implicit toExprInstance: T => Expr - ): F[ProcVisitOutputs] = - normalizeMatch[F](subProc, input.copy(par = VectorPar())) - .map( - subResult => - ProcVisitOutputs( - input.par.prepend(constructor(subResult.par), input.boundMapChain.depth), - subResult.freeMap - ) + def normalizeMatch[F[_]: Sync](p: Proc, input: ProcVisitInputs): F[ProcVisitOutputs] = + Sync[F].defer { + def unaryExp[T](subProc: Proc, input: ProcVisitInputs, constructor: Par => T)( + implicit toExprInstance: T => Expr + ): F[ProcVisitOutputs] = + normalizeMatch[F](subProc, input.copy(par = VectorPar())) + .map( + subResult => + ProcVisitOutputs( + input.par.prepend(constructor(subResult.par), input.boundMapChain.depth), + subResult.freeMap + ) + ) + + def binaryExp[T]( + subProcLeft: Proc, + subProcRight: Proc, + input: ProcVisitInputs, + constructor: (Par, Par) => T + )(implicit toExprInstance: T => Expr): F[ProcVisitOutputs] = + for { + leftResult <- normalizeMatch[F](subProcLeft, input.copy(par = VectorPar())) + rightResult <- normalizeMatch[F]( + subProcRight, + input.copy(par = VectorPar(), freeMap = leftResult.freeMap) + ) + } yield ProcVisitOutputs( + input.par + .prepend(constructor(leftResult.par, rightResult.par), input.boundMapChain.depth), + rightResult.freeMap ) - def binaryExp[T]( - subProcLeft: Proc, - subProcRight: Proc, - input: ProcVisitInputs, - constructor: (Par, Par) => T - )(implicit toExprInstance: T => Expr): F[ProcVisitOutputs] = - for { - leftResult <- normalizeMatch[F](subProcLeft, input.copy(par = VectorPar())) - rightResult <- normalizeMatch[F]( - subProcRight, - input.copy(par = VectorPar(), freeMap = leftResult.freeMap) - ) - } yield ProcVisitOutputs( - input.par.prepend(constructor(leftResult.par, rightResult.par), input.boundMapChain.depth), - rightResult.freeMap - ) + p match { + case p: PNegation => + PNegationNormalizer.normalize(p, input) - p match { - case p: PNegation => - PNegationNormalizer.normalize(p, input) - - case p: PConjunction => - PConjunctionNormalizer.normalize(p, input) - - case p: PDisjunction => - PDisjunctionNormalizer.normalize(p, input) - - case p: PSimpleType => - PSimpleTypeNormalizer.normalize(p, input) - - case p: PGround => - PGroundNormalizer.normalize(p, input) - - case p: PCollect => - PCollectNormalizer.normalize(p, input) - - case p: PVar => - PVarNormalizer.normalize(p, input) - - case p: PVarRef => - PVarRefNormalizer.normalize(p, input) - - case _: PNil => ProcVisitOutputs(input.par, input.freeMap).pure[F] - - case p: PEval => - PEvalNormalizer.normalize(p, input) - - case p: PMethod => - PMethodNormalizer.normalize(p, input) - - case p: PNot => unaryExp(p.proc_, input, ENot.apply) - case p: PNeg => unaryExp(p.proc_, input, ENeg.apply) - - case p: PMult => binaryExp(p.proc_1, p.proc_2, input, EMult.apply) - case p: PDiv => binaryExp(p.proc_1, p.proc_2, input, EDiv.apply) - case p: PMod => binaryExp(p.proc_1, p.proc_2, input, EMod.apply) - case p: PPercentPercent => binaryExp(p.proc_1, p.proc_2, input, EPercentPercent.apply) - case p: PAdd => binaryExp(p.proc_1, p.proc_2, input, EPlus.apply) - case p: PMinus => binaryExp(p.proc_1, p.proc_2, input, EMinus.apply) - case p: PPlusPlus => binaryExp(p.proc_1, p.proc_2, input, EPlusPlus.apply) - case p: PMinusMinus => binaryExp(p.proc_1, p.proc_2, input, EMinusMinus.apply) - - case p: PLt => binaryExp(p.proc_1, p.proc_2, input, ELt.apply) - case p: PLte => binaryExp(p.proc_1, p.proc_2, input, ELte.apply) - case p: PGt => binaryExp(p.proc_1, p.proc_2, input, EGt.apply) - case p: PGte => binaryExp(p.proc_1, p.proc_2, input, EGte.apply) - - case p: PEq => binaryExp(p.proc_1, p.proc_2, input, EEq.apply) - case p: PNeq => binaryExp(p.proc_1, p.proc_2, input, ENeq.apply) - - case p: PAnd => binaryExp(p.proc_1, p.proc_2, input, EAnd.apply) - case p: POr => binaryExp(p.proc_1, p.proc_2, input, EOr.apply) - case p: PShortAnd => binaryExp(p.proc_1, p.proc_2, input, EShortAnd.apply) - case p: PShortOr => binaryExp(p.proc_1, p.proc_2, input, EShortOr.apply) - case p: PMatches => - PMatchesNormalizer.normalize(p, input) - - case p: PExprs => - normalizeMatch[F](p.proc_, input) - - case p: PSend => - PSendNormalizer.normalize(p, input) - - case p: PSendSynch => - PSendSynchNormalizer.normalize(p, input) - - case p: PContr => - PContrNormalizer.normalize(p, input) - - case p: PInput => - PInputNormalizer.normalize(p, input) - - case p: PPar => - PParNormalizer.normalize(p, input) - - case p: PNew => - PNewNormalizer.normalize(p, input) - - case b: PBundle => - PBundleNormalizer.normalize(b, input) - - case p: PLet => - PLetNormalizer.normalize(p, input) - - case p: PMatch => - PMatchNormalizer.normalize(p, input) + case p: PConjunction => + PConjunctionNormalizer.normalize(p, input) - case p: PIf => - PIfNormalizer - .normalize(p.proc_1, p.proc_2, new PNil(), input.copy(par = VectorPar())) - .map(n => n.copy(par = n.par ++ input.par)) - case p: PIfElse => - PIfNormalizer - .normalize(p.proc_1, p.proc_2, p.proc_3, input.copy(par = VectorPar())) - .map(n => n.copy(par = n.par ++ input.par)) + case p: PDisjunction => + PDisjunctionNormalizer.normalize(p, input) - case _ => - Sync[F].raiseError( - UnrecognizedNormalizerError("Compilation of construct not yet supported.") - ) + case p: PSimpleType => + PSimpleTypeNormalizer.normalize(p, input) + + case p: PGround => + PGroundNormalizer.normalize(p, input) + + case p: PCollect => + PCollectNormalizer.normalize(p, input) + + case p: PVar => + PVarNormalizer.normalize(p, input) + + case p: PVarRef => + PVarRefNormalizer.normalize(p, input) + + case _: PNil => ProcVisitOutputs(input.par, input.freeMap).pure[F] + + case p: PEval => + PEvalNormalizer.normalize(p, input) + + case p: PMethod => + PMethodNormalizer.normalize(p, input) + + case p: PNot => unaryExp(p.proc_, input, ENot.apply) + case p: PNeg => unaryExp(p.proc_, input, ENeg.apply) + + case p: PMult => binaryExp(p.proc_1, p.proc_2, input, EMult.apply) + case p: PDiv => binaryExp(p.proc_1, p.proc_2, input, EDiv.apply) + case p: PMod => binaryExp(p.proc_1, p.proc_2, input, EMod.apply) + case p: PPercentPercent => binaryExp(p.proc_1, p.proc_2, input, EPercentPercent.apply) + case p: PAdd => binaryExp(p.proc_1, p.proc_2, input, EPlus.apply) + case p: PMinus => binaryExp(p.proc_1, p.proc_2, input, EMinus.apply) + case p: PPlusPlus => binaryExp(p.proc_1, p.proc_2, input, EPlusPlus.apply) + case p: PMinusMinus => binaryExp(p.proc_1, p.proc_2, input, EMinusMinus.apply) + + case p: PLt => binaryExp(p.proc_1, p.proc_2, input, ELt.apply) + case p: PLte => binaryExp(p.proc_1, p.proc_2, input, ELte.apply) + case p: PGt => binaryExp(p.proc_1, p.proc_2, input, EGt.apply) + case p: PGte => binaryExp(p.proc_1, p.proc_2, input, EGte.apply) + + case p: PEq => binaryExp(p.proc_1, p.proc_2, input, EEq.apply) + case p: PNeq => binaryExp(p.proc_1, p.proc_2, input, ENeq.apply) + + case p: PAnd => binaryExp(p.proc_1, p.proc_2, input, EAnd.apply) + case p: POr => binaryExp(p.proc_1, p.proc_2, input, EOr.apply) + case p: PShortAnd => binaryExp(p.proc_1, p.proc_2, input, EShortAnd.apply) + case p: PShortOr => binaryExp(p.proc_1, p.proc_2, input, EShortOr.apply) + case p: PMatches => + PMatchesNormalizer.normalize(p, input) + + case p: PExprs => + normalizeMatch[F](p.proc_, input) + + case p: PSend => + PSendNormalizer.normalize(p, input) + + case p: PSendSynch => + PSendSynchNormalizer.normalize(p, input) + + case p: PContr => + PContrNormalizer.normalize(p, input) + + case p: PInput => + PInputNormalizer.normalize(p, input) + + case p: PPar => + PParNormalizer.normalize(p, input) + + case p: PNew => + PNewNormalizer.normalize(p, input) + + case b: PBundle => + PBundleNormalizer.normalize(b, input) + + case p: PLet => + PLetNormalizer.normalize(p, input) + + case p: PMatch => + PMatchNormalizer.normalize(p, input) + + case p: PIf => + PIfNormalizer + .normalize(p.proc_1, p.proc_2, new PNil(), input.copy(par = VectorPar())) + .map(n => n.copy(par = n.par ++ input.par)) + case p: PIfElse => + PIfNormalizer + .normalize(p.proc_1, p.proc_2, p.proc_3, input.copy(par = VectorPar())) + .map(n => n.copy(par = n.par ++ input.par)) + + case _ => + Sync[F].raiseError( + UnrecognizedNormalizerError("Compilation of construct not yet supported.") + ) + } } - } } diff --git a/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/CollectionNormalizeMatcher.scala b/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/CollectionNormalizeMatcher.scala index 5dd54944bfd..6752403f622 100644 --- a/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/CollectionNormalizeMatcher.scala +++ b/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/CollectionNormalizeMatcher.scala @@ -22,8 +22,9 @@ import scala.jdk.CollectionConverters._ import scala.collection.immutable.{BitSet, Vector} object CollectionNormalizeMatcher { - def normalizeMatch[F[_]: Sync](c: Collection, input: CollectVisitInputs)( - implicit env: Map[String, Par] + def normalizeMatch[F[_]: Sync]( + c: Collection, + input: CollectVisitInputs ): F[CollectVisitOutputs] = { def foldMatch[T]( knownFree: FreeMap[VarSort], diff --git a/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/NameNormalizeMatcher.scala b/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/NameNormalizeMatcher.scala index 8825ab5ff34..9d285a0365e 100644 --- a/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/NameNormalizeMatcher.scala +++ b/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/NameNormalizeMatcher.scala @@ -4,7 +4,7 @@ import cats.effect.Sync import cats.syntax.all._ import coop.rchain.models.Var.VarInstance.{BoundVar, FreeVar, Wildcard} import coop.rchain.models.rholang.implicits.{VectorPar, _} -import coop.rchain.models.{EVar, Par, Var} +import coop.rchain.models.{EVar, Var} import coop.rchain.rholang.ast.rholang_mercury.Absyn.{Name, NameQuote, NameVar, NameWildcard} import coop.rchain.rholang.interpreter.compiler.{ BoundContext, @@ -23,9 +23,7 @@ import coop.rchain.rholang.interpreter.errors.{ } object NameNormalizeMatcher { - def normalizeMatch[F[_]: Sync](n: Name, input: NameVisitInputs)( - implicit env: Map[String, Par] - ): F[NameVisitOutputs] = + def normalizeMatch[F[_]: Sync](n: Name, input: NameVisitInputs): F[NameVisitOutputs] = n match { case wc: NameWildcard => val wildcardBindResult = diff --git a/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PBundleNormalizer.scala b/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PBundleNormalizer.scala index 2d37b637dd5..343375961f8 100644 --- a/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PBundleNormalizer.scala +++ b/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PBundleNormalizer.scala @@ -2,7 +2,7 @@ package coop.rchain.rholang.interpreter.compiler.normalizer.processes import cats.syntax.all._ import cats.effect.Sync -import coop.rchain.models.{BundleOps, Par} +import coop.rchain.models.BundleOps import coop.rchain.models.rholang.implicits._ import coop.rchain.rholang.interpreter.compiler.ProcNormalizeMatcher.normalizeMatch import coop.rchain.rholang.interpreter.compiler.{ @@ -22,9 +22,7 @@ import coop.rchain.rholang.ast.rholang_mercury.Absyn.{ import coop.rchain.models.Bundle object PBundleNormalizer { - def normalize[F[_]: Sync](b: PBundle, input: ProcVisitInputs)( - implicit env: Map[String, Par] - ): F[ProcVisitOutputs] = { + def normalize[F[_]: Sync](b: PBundle, input: ProcVisitInputs): F[ProcVisitOutputs] = { def error(targetResult: ProcVisitOutputs): F[ProcVisitOutputs] = { val errMsg = { def at(variable: String, sourcePosition: SourcePosition): String = diff --git a/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PCollectNormalizer.scala b/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PCollectNormalizer.scala index 62f87d4f0d9..5aa5d2420d2 100644 --- a/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PCollectNormalizer.scala +++ b/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PCollectNormalizer.scala @@ -2,7 +2,6 @@ package coop.rchain.rholang.interpreter.compiler.normalizer.processes import cats.syntax.all._ import cats.effect.Sync -import coop.rchain.models.Par import coop.rchain.models.rholang.implicits._ import coop.rchain.rholang.interpreter.compiler.{ CollectVisitInputs, @@ -13,9 +12,7 @@ import coop.rchain.rholang.ast.rholang_mercury.Absyn.PCollect import coop.rchain.rholang.interpreter.compiler.normalizer.CollectionNormalizeMatcher object PCollectNormalizer { - def normalize[F[_]: Sync](p: PCollect, input: ProcVisitInputs)( - implicit env: Map[String, Par] - ): F[ProcVisitOutputs] = + def normalize[F[_]: Sync](p: PCollect, input: ProcVisitInputs): F[ProcVisitOutputs] = CollectionNormalizeMatcher .normalizeMatch[F](p.collection_, CollectVisitInputs(input.boundMapChain, input.freeMap)) .map( diff --git a/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PConjunctionNormalizer.scala b/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PConjunctionNormalizer.scala index 18646d8300f..eb508defb71 100644 --- a/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PConjunctionNormalizer.scala +++ b/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PConjunctionNormalizer.scala @@ -3,7 +3,7 @@ package coop.rchain.rholang.interpreter.compiler.normalizer.processes import cats.syntax.all._ import cats.effect.Sync import coop.rchain.models.Connective.ConnectiveInstance.ConnAndBody -import coop.rchain.models.{Connective, ConnectiveBody, Par} +import coop.rchain.models.{Connective, ConnectiveBody} import coop.rchain.models.rholang.implicits._ import coop.rchain.rholang.interpreter.compiler.ProcNormalizeMatcher.normalizeMatch import coop.rchain.rholang.interpreter.compiler.{ProcVisitInputs, ProcVisitOutputs, SourcePosition} @@ -12,9 +12,7 @@ import coop.rchain.rholang.ast.rholang_mercury.Absyn.PConjunction import scala.collection.immutable.Vector object PConjunctionNormalizer { - def normalize[F[_]: Sync](p: PConjunction, input: ProcVisitInputs)( - implicit env: Map[String, Par] - ): F[ProcVisitOutputs] = + def normalize[F[_]: Sync](p: PConjunction, input: ProcVisitInputs): F[ProcVisitOutputs] = for { leftResult <- normalizeMatch[F]( p.proc_1, diff --git a/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PContrNormalizer.scala b/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PContrNormalizer.scala index aa25e141b06..3ad50f95ce0 100644 --- a/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PContrNormalizer.scala +++ b/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PContrNormalizer.scala @@ -23,9 +23,7 @@ import scala.jdk.CollectionConverters._ import scala.collection.immutable.{BitSet, Vector} object PContrNormalizer { - def normalize[F[_]: Sync](p: PContr, input: ProcVisitInputs)( - implicit env: Map[String, Par] - ): F[ProcVisitOutputs] = + def normalize[F[_]: Sync](p: PContr, input: ProcVisitInputs): F[ProcVisitOutputs] = // A free variable can only be used once in any of the parameters. // And we start with the empty free variable map because these free // variables aren't free in the surrounding context: they're binders diff --git a/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PDisjunctionNormalizer.scala b/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PDisjunctionNormalizer.scala index ed55187ac4f..0ea3bb84f6a 100644 --- a/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PDisjunctionNormalizer.scala +++ b/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PDisjunctionNormalizer.scala @@ -3,7 +3,7 @@ package coop.rchain.rholang.interpreter.compiler.normalizer.processes import cats.syntax.all._ import cats.effect.Sync import coop.rchain.models.Connective.ConnectiveInstance.ConnOrBody -import coop.rchain.models.{Connective, ConnectiveBody, Par} +import coop.rchain.models.{Connective, ConnectiveBody} import coop.rchain.models.rholang.implicits._ import coop.rchain.rholang.interpreter.compiler.ProcNormalizeMatcher.normalizeMatch import coop.rchain.rholang.interpreter.compiler.{ @@ -17,9 +17,7 @@ import coop.rchain.rholang.ast.rholang_mercury.Absyn.PDisjunction import scala.collection.immutable.Vector object PDisjunctionNormalizer { - def normalize[F[_]: Sync](p: PDisjunction, input: ProcVisitInputs)( - implicit env: Map[String, Par] - ): F[ProcVisitOutputs] = + def normalize[F[_]: Sync](p: PDisjunction, input: ProcVisitInputs): F[ProcVisitOutputs] = for { leftResult <- normalizeMatch[F]( p.proc_1, diff --git a/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PEvalNormalizer.scala b/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PEvalNormalizer.scala index 2a0f06b9181..6bbc53d50d0 100644 --- a/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PEvalNormalizer.scala +++ b/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PEvalNormalizer.scala @@ -2,16 +2,13 @@ package coop.rchain.rholang.interpreter.compiler.normalizer.processes import cats.syntax.all._ import cats.effect.Sync -import coop.rchain.models.Par import coop.rchain.models.rholang.implicits._ import coop.rchain.rholang.interpreter.compiler.{NameVisitInputs, ProcVisitInputs, ProcVisitOutputs} import coop.rchain.rholang.ast.rholang_mercury.Absyn.PEval import coop.rchain.rholang.interpreter.compiler.normalizer.NameNormalizeMatcher object PEvalNormalizer { - def normalize[F[_]: Sync](p: PEval, input: ProcVisitInputs)( - implicit env: Map[String, Par] - ): F[ProcVisitOutputs] = + def normalize[F[_]: Sync](p: PEval, input: ProcVisitInputs): F[ProcVisitOutputs] = NameNormalizeMatcher .normalizeMatch[F](p.name_, NameVisitInputs(input.boundMapChain, input.freeMap)) .map( diff --git a/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PIfNormalizer.scala b/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PIfNormalizer.scala index 559039d82e8..f7c8c90f26b 100644 --- a/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PIfNormalizer.scala +++ b/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PIfNormalizer.scala @@ -3,7 +3,7 @@ package coop.rchain.rholang.interpreter.compiler.normalizer.processes import cats.syntax.all._ import cats.effect.Sync import coop.rchain.models.Expr.ExprInstance.GBool -import coop.rchain.models.{Match, MatchCase, Par} +import coop.rchain.models.{Match, MatchCase} import coop.rchain.models.rholang.implicits._ import coop.rchain.rholang.interpreter.compiler.ProcNormalizeMatcher.normalizeMatch import coop.rchain.rholang.interpreter.compiler.{ProcVisitInputs, ProcVisitOutputs} @@ -17,8 +17,6 @@ object PIfNormalizer { trueBodyProc: Proc, falseBodyProc: Proc, input: ProcVisitInputs - )( - implicit env: Map[String, Par] ): F[ProcVisitOutputs] = for { targetResult <- normalizeMatch[F](valueProc, input) diff --git a/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PInputNormalizer.scala b/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PInputNormalizer.scala index fbba1d56585..4bda6edbae6 100644 --- a/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PInputNormalizer.scala +++ b/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PInputNormalizer.scala @@ -6,7 +6,6 @@ import coop.rchain.models.{Par, Receive, Var} import coop.rchain.models.rholang.implicits._ import coop.rchain.rholang.interpreter.compiler.ProcNormalizeMatcher.normalizeMatch import coop.rchain.rholang.interpreter.compiler.{ - FreeContext, FreeMap, NameVisitInputs, NameVisitOutputs, @@ -16,7 +15,6 @@ import coop.rchain.rholang.interpreter.compiler.{ VarSort } import coop.rchain.rholang.interpreter.errors.{ - NormalizerError, ReceiveOnSameChannelsError, UnexpectedReuseOfNameContextFree } @@ -33,9 +31,7 @@ import java.util.UUID object PInputNormalizer { @SuppressWarnings(Array("org.wartremover.warts.NonUnitStatements")) - def normalize[F[_]: Sync](p: PInput, input: ProcVisitInputs)( - implicit env: Map[String, Par] - ): F[ProcVisitOutputs] = { + def normalize[F[_]: Sync](p: PInput, input: ProcVisitInputs): F[ProcVisitOutputs] = { if (p.listreceipt_.size() > 1) { normalizeMatch[F]( p.listreceipt_.asScala.reverse.foldLeft(p.proc_) { (proc, receipt) => diff --git a/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PLetNormalizer.scala b/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PLetNormalizer.scala index 2743afc98d5..c21c954321c 100644 --- a/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PLetNormalizer.scala +++ b/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PLetNormalizer.scala @@ -26,9 +26,7 @@ import scala.jdk.CollectionConverters._ object PLetNormalizer { @SuppressWarnings(Array("org.wartremover.warts.NonUnitStatements")) - def normalize[F[_]: Sync](p: PLet, input: ProcVisitInputs)( - implicit env: Map[String, Par] - ): F[ProcVisitOutputs] = + def normalize[F[_]: Sync](p: PLet, input: ProcVisitInputs): F[ProcVisitOutputs] = p.decls_ match { case concDeclsImpl: ConcDeclsImpl => diff --git a/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PMatchNormalizer.scala b/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PMatchNormalizer.scala index dc7a36fd1c9..bf1105e9686 100644 --- a/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PMatchNormalizer.scala +++ b/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PMatchNormalizer.scala @@ -3,7 +3,7 @@ package coop.rchain.rholang.interpreter.compiler.normalizer.processes import cats.Applicative import cats.syntax.all._ import cats.effect.Sync -import coop.rchain.models.{Match, MatchCase, Par} +import coop.rchain.models.{Match, MatchCase} import coop.rchain.models.rholang.implicits._ import coop.rchain.rholang.interpreter.compiler.ProcNormalizeMatcher.normalizeMatch import coop.rchain.rholang.interpreter.compiler.{FreeMap, ProcVisitInputs, ProcVisitOutputs} @@ -14,9 +14,7 @@ import scala.collection.immutable.{BitSet, Vector} import scala.jdk.CollectionConverters._ object PMatchNormalizer { - def normalize[F[_]: Sync](p: PMatch, input: ProcVisitInputs)( - implicit env: Map[String, Par] - ): F[ProcVisitOutputs] = { + def normalize[F[_]: Sync](p: PMatch, input: ProcVisitInputs): F[ProcVisitOutputs] = { def liftCase(c: Case): F[(Proc, Proc)] = c match { case ci: CaseImpl => Applicative[F].pure[(Proc, Proc)]((ci.proc_1, ci.proc_2)) diff --git a/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PMatchesNormalizer.scala b/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PMatchesNormalizer.scala index 87e12fb3f45..a072d72f66c 100644 --- a/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PMatchesNormalizer.scala +++ b/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PMatchesNormalizer.scala @@ -2,16 +2,14 @@ package coop.rchain.rholang.interpreter.compiler.normalizer.processes import cats.syntax.all._ import cats.effect.Sync -import coop.rchain.models.{EMatches, Par} +import coop.rchain.models.EMatches import coop.rchain.models.rholang.implicits._ import coop.rchain.rholang.interpreter.compiler.ProcNormalizeMatcher.normalizeMatch import coop.rchain.rholang.interpreter.compiler.{FreeMap, ProcVisitInputs, ProcVisitOutputs} import coop.rchain.rholang.ast.rholang_mercury.Absyn.PMatches object PMatchesNormalizer { - def normalize[F[_]: Sync](p: PMatches, input: ProcVisitInputs)( - implicit env: Map[String, Par] - ): F[ProcVisitOutputs] = + def normalize[F[_]: Sync](p: PMatches, input: ProcVisitInputs): F[ProcVisitOutputs] = // In case of 'matches' expression the free variables from the pattern are thrown away // and only the ones from the target are used. // This is because the "target matches pattern" should have the same semantics as diff --git a/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PMethodNormalizer.scala b/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PMethodNormalizer.scala index 4a064b156ba..7f88e65ad04 100644 --- a/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PMethodNormalizer.scala +++ b/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PMethodNormalizer.scala @@ -12,9 +12,7 @@ import scala.jdk.CollectionConverters._ import scala.collection.immutable.BitSet object PMethodNormalizer { - def normalize[F[_]: Sync](p: PMethod, input: ProcVisitInputs)( - implicit env: Map[String, Par] - ): F[ProcVisitOutputs] = + def normalize[F[_]: Sync](p: PMethod, input: ProcVisitInputs): F[ProcVisitOutputs] = for { targetResult <- normalizeMatch[F](p.proc_, input.copy(par = Par())) target = targetResult.par diff --git a/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PNegationNormalizer.scala b/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PNegationNormalizer.scala index db467625e82..4a8933dd86e 100644 --- a/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PNegationNormalizer.scala +++ b/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PNegationNormalizer.scala @@ -3,7 +3,7 @@ package coop.rchain.rholang.interpreter.compiler.normalizer.processes import cats.syntax.all._ import cats.effect.Sync import coop.rchain.models.Connective.ConnectiveInstance.ConnNotBody -import coop.rchain.models.{Connective, Par} +import coop.rchain.models.Connective import coop.rchain.models.rholang.implicits._ import coop.rchain.rholang.interpreter.compiler.ProcNormalizeMatcher.normalizeMatch import coop.rchain.rholang.interpreter.compiler.{ @@ -15,9 +15,7 @@ import coop.rchain.rholang.interpreter.compiler.{ import coop.rchain.rholang.ast.rholang_mercury.Absyn.PNegation object PNegationNormalizer { - def normalize[F[_]: Sync](p: PNegation, input: ProcVisitInputs)( - implicit env: Map[String, Par] - ): F[ProcVisitOutputs] = + def normalize[F[_]: Sync](p: PNegation, input: ProcVisitInputs): F[ProcVisitOutputs] = normalizeMatch[F]( p.proc_, ProcVisitInputs(VectorPar(), input.boundMapChain, FreeMap.empty) diff --git a/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PNewNormalizer.scala b/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PNewNormalizer.scala index 81c7491bee0..a979ae2e35e 100644 --- a/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PNewNormalizer.scala +++ b/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PNewNormalizer.scala @@ -17,9 +17,7 @@ import coop.rchain.rholang.interpreter.compiler.{ import scala.jdk.CollectionConverters._ object PNewNormalizer { - def normalize[F[_]: Sync](p: PNew, input: ProcVisitInputs)( - implicit env: Map[String, Par] - ): F[ProcVisitOutputs] = { + def normalize[F[_]: Sync](p: PNew, input: ProcVisitInputs): F[ProcVisitOutputs] = { // TODO: bindings within a single new shouldn't have overlapping names. val newTaggedBindings = p.listnamedecl_.asScala.toVector.map { @@ -47,7 +45,6 @@ object PNewNormalizer { bindCount = newCount, p = bodyResult.par, uri = uris, - injections = env, locallyFree = bodyResult.par.locallyFree.rangeFrom(newCount).map(x => x - newCount) ) ProcVisitOutputs(input.par.prepend(resultNew), bodyResult.freeMap) diff --git a/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PParNormalizer.scala b/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PParNormalizer.scala index 24cb759518e..3ef853cbae4 100644 --- a/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PParNormalizer.scala +++ b/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PParNormalizer.scala @@ -2,15 +2,12 @@ package coop.rchain.rholang.interpreter.compiler.normalizer.processes import cats.syntax.all._ import cats.effect.Sync -import coop.rchain.models.Par import coop.rchain.rholang.interpreter.compiler.ProcNormalizeMatcher.normalizeMatch import coop.rchain.rholang.interpreter.compiler.{ProcVisitInputs, ProcVisitOutputs} import coop.rchain.rholang.ast.rholang_mercury.Absyn.PPar object PParNormalizer { - def normalize[F[_]: Sync](p: PPar, input: ProcVisitInputs)( - implicit env: Map[String, Par] - ): F[ProcVisitOutputs] = + def normalize[F[_]: Sync](p: PPar, input: ProcVisitInputs): F[ProcVisitOutputs] = Sync[F].defer { for { result <- normalizeMatch[F](p.proc_1, input) diff --git a/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PSendNormalizer.scala b/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PSendNormalizer.scala index 39076700d63..9a84bfc6b3a 100644 --- a/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PSendNormalizer.scala +++ b/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PSendNormalizer.scala @@ -15,9 +15,7 @@ import coop.rchain.rholang.interpreter.compiler.normalizer.NameNormalizeMatcher import scala.collection.immutable.{BitSet, Vector} object PSendNormalizer { - def normalize[F[_]: Sync](p: PSend, input: ProcVisitInputs)( - implicit env: Map[String, Par] - ): F[ProcVisitOutputs] = + def normalize[F[_]: Sync](p: PSend, input: ProcVisitInputs): F[ProcVisitOutputs] = for { nameMatchResult <- NameNormalizeMatcher.normalizeMatch[F]( p.name_, diff --git a/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PSendSynchNormalizer.scala b/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PSendSynchNormalizer.scala index f291c4f6d1a..6dbf80494bc 100644 --- a/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PSendSynchNormalizer.scala +++ b/rholang/src/main/scala/coop/rchain/rholang/interpreter/compiler/normalizer/processes/PSendSynchNormalizer.scala @@ -1,7 +1,6 @@ package coop.rchain.rholang.interpreter.compiler.normalizer.processes import cats.effect.Sync -import coop.rchain.models.Par import coop.rchain.rholang.interpreter.compiler.ProcNormalizeMatcher.normalizeMatch import coop.rchain.rholang.interpreter.compiler.{ProcVisitInputs, ProcVisitOutputs} import coop.rchain.rholang.ast.rholang_mercury.Absyn._ @@ -11,9 +10,7 @@ import scala.jdk.CollectionConverters._ object PSendSynchNormalizer { @SuppressWarnings(Array("org.wartremover.warts.NonUnitStatements")) - def normalize[F[_]: Sync](p: PSendSynch, input: ProcVisitInputs)( - implicit env: Map[String, Par] - ): F[ProcVisitOutputs] = { + def normalize[F[_]: Sync](p: PSendSynch, input: ProcVisitInputs): F[ProcVisitOutputs] = { val identifier = UUID.randomUUID().toString val nameVar = new NameVar(identifier) diff --git a/rholang/src/test/scala/coop/rchain/rholang/interpreter/ParBuilderUtil.scala b/rholang/src/test/scala/coop/rchain/rholang/interpreter/ParBuilderUtil.scala index 2aacbc1ae42..c792943552a 100644 --- a/rholang/src/test/scala/coop/rchain/rholang/interpreter/ParBuilderUtil.scala +++ b/rholang/src/test/scala/coop/rchain/rholang/interpreter/ParBuilderUtil.scala @@ -12,7 +12,7 @@ import cats.syntax.all._ object ParBuilderUtil { def mkTerm(rho: String): Either[Throwable, Par] = - Compiler[Eval].sourceToADT(rho, Map.empty[String, Par]).attempt.value + Compiler[Eval].sourceToADT(rho).attempt.value def assertCompiledEqual(s: String, t: String): Assertion = ParBuilderUtil.mkTerm(s).value shouldBe ParBuilderUtil.mkTerm(t).value