require MonadError rather than Bracket

evolution-gaming · Sep 19, 2019 · 0b70423 · 0b70423
1 parent 37737e0
commit 0b70423
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 24 deletions.
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -3,7 +3,7 @@ import sbt._
 object Dependencies {
 
   val scalatest     = "org.scalatest"       %% "scalatest"   % "3.0.8"
-  val `cats-helper` = "com.evolutiongaming" %% "cats-helper" % "1.0.0"
+  val `cats-helper` = "com.evolutiongaming" %% "cats-helper" % "1.0.1"
   val random        = "com.evolutiongaming" %% "random"      % "0.0.5"
 
   object Cats {

diff --git a/src/main/scala/com/evolutiongaming/retry/Retry.scala b/src/main/scala/com/evolutiongaming/retry/Retry.scala
@@ -3,11 +3,11 @@ package com.evolutiongaming.retry
 import java.time.Instant
 
 import cats.arrow.FunctionK
-import cats.effect.{Bracket, Clock, Timer}
+import cats.effect.{Clock, Timer}
 import cats.implicits._
-import cats.~>
+import cats.{MonadError, ~>}
 import com.evolutiongaming.catshelper.ClockHelper._
-import com.evolutiongaming.catshelper.EffectHelper._
+import com.evolutiongaming.catshelper.CatsHelper._
 
 import scala.concurrent.duration._
 
@@ -29,7 +29,7 @@ object Retry {
   def apply[F[_] : Timer, E](
     strategy: Strategy,
     onError: OnError[F, E])(implicit
-    bracket: Bracket[F, E]
+    F: MonadError[F, E]
   ): Retry[F] = {
 
     type S = (Status, Decide)
@@ -70,8 +70,8 @@ object Retry {
           zero    = (Status.empty(now), strategy.decide)
           result <- zero.tailRecM[F, A] { case (status, decide) =>
             fa.redeemWith[Either[S, A], E](
-              error => retry[A](status, decide, error),
-              result => result.asRight[(Status, Decide)].pure[F])
+              a => retry[A](status, decide, a),
+              a => a.asRight[(Status, Decide)].pure[F])
           }
         } yield result
       }
@@ -81,7 +81,7 @@ object Retry {
 
   def apply[F[_] : Timer, E](
     strategy: Strategy)(implicit
-    bracket: Bracket[F, E]
+    F: MonadError[F, E]
   ): Retry[F] = {
     apply(strategy, OnError.empty[F, E])
   }

diff --git a/src/test/scala/com/evolutiongaming/retry/RetrySpec.scala b/src/test/scala/com/evolutiongaming/retry/RetrySpec.scala
@@ -2,7 +2,7 @@ package com.evolutiongaming.retry
 
 import cats._
 import cats.arrow.FunctionK
-import cats.effect.{Bracket, Clock, ExitCase, Timer}
+import cats.effect.{Clock, Timer}
 import cats.implicits._
 import com.evolutiongaming.catshelper.ClockHelper._
 import com.evolutiongaming.random.Random
@@ -161,7 +161,7 @@ object RetrySpec {
 
   object StateT {
 
-    implicit val BracketImpl: Bracket[StateT, Error] = new Bracket[StateT, Error] {
+    implicit val MonadErrorStateT: MonadError[StateT, Error] = new MonadError[StateT, Error] {
 
       def flatMap[A, B](fa: StateT[A])(f: A => StateT[B]) = {
         StateT[B] { s =>
@@ -185,20 +185,6 @@ object RetrySpec {
         StateT { s => apply(s, a) }
       }
 
-      def bracketCase[A, B](acquire: StateT[A])(use: A => StateT[B])(release: (A, ExitCase[Error]) => StateT[Error]) = {
-        StateT { s =>
-          val (s1, a) = acquire.run(s)
-          a match {
-            case Left(a)  => (s1, a.asLeft[B])
-            case Right(a) =>
-              val (s2, b) = use(a).run(s1)
-              val exitCase = b.fold(ExitCase.error, _ => ExitCase.complete)
-              val(s3, _) = release(a, exitCase).run(s2)
-              (s3, b)
-          }
-        }
-      }
-
       def raiseError[A](e: Error) = {
         StateT { s => (s, e.asLeft) }
       }