Merge pull request #40 from alexander255/master

Deduplicate source code

Author: mhchia

multiaddr/codec.py

@@ -0,0 +1,22 @@
+# -*- encoding: utf-8 -*-
+from __future__ import absolute_import
+import importlib
+
+
+# These are special sizes
+LENGTH_PREFIXED_VAR_SIZE = -1
+
+
+class NoneCodec:
+	SIZE = 0
+	IS_PATH = False
+
+
+CODEC_CACHE = {}
+def codec_by_name(name):
+    if name is None:  # Special “do nothing – expect nothing” pseudo-codec
+        return NoneCodec
+    codec = CODEC_CACHE.get(name)
+    if not codec:
+        codec = CODEC_CACHE[name] = importlib.import_module(".{0}".format(name), __name__)
+    return codec

multiaddr/codecs/__init__.py

@@ -0,0 +1,8 @@
+if hasattr(int, 'from_bytes'):
+    def packed_net_bytes_to_int(b):
+        """Convert the given big-endian byte-string to an int."""
+        return int.from_bytes(b, byteorder='big')
+else:  # PY2
+    def packed_net_bytes_to_int(b):
+        """Convert the given big-endian byte-string to an int."""
+        return int(b.encode('hex'), 16)

multiaddr/codecs/_util.py

@@ -2,9 +2,12 @@
 import os
 
 import six
-import varint
 
-from ..protocols import read_varint_code
+from . import LENGTH_PREFIXED_VAR_SIZE
+
+
+SIZE = LENGTH_PREFIXED_VAR_SIZE
+IS_PATH = True
 
 
 if hasattr(os, "fsencode") and hasattr(os, "fsdecode"):
@@ -25,11 +28,8 @@ def fsdecode(path):
 
 
 def to_bytes(proto, string):
-	bytes = fsencode(string)
-	size = varint.encode(len(bytes))
-	return b''.join([size, bytes])
+	return fsencode(string)
 
 
 def to_string(proto, buf):
-	size, num_bytes_read = read_varint_code(buf)
-	return fsdecode(buf[num_bytes_read:])
+	return fsdecode(buf)

multiaddr/codecs/fspath.py

@@ -1,17 +1,17 @@
 from __future__ import absolute_import
 
 import idna
-import varint
 
-from ..protocols import read_varint_code
+from . import LENGTH_PREFIXED_VAR_SIZE
+
+
+SIZE = LENGTH_PREFIXED_VAR_SIZE
+IS_PATH = False
 
 
 def to_bytes(proto, string):
-	bytes = idna.encode(string, uts46=True)
-	size = varint.encode(len(bytes))
-	return b''.join([size, bytes])
+	return idna.encode(string, uts46=True)
 
 
 def to_string(proto, buf):
-	size, num_bytes_read = read_varint_code(buf)
-	return idna.decode(buf[num_bytes_read:])
+	return idna.decode(buf)

multiaddr/codecs/idna.py

@@ -3,7 +3,11 @@
 import netaddr
 import six
 
-from ..util import packed_net_bytes_to_int
+from ._util import packed_net_bytes_to_int
+
+
+SIZE = 32
+IS_PATH = False
 
 
 def to_bytes(proto, string):

multiaddr/codecs/ip4.py

@@ -3,7 +3,11 @@
 import netaddr
 import six
 
-from ..util import packed_net_bytes_to_int
+from ._util import packed_net_bytes_to_int
+
+
+SIZE = 128
+IS_PATH = False
 
 
 def to_bytes(proto, string):

multiaddr/codecs/ip6.py

@@ -5,6 +5,10 @@
 import six
 
 
+SIZE = 96
+IS_PATH = False
+
+
 def to_bytes(proto, string):
 	addr = string.split(":")
 	if len(addr) != 2:

multiaddr/codecs/onion.py

@@ -2,9 +2,12 @@
 
 import base58
 import six
-import varint
 
-from ..protocols import read_varint_code
+from . import LENGTH_PREFIXED_VAR_SIZE
+
+
+SIZE = LENGTH_PREFIXED_VAR_SIZE
+IS_PATH = False
 
 
 def to_bytes(proto, string):
@@ -15,15 +18,10 @@ def to_bytes(proto, string):
 		mm = base58.b58decode(string)
 	except Exception as ex:
 		raise ValueError("failed to parse p2p addr: %s %s" % (string, str(ex)))
-	size = varint.encode(len(mm))
 	if len(mm) < 5:
 		raise ValueError("invalid P2P multihash: %s" % mm)
-	return b''.join([size, mm])
+	return mm
 
 
 def to_string(proto, buf):
-	size, num_bytes_read = read_varint_code(buf)
-	buf = buf[num_bytes_read:]
-	if len(buf) != size:
-		raise ValueError("inconsistent lengths")
 	return base58.b58encode(buf).decode('ascii')

multiaddr/codecs/p2p.py

@@ -4,6 +4,10 @@
 import six
 
 
+SIZE = 16
+IS_PATH = False
+
+
 def to_bytes(proto, string):
 	try:
 		return struct.pack('>H', int(string, 10))