codex-storage
/
nim-libp2p
mirror of https://github.com/codex-storage/nim-libp2p.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ensure all multiaddress routines use Result

This commit is contained in:
Giovanni Petrantoni 2020-10-30 23:50:04 +09:00
parent 75b023c9e5
commit 3d9948a65e
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libp2p/multiaddress.nim
View File

@ -841,7 +841,7 @@ proc init*(mtype: typedesc[MultiAddress]): MultiAddress =
proc init*(mtype: typedesc[MultiAddress],
address: ValidIpAddress,
protocol: IpTransportProtocol,
port: Port): MultiAddress =
port: Port): MaResult[MultiAddress] =
let
familyProto = case address.family
of IpAddressFamily.IPv4: getProtocol("ip4")
@ -854,15 +854,17 @@ proc init*(mtype: typedesc[MultiAddress],
var data = initVBuffer()
data.write(familyProto.mcodec)
var written = familyProto.coder.stringToBuffer($address, data)
doAssert written,
"Merely writing a string to a buffer should always be possible, address: " & $address
if not written:
return err("multiaddress: Merely writing a string to a buffer should always be possible, address")
data.write(protoProto.mcodec)
written = protoProto.coder.stringToBuffer($port, data)
doAssert written,
"Merely writing a string to a buffer should always be possible, port: " & $address
if not written:
return err("multiaddress: Merely writing a string to a buffer should always be possible, port")
data.finish()
MultiAddress(data: data)
ok(MultiAddress(data: data))
proc init*(mtype: typedesc[MultiAddress], address: TransportAddress,
protocol = IPPROTO_TCP): MaResult[MultiAddress] =