Skip to content

Commit 3469871

Browse files
committed
rm resolve_internet_addr
1 parent b6f94e7 commit 3469871

File tree

2 files changed

+6
-42
lines changed

2 files changed

+6
-42
lines changed

lightbug_http/net.mojo

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -148,12 +148,11 @@ struct ListenConfig:
148148

149149
fn listen[network: NetworkType, address_family: Int = AF_INET](mut self, address: String) raises -> NoTLSListener:
150150
constrained[address_family in [AF_INET, AF_INET6], "Address family must be either AF_INET or AF_INET6."]()
151-
var addr: TCPAddr
152-
try:
153-
addr = resolve_internet_addr[network](address)
154-
except e:
155-
raise Error("ListenConfig.listen: Failed to resolve host address - " + str(e))
156-
151+
constrained[
152+
network in NetworkType.SUPPORTED_TYPES,
153+
"Unsupported network type for internet address resolution. Unix addresses are not supported yet.",
154+
]()
155+
var addr = TCPAddr(HostPort.from_string(address))
157156
var socket: Socket[TCPAddr]
158157
try:
159158
socket = Socket[TCPAddr]()
@@ -437,22 +436,6 @@ struct TCPAddr(Addr):
437436
writer.write("TCPAddr(", "ip=", repr(self.ip), ", port=", str(self.port), ", zone=", repr(self.zone), ")")
438437

439438

440-
fn resolve_internet_addr[network: NetworkType](address: String) raises -> TCPAddr:
441-
constrained[
442-
network in NetworkType.SUPPORTED_TYPES,
443-
"Unsupported network type for internet address resolution. Unix addresses are not supported yet.",
444-
]()
445-
if address == "":
446-
raise Error("Address must not be empty.")
447-
448-
@parameter
449-
# Either TCP/UDP or IP addresses
450-
if network in NetworkType.TCP_TYPES or network in NetworkType.UDP_TYPES:
451-
return TCPAddr(HostPort.from_string(address))
452-
else:
453-
return TCPAddr(address, 0)
454-
455-
456439
# TODO: Support IPv6 long form.
457440
fn join_host_port(host: String, port: String) -> String:
458441
if host.find(":") != -1: # must be IPv6 literal

tests/lightbug_http/test_host_port.mojo

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import testing
2-
from lightbug_http.net import resolve_internet_addr, join_host_port, HostPort, TCPAddr
2+
from lightbug_http.net import join_host_port, HostPort, TCPAddr
33
from lightbug_http.strings import NetworkType
44

55

@@ -28,22 +28,3 @@ def test_join_host_port():
2828
testing.assert_equal(join_host_port("::1", "8080"), "[::1]:8080")
2929

3030
# TODO: IPv6 long form - Not supported yet.
31-
32-
33-
def test_resolve_internet_addr():
34-
# TCP/UDP
35-
alias address = "127.0.0.1:8080"
36-
alias addr = TCPAddr("127.0.0.1", 8080, "")
37-
testing.assert_true(resolve_internet_addr[NetworkType.tcp](address) == addr)
38-
testing.assert_true(resolve_internet_addr[NetworkType.tcp4](address) == addr)
39-
testing.assert_true(resolve_internet_addr[NetworkType.tcp6](address) == addr)
40-
testing.assert_true(resolve_internet_addr[NetworkType.udp](address) == addr)
41-
testing.assert_true(resolve_internet_addr[NetworkType.udp4](address) == addr)
42-
testing.assert_true(resolve_internet_addr[NetworkType.udp6](address) == addr)
43-
44-
# IP
45-
alias ip_address = "127.0.0.1"
46-
alias ip_addr = TCPAddr("127.0.0.1", 0)
47-
testing.assert_true(resolve_internet_addr[NetworkType.ip](ip_address) == ip_addr)
48-
testing.assert_true(resolve_internet_addr[NetworkType.ip4](ip_address) == ip_addr)
49-
testing.assert_true(resolve_internet_addr[NetworkType.ip6](ip_address) == ip_addr)

0 commit comments

Comments
 (0)