status-im
/
nim-eth
mirror of https://github.com/status-im/nim-eth.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove last leftovers of ValidIpAddress (#664)

This commit is contained in:
Kim De Mey 2024-01-19 11:15:57 +01:00 committed by GitHub
parent 974a995b21
commit 159ae697c5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eth/net/utils.nim
View File

@ -16,7 +16,7 @@ type
limit*: uint limit*: uint
ips: Table[IpAddress, uint] ips: Table[IpAddress, uint]
func hash*(ip: ValidIpAddress): Hash = func hash*(ip: IpAddress): Hash =
case ip.family case ip.family
of IpAddressFamily.IPv6: hash(ip.address_v6) of IpAddressFamily.IPv6: hash(ip.address_v6)
of IpAddressFamily.IPv4: hash(ip.address_v4) of IpAddressFamily.IPv4: hash(ip.address_v4)

20
tools/dcli.nim
View File

@ -16,6 +16,12 @@ import
../eth/p2p/discoveryv5/[enr, node], ../eth/p2p/discoveryv5/[enr, node],
../eth/p2p/discoveryv5/protocol as discv5_protocol ../eth/p2p/discoveryv5/protocol as discv5_protocol
const
defaultListenAddress* = (static parseIpAddress("0.0.0.0"))
defaultAdminListenAddress* = (static parseIpAddress("127.0.0.1"))
defaultListenAddressDesc = $defaultListenAddress
defaultAdminListenAddressDesc = $defaultAdminListenAddress
type type
DiscoveryCmd* = enum DiscoveryCmd* = enum
noCommand noCommand
@ -35,7 +41,8 @@ type
name: "udp-port" .}: uint16 name: "udp-port" .}: uint16
listenAddress* {. listenAddress* {.
defaultValue: defaultListenAddress(config) defaultValue: defaultListenAddress
defaultValueDesc: $defaultListenAddressDesc
desc: "Listening address for the Discovery v5 traffic" desc: "Listening address for the Discovery v5 traffic"
name: "listen-address" }: IpAddress name: "listen-address" }: IpAddress
@ -72,9 +79,10 @@ type
name: "metrics" .}: bool name: "metrics" .}: bool
metricsAddress* {. metricsAddress* {.
defaultValue: defaultAdminListenAddress(config) defaultValue: defaultAdminListenAddress
defaultValueDesc: $defaultAdminListenAddressDesc
desc: "Listening address of the metrics server" desc: "Listening address of the metrics server"
name: "metrics-address" .}: ValidIpAddress name: "metrics-address" .}: IpAddress
metricsPort* {. metricsPort* {.
defaultValue: 8008 defaultValue: 8008
@ -108,12 +116,6 @@ type
desc: "ENR URI of the node to send a talkReq message" desc: "ENR URI of the node to send a talkReq message"
name: "node" .}: Node name: "node" .}: Node
func defaultListenAddress*(conf: DiscoveryConf): IpAddress =
(static parseIpAddress("0.0.0.0"))
func defaultAdminListenAddress*(conf: DiscoveryConf): ValidIpAddress =
(static ValidIpAddress.init("127.0.0.1"))
proc parseCmdArg*(T: type enr.Record, p: string): T {.raises: [ValueError].} = proc parseCmdArg*(T: type enr.Record, p: string): T {.raises: [ValueError].} =
if not fromURI(result, p): if not fromURI(result, p):
raise newException(ValueError, "Invalid ENR") raise newException(ValueError, "Invalid ENR")