clean up

Author: keisar

docs/plans/pr-6-read-command-review.md

@@ -17,14 +17,10 @@ case class PendingReads[S](entries: List[PendingReadEntry[S]]):
       PendingReads(before ++ (entry :: after))
 
   def withCompleted(upToIndex: Index, state: S): UIO[PendingReads[S]] =
-          .as(PendingReads(remaining))
     if entries.isEmpty || entries.last.enqueuedAtIndex > upToIndex then ZIO.succeed(this)
     else
       entries.span(_.enqueuedAtIndex <= upToIndex) match
-        case (completed, remaining) =>
-          for
-            _ <- ZIO.debug(s"withCompleted completed=$completed remaining=$remaining")
-            _ <- ZIO.foreach(completed)(_.promise.succeed(state))
+        case (completed, remaining) => ZIO.foreach(completed)(_.promise.succeed(state)).as(PendingReads(remaining))
 
   def stepDown(leaderId: Option[MemberId]): UIO[Unit] =
     ZIO

raft/src/main/scala/zio/raft/PendingReads.scala

@@ -850,7 +850,7 @@ class Raft[S, A <: Command](
           _ <- ZIO.logDebug(s"memberId=${this.memberId} handleCommand $entry")
           _ <- logStore.storeLog(entry)
 
-          _ <- raftState.set(l.addPendingCommand(entry.index, promise))
+          _ <- raftState.set(l.withPendingCommand(entry.index, promise))
         yield ()
       case f: Follower[S] =>
         promise.fail(NotALeaderError(f.leaderId)).unit

raft/src/main/scala/zio/raft/Raft.scala

@@ -82,7 +82,7 @@ object State:
     def withPendingRead(entry: PendingReadEntry[S]): Leader[S] =
       this.copy(pendingReads = pendingReads.withAdded(entry))
 
-    def addPendingCommand[R](index: Index, promise: CommandPromise[R]): Leader[S] =
+    def withPendingCommand[R](index: Index, promise: CommandPromise[R]): Leader[S] =
       this.copy(pendingCommands = pendingCommands.withAdded(index, promise))
 
     def stepDown(leaderId: Option[MemberId]): UIO[Unit] =