nix refactor of CatchupSupervisor, for now

Author: HaloFour

src/main/scala/com/comcast/xfinity/sirius/api/impl/bridge/CatchupSupervisor.scala

@@ -22,7 +22,7 @@ import scala.concurrent.duration._
 import com.comcast.xfinity.sirius.api.impl.membership.MembershipHelper
 import com.comcast.xfinity.sirius.api.SiriusConfiguration
 import com.comcast.xfinity.sirius.api.impl.bridge.CatchupSupervisor.CatchupSupervisorInfoMBean
-import com.comcast.xfinity.sirius.api.impl.state.SiriusPersistenceActor.{CompleteSubrange, GetLogSubrangeWithLimit, LogSubrange}
+import com.comcast.xfinity.sirius.api.impl.state.SiriusPersistenceActor.{CompleteSubrange, GetLogSubrange, GetLogSubrangeWithLimit, LogSubrange}
 import com.comcast.xfinity.sirius.admin.MonitoringHooks
 
 import scala.util.Success
@@ -122,7 +122,7 @@ private[bridge] class CatchupSupervisor(membershipHelper: MembershipHelper,
   }
 
   def requestSubrange(fromSeq: Long, window: Int, source: ActorRef): Unit = {
-    source.ask(GetLogSubrangeWithLimit(fromSeq, Long.MaxValue, window))(timeout()).onComplete {
+    source.ask(GetLogSubrange(fromSeq, fromSeq + window))(timeout()).onComplete {
       case Success(logSubrange: LogSubrange) => self ! CatchupRequestSucceeded(logSubrange)
       case _ => self ! CatchupRequestFailed
     }

src/test/scala/com/comcast/xfinity/sirius/api/impl/bridge/CatchupSupervisorTest.scala

@@ -53,7 +53,7 @@ class CatchupSupervisorTest extends NiceTest {
 
       underTest ! InitiateCatchup(1L)
 
-      remote.expectMsgClass(classOf[GetLogSubrangeWithLimit])
+      remote.expectMsgClass(classOf[GetLogSubrange])
     }
     describe("for successful requests with a complete subrange") {
       it("should forward the message on to the parent") {
@@ -176,7 +176,7 @@ class CatchupSupervisorTest extends NiceTest {
 
       underTest ! ContinueCatchup(1L)
 
-      remote.expectMsg(GetLogSubrangeWithLimit(1L, Long.MaxValue, 1L))
+      remote.expectMsg(GetLogSubrange(1L, 2L))
     }
     it("should ignore InitiateCatchup requests if it's currently in catchup mode") {
       val remote = TestProbe()
@@ -197,7 +197,7 @@ class CatchupSupervisorTest extends NiceTest {
       underTest ! StopCatchup
       underTest ! InitiateCatchup(1L)
 
-      remote.expectMsg(GetLogSubrangeWithLimit(1L, Long.MaxValue, 1L))
+      remote.expectMsg(GetLogSubrange(1L, 2L))
     }
   }
 }