Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update/sbt typelevel rc5 #144

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion example/src/main/scala/example/PubSub.scala
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
package example

import cats.effect.*
import cats.syntax.all.*
import dev.hnaderi.namedcodec.*
import fs2.Stream
import fs2.Stream.*
Expand Down
12 changes: 3 additions & 9 deletions modules/client/.jvm/src/test/scala/DataTest.scala
Original file line number Diff line number Diff line change
Expand Up @@ -16,27 +16,21 @@

package lepus.codecs

import cats.implicits.*
import com.rabbitmq.client.impl.AMQImpl
import lepus.wire.DomainCodecs
import lepus.wire.ExchangeCodecs
import lepus.wire.FrameCodec
import lepus.wire.MethodCodec
import lepus.protocol.*
import lepus.protocol.domains.*
import lepus.wire.MethodCodec
import munit.FunSuite
import munit.Location
import munit.ScalaCheckSuite
import org.scalacheck.Arbitrary
import org.scalacheck.Gen
import org.scalacheck.Prop
import org.scalacheck.Prop._
import scodec.*
import scodec.bits.*
import scodec.codecs.*

import DomainGenerators.*
import DataTest.*
import org.scalacheck.Prop
import munit.ScalaCheckSuite

class DataTest extends ScalaCheckSuite {

Expand Down
9 changes: 0 additions & 9 deletions modules/client/.jvm/src/test/scala/Helpers.scala
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,13 @@

package lepus.codecs

import cats.implicits.*
import com.rabbitmq.client.impl.AMQImpl
import com.rabbitmq.client.impl.Frame
import com.rabbitmq.client.impl.MethodArgumentWriter
import com.rabbitmq.client.impl.ValueWriter
import lepus.protocol.domains.*
import munit.Location
import scodec.Attempt
import scodec.DecodeResult
import scodec.bits.*
import scodec.codecs
import scodec.codecs.*

import java.io.ByteArrayOutputStream
import java.io.DataOutputStream
import java.io.OutputStream
import java.util.{Map => JMap}
import scala.jdk.CollectionConverters.*

Expand Down
10 changes: 3 additions & 7 deletions modules/client/src/main/scala/internal/ContentChannel.scala
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,8 @@ package lepus.client
package internal

import cats.effect.Concurrent
import cats.effect.kernel.Deferred
import cats.effect.kernel.DeferredSource
import cats.effect.std.Queue
import cats.effect.std.QueueSink
import cats.effect.std.QueueSource
import cats.implicits.*
import fs2.Stream
import lepus.protocol.ConnectionClass.Start
import lepus.protocol.Frame
import lepus.protocol.*
import lepus.protocol.constants.ReplyCode
Expand Down Expand Up @@ -145,7 +139,9 @@ private[client] object ContentChannel {
getList.checkinAnd(publisher.writeOne(Frame.Method(channelNumber, m)))

private def respond(o: Option[SynchronousGetRaw]): F[Unit] =
getList.nextTurn(o).map(if _ then () else ReplyCode.SyntaxError)
getList
.nextTurn(o)
.void // TODO//.map(if _ then () else ReplyCode.SyntaxError)

def syncNotify(m: ContentSyncResponse): F[Unit] = m match {
case m: BasicClass.GetOk => state.set(State.SyncStarted(m)).widen
Expand Down
4 changes: 0 additions & 4 deletions modules/client/src/main/scala/internal/LowlevelChannel.scala
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,14 @@ package lepus.client
package internal

import cats.effect.Concurrent
import cats.effect.kernel.Deferred
import cats.effect.kernel.Resource
import cats.effect.std.Queue
import cats.effect.std.QueueSink
import cats.implicits.*
import fs2.Stream
import fs2.concurrent.Signal
import fs2.concurrent.SignallingRef
import lepus.client.Channel.Status
import lepus.protocol.ChannelClass.Close
import lepus.protocol.*
import lepus.protocol.domains.ChannelNumber
import lepus.protocol.domains.ConsumerTag

private[client] type ContentMethod = BasicClass.Deliver | BasicClass.Return
Expand Down
1 change: 0 additions & 1 deletion modules/client/src/main/scala/internal/RPCChannel.scala
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ package internal

import cats.effect.Concurrent
import cats.implicits.*
import fs2.Stream
import lepus.protocol.Frame
import lepus.protocol.*
import lepus.protocol.constants.ReplyCode
Expand Down
1 change: 0 additions & 1 deletion modules/client/src/main/scala/internal/Waitlist.scala
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import cats.effect.kernel.DeferredSource
import cats.effect.std.Queue
import cats.effect.std.Semaphore
import cats.implicits.*
import lepus.protocol.Frame

private[client] trait Waitlist[F[_], T] {
def checkinAnd(eval: F[Unit]): F[DeferredSource[F, T]]
Expand Down
4 changes: 0 additions & 4 deletions modules/client/src/test/scala/TransportSuite.scala
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,13 @@
package lepus.client

import cats.effect.IO
import cats.effect.kernel.Ref
import cats.effect.std.CountDownLatch
import cats.implicits.*
import fs2.Chunk
import fs2.Stream
import fs2.Stream.*
import munit.CatsEffectSuite
import scodec.bits.ByteVector

import java.io.OutputStream

class TransportSuite extends CatsEffectSuite {
test("Transmission starts with sending protocol header") {
for {
Expand Down
20 changes: 10 additions & 10 deletions modules/client/src/test/scala/internal/ChannelOutputSuite.scala
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@
package lepus.client
package internal

import cats.effect.IO
import cats.effect.implicits.*
import cats.effect.std.Queue
import cats.effect.std.QueueSource
import cats.implicits.*
import lepus.codecs.FrameGenerators
import lepus.protocol.Frame
import org.scalacheck.Gen
// import cats.effect.IO
// import cats.effect.implicits.*
// import cats.effect.std.Queue
// import cats.effect.std.QueueSource
// import cats.implicits.*
// import lepus.codecs.FrameGenerators
// import lepus.protocol.Frame
// import org.scalacheck.Gen

import java.util.concurrent.TimeoutException
import scala.concurrent.duration.*
// import java.util.concurrent.TimeoutException
// import scala.concurrent.duration.*

//TODO https://github.com/hnaderi/lepus/issues/64
class ChannelOutputSuite extends InternalTestSuite {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,10 @@ package lepus.client
package internal

import cats.effect.IO
import cats.effect.std.Queue
import cats.implicits.*
import lepus.codecs.BasicDataGenerator
import lepus.codecs.DomainGenerators
import lepus.protocol.Frame
import lepus.protocol.domains.*
import munit.CatsEffectSuite
import munit.ScalaCheckEffectSuite
import org.scalacheck.Arbitrary
import org.scalacheck.Gen
import org.scalacheck.effect.PropF.*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,28 +18,9 @@ package lepus.client
package internal

import cats.effect.*
import cats.effect.std.*
import cats.effect.syntax.all.*
import cats.effect.testkit.TestControl
import cats.syntax.all.*
import fs2.Stream
import fs2.Stream.*
import fs2.concurrent.Signal
import lepus.codecs.ConnectionDataGenerator
import lepus.codecs.DomainGenerators
import lepus.codecs.FrameGenerators
import lepus.protocol.BasicClass.Get
import lepus.protocol.BasicClass.Publish
import lepus.protocol.ConnectionClass.Close
import lepus.protocol.*
import lepus.protocol.constants.ReplyCode
import lepus.protocol.domains.*
import org.scalacheck.Gen

import scala.concurrent.duration.*

import Connection.Status

class ConnectionLifetimeSuite extends InternalTestSuite {

check("sends onConnected when negotation succeeds") {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,14 @@ package lepus.client
package internal

import cats.effect.*
import cats.effect.std.*
import cats.effect.syntax.all.*
import cats.effect.testkit.TestControl
import cats.syntax.all.*
import fs2.Stream
import fs2.Stream.*
import fs2.concurrent.Signal
import lepus.codecs.ConnectionDataGenerator
import lepus.codecs.DomainGenerators
import lepus.codecs.FrameGenerators
import lepus.protocol.BasicClass.Get
import lepus.protocol.BasicClass.Publish
import lepus.protocol.*
import lepus.protocol.constants.ReplyCode
import lepus.protocol.domains.*
import org.scalacheck.Gen

import scala.concurrent.duration.*

import Connection.Status

class ConnectionReceiveSuite extends InternalTestSuite {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,14 @@ package lepus.client
package internal

import cats.effect.IO
import cats.effect.std.Queue
import cats.effect.std.QueueSource
import cats.effect.std.Random
import cats.effect.testkit.TestControl
import cats.implicits.*
import lepus.codecs.BasicDataGenerator
import lepus.codecs.DomainGenerators
import lepus.protocol.*
import lepus.protocol.classes.basic.Properties
import lepus.protocol.constants.ReplyCode
import lepus.protocol.domains.*
import munit.CatsEffectSuite
import munit.ScalaCheckEffectSuite
import org.scalacheck.Arbitrary
import org.scalacheck.Gen
import org.scalacheck.effect.PropF
Expand Down
14 changes: 0 additions & 14 deletions modules/client/src/test/scala/internal/FakeConnectionState.scala
Original file line number Diff line number Diff line change
Expand Up @@ -18,27 +18,13 @@ package lepus.client
package internal

import cats.effect.*
import cats.effect.std.*
import cats.effect.syntax.all.*
import cats.effect.testkit.TestControl
import cats.syntax.all.*
import fs2.Stream
import fs2.Stream.*
import fs2.concurrent.Signal
import fs2.concurrent.SignallingRef
import lepus.client.internal.FakeConnectionState.Interaction
import lepus.codecs.ConnectionDataGenerator
import lepus.codecs.DomainGenerators
import lepus.codecs.FrameGenerators
import lepus.protocol.BasicClass.Get
import lepus.protocol.BasicClass.Publish
import lepus.protocol.ConnectionClass.Close
import lepus.protocol.*
import lepus.protocol.constants.ReplyCode
import lepus.protocol.domains.*
import org.scalacheck.Gen

import scala.concurrent.duration.*

import Connection.Status

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,13 @@ package internal
import cats.effect.IO
import cats.effect.kernel.Ref
import cats.effect.kernel.Resource
import cats.effect.std.Queue
import cats.syntax.all.*
import fs2.concurrent.Signal
import lepus.protocol.*
import lepus.protocol.domains.ChannelNumber
import munit.CatsEffectAssertions.*
import munit.Location

import Connection.Status
import Frame.*

final class FakeFrameDispatcher(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ package lepus.client.internal

import cats.effect.IO
import lepus.client.internal.FakeFrameOutput.Interaction
import lepus.client.internal.OutputWriter
import lepus.protocol.Frame

final class FakeFrameOutput(val interactions: InteractionList[Interaction])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,14 @@ package lepus.client
package internal

import cats.effect.*
import cats.effect.std.*
import cats.effect.syntax.all.*
import cats.syntax.all.*
import fs2.Stream
import fs2.concurrent.Signal
import fs2.concurrent.SignallingRef
import lepus.client.Channel.Status
import lepus.client.Confirmation
import lepus.client.internal.FakeLowLevelChannel.Interaction
import lepus.codecs.ConnectionDataGenerator
import lepus.codecs.DomainGenerators
import lepus.codecs.FrameGenerators
import lepus.protocol.BasicClass.Get
import lepus.protocol.BasicClass.Publish
import lepus.protocol.*
import lepus.protocol.constants.ReplyCode
import lepus.protocol.domains.*

final class FakeLowLevelChannel(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,9 @@ package internal
import cats.effect.IO
import cats.effect.kernel.Ref
import cats.effect.kernel.Resource
import cats.effect.std.Queue
import cats.effect.std.QueueSource
import cats.effect.std.UUIDGen
import cats.implicits.*
import lepus.protocol.domains.ConsumerTag
import lepus.protocol.domains.ShortString
import munit.Assertions.*
import munit.CatsEffectAssertions.*
import munit.Location

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
package lepus.client.internal

import cats.effect.IO
import cats.implicits.*
import lepus.protocol.Frame
import munit.Location

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ package lepus.client.internal

import cats.effect.IO
import cats.effect.std.Queue
import cats.implicits.*
import lepus.protocol.Frame
import munit.CatsEffectAssertions.*
import munit.Location
Expand Down
2 changes: 0 additions & 2 deletions modules/client/src/test/scala/internal/FakeRPCChannel.scala
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,10 @@
package lepus.client.internal

import cats.effect.IO
import cats.effect.kernel.Ref
import cats.effect.kernel.Resource
import cats.effect.std.Mutex
import cats.syntax.all.*
import lepus.protocol.Method
import munit.CatsEffectAssertions.*

import FakeRPCChannel.Interaction

Expand Down
8 changes: 0 additions & 8 deletions modules/client/src/test/scala/internal/FakeReceiver.scala
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,8 @@ import cats.effect.IO
import cats.effect.kernel.Ref
import cats.implicits.*
import lepus.client.internal.FakeReceiver.Interaction
import lepus.codecs.FrameGenerators
import lepus.protocol.*
import lepus.protocol.classes.basic.Properties
import lepus.protocol.constants.ReplyCode
import lepus.protocol.domains.*
import munit.CatsEffectSuite
import munit.ScalaCheckSuite
import munit.CatsEffectAssertions.*
import org.scalacheck.effect.PropF.forAllF
import scodec.bits.ByteVector

final class FakeReceiver(
interactionList: Ref[IO, List[FakeReceiver.Interaction]],
Expand Down
Loading
Loading