Skip to content

Commit cd0c148

Browse files
committed
Fix bad merge
1 parent df4334f commit cd0c148

File tree

1 file changed

+1
-14
lines changed

1 file changed

+1
-14
lines changed

modules/core/shared/src/main/scala/net/BitVectorSocket.scala

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -70,24 +70,11 @@ object BitVectorSocket {
7070
sockets: Resource[F, Socket[F]],
7171
sslOptions: Option[SSLNegotiation.Options[F]],
7272
readTimeout: Duration
73-
)(implicit ev: Temporal[F]): Resource[F, BitVectorSocket[F]] = {
74-
75-
def fail[A](msg: String): Resource[F, A] =
76-
Resource.eval(ev.raiseError(new SkunkException(message = msg, sql = None)))
77-
78-
def sock: Resource[F, Socket[F]] = {
79-
(Host.fromString(host), Port.fromInt(port)) match {
80-
case (Some(validHost), Some(validPort)) => sg.client(SocketAddress(validHost, validPort), socketOptions)
81-
case (None, _) => fail(s"""Hostname: "$host" is not syntactically valid.""")
82-
case (_, None) => fail(s"Port: $port falls out of the allowed range.")
83-
}
84-
}
85-
73+
): Resource[F, BitVectorSocket[F]] =
8674
for {
8775
sock <- sockets
8876
sockʹ <- sslOptions.fold(sock.pure[Resource[F, *]])(SSLNegotiation.negotiateSSL(sock, _))
8977
carry <- Resource.eval(Ref.of(Chunk.empty[Byte]))
9078
} yield fromSocket(sockʹ, readTimeout, carry)
91-
9279
}
9380

0 commit comments

Comments
 (0)