From 38f82df58246363beba36d83b0a09bc6bcf23fd9 Mon Sep 17 00:00:00 2001
From: cheatfate <ka@hardcore.kiev.ua>
Date: Sun, 16 Dec 2018 04:54:07 +0200
Subject: [PATCH] Add write() and encode() procedures.

---
 libp2p/multiaddress.nim | 13 ++++++++++++-
 libp2p/multihash.nim    | 16 +++++++++++-----
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/libp2p/multiaddress.nim b/libp2p/multiaddress.nim
index 62e12462e..27e016304 100644
--- a/libp2p/multiaddress.nim
+++ b/libp2p/multiaddress.nim
@@ -9,7 +9,7 @@
 
 ## This module implements MultiAddress.
 import tables, strutils, net
-import multicodec, multihash, transcoder, base58, base32, vbuffer
+import multicodec, multihash, multibase, transcoder, base58, base32, vbuffer
 
 {.deadCodeElim:on.}
 
@@ -460,6 +460,7 @@ proc getPart(ma: MultiAddress, index: int): MultiAddress =
     inc(offset)
 
 proc `[]`*(ma: MultiAddress, i: int): MultiAddress {.inline.} =
+  ## Returns part with index ``i`` of MultiAddress ``ma``.
   result = ma.getPart(i)
 
 iterator items*(ma: MultiAddress): MultiAddress =
@@ -526,6 +527,16 @@ proc hex*(value: MultiAddress): string =
   ## Return hexadecimal string representation of MultiAddress ``value``.
   result = $(value.data)
 
+proc write*(vb: var VBuffer, ma: MultiAddress) {.inline.} =
+  ## Write MultiAddress value ``ma`` to buffer ``vb``.
+  vb.writeArray(ma.data.buffer)
+
+proc encode*(mbtype: typedesc[MultiBase], encoding: string,
+             ma: MultiAddress): string {.inline.} =
+  ## Get MultiBase encoded representation of ``ma`` using encoding
+  ## ``encoding``.
+  result = MultiBase.encode(encoding, ma.data.buffer)
+
 proc validate*(ma: MultiAddress): bool =
   ## Returns ``true`` if MultiAddress ``ma`` is valid.
   var header: uint64
diff --git a/libp2p/multihash.nim b/libp2p/multihash.nim
index 22cdbdab5..349b2e2d6 100644
--- a/libp2p/multihash.nim
+++ b/libp2p/multihash.nim
@@ -22,7 +22,7 @@
 ## 3. MURMUR
 import tables
 import nimcrypto/[sha2, keccak, blake2, hash, utils]
-import varint, vbuffer, base58, multicodec
+import varint, vbuffer, base58, multicodec, multibase
 
 const
   MaxHashSize* = 128
@@ -461,12 +461,12 @@ proc validate*(mhtype: typedesc[MultiHash], data: openarray[byte]): bool =
   offset += length
   if size > 0x7FFF_FFFF'u64:
     return false
-  let hash = CodeHashes.getOrDefault(MultiCodec(code))
+  let hash = CodeHashes.getOrDefault(cast[MultiCodec](code))
   if isNil(hash.coder):
     return false
   if (hash.size != 0) and (hash.size != int(size)):
     return false
-  if offset + length + int(size) > len(data):
+  if offset + int(size) > len(data):
     return false
   result = true
 
@@ -514,8 +514,8 @@ proc `==`*[T](mdigest: MDigest[T], mh: MultiHash): bool {.inline.} =
   result = `==`(mh, mdigest)
 
 proc `==`*(a: MultiHash, b: MultiHash): bool =
-  ## Compares MultiHashes ``a`` and ``b``, returns ``true`` if
-  ## hashes are equal, ``false`` otherwise.
+  ## Compares MultiHashes ``a`` and ``b``, returns ``true`` if hashes are equal,
+  ## ``false`` otherwise.
   if a.dpos == 0 and b.dpos == 0:
     return true
   if a.mcodec != b.mcodec:
@@ -542,3 +542,9 @@ proc `$`*(mh: MultiHash): string =
 proc write*(vb: var VBuffer, mh: MultiHash) {.inline.} =
   ## Write MultiHash value ``mh`` to buffer ``vb``.
   vb.writeArray(mh.data.buffer)
+
+proc encode*(mbtype: typedesc[MultiBase], encoding: string,
+             mh: MultiHash): string {.inline.} =
+  ## Get MultiBase encoded representation of ``mh`` using encoding
+  ## ``encoding``.
+  result = MultiBase.encode(encoding, mh.data.buffer)