Skip to content

Commit bde0bd4

Browse files
committed
Removed unused code
1 parent fffe754 commit bde0bd4

File tree

1 file changed

+2
-26
lines changed

1 file changed

+2
-26
lines changed

server/src/main/scala/org/scalaexercises/evaluator/evaluation.scala

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -62,30 +62,6 @@ class Evaluator[F[_]: Sync](timeout: FiniteDuration = 20.seconds)(
6262

6363
val cache: FileCache[F] = FileCache[F].noCredentials
6464

65-
def resolveArtifacts(
66-
remotes: Seq[Remote],
67-
dependencies: Seq[EvaluatorDependency]
68-
): F[Resolution] = {
69-
Resolve[F](cache)
70-
.addDependencies(dependencies.map(dependencyToModule): _*)
71-
.addRepositories(remotes.map(remoteToRepository): _*)
72-
.addRepositories(coursier.LocalRepositories.ivy2Local)
73-
.io
74-
}
75-
76-
def fetchArtifacts(
77-
remotes: Seq[Remote],
78-
dependencies: Seq[EvaluatorDependency]
79-
): F[Either[ArtifactError, List[File]]] =
80-
for {
81-
resolution <- resolveArtifacts(remotes, dependencies)
82-
gatheredArtifacts <- resolution.artifacts().toList.traverse(cache.file(_).run)
83-
artifacts = gatheredArtifacts.foldRight(Right(Nil): Either[ArtifactError, List[File]]) {
84-
case (Right(file), acc) => acc.map(file :: _)
85-
case (Left(ae), _) => Left(ae)
86-
}
87-
} yield artifacts
88-
8965
def fetch(remotes: Seq[Remote], dependencies: Seq[EvaluatorDependency]) =
9066
Fetch[F](cache)
9167
.addDependencies(dependencies.map(dependencyToModule): _*)
@@ -155,12 +131,12 @@ class Evaluator[F[_]: Sync](timeout: FiniteDuration = 20.seconds)(
155131
dependencies: Seq[EvaluatorDependency] = Nil
156132
): F[EvalResult[T]] = {
157133
for {
158-
allJars <- fetchArtifacts(remotes, dependencies)
134+
allJars <- fetch(remotes, dependencies)
159135
result <- allJars match {
160136
case Right(jars) =>
161137
evaluate(code, jars)
162138
.timeoutTo(timeout, Timeout[T](timeout).asInstanceOf[EvalResult[T]].pure[F])
163-
case Left(fileError) => F.pure(UnresolvedDependency[T](fileError.describe))
139+
case Left(ex) => F.pure(UnresolvedDependency[T](ex.getMessage))
164140
}
165141
} yield result
166142
}

0 commit comments

Comments
 (0)