Unified Kerl impl in py2k and py3k.

Author: todofixthis

iota/crypto/kerl/__init__.py

@@ -2,11 +2,4 @@
 from __future__ import absolute_import, division, print_function, \
   unicode_literals
 
-from six import PY3
-
-if PY3:
-  # noinspection SpellCheckingInspection
-  from . import pykerl_py3 as pykerl
-else:
-  # noinspection SpellCheckingInspection
-  from . import pykerl_py2 as pykerl
+from .pykerl import *

iota/crypto/kerl/pykerl_py3.py renamed to iota/crypto/kerl/pykerl.py

@@ -3,7 +3,7 @@
   unicode_literals
 
 from sha3 import keccak_384
-from six import binary_type
+from six import PY2
 
 from iota.crypto.kerl import conv
 from iota.exceptions import with_context
@@ -17,7 +17,7 @@
 
 class Kerl(object):
   def __init__(self):
-    self._reset()
+    self.reset()
 
   def absorb(self, trits, offset=0, length=None):
     if length is None:
@@ -43,8 +43,7 @@ def absorb(self, trits, offset=0, length=None):
 
       # Convert signed bytes into their equivalent unsigned representation
       # In order to use Python's built-in bytes type
-      unsigned_bytes =\
-        binary_type([conv.convert_sign(b) for b in signed_nums])
+      unsigned_bytes = bytearray(conv.convert_sign(b) for b in signed_nums)
 
       self.k.update(unsigned_bytes)
 
@@ -63,6 +62,9 @@ def squeeze(self, trits, offset=0, length=TRIT_HASH_LENGTH):
     while offset < length:
       unsigned_hash = self.k.digest()
 
+      if PY2:
+        unsigned_hash = map(ord, unsigned_hash) # type: ignore
+
       signed_hash = [conv.convert_sign(b) for b in unsigned_hash]
 
       trits_from_hash = conv.convertToTrits(signed_hash)
@@ -71,14 +73,13 @@ def squeeze(self, trits, offset=0, length=TRIT_HASH_LENGTH):
       stop = min(TRIT_HASH_LENGTH, length)
       trits[offset:stop] = trits_from_hash[0:stop]
 
-      flipped_bytes =\
-        binary_type([conv.convert_sign(~b) for b in unsigned_hash])
+      flipped_bytes = bytearray(conv.convert_sign(~b) for b in unsigned_hash)
 
       # Reset internal state before feeding back in
-      self._reset()
+      self.reset()
       self.k.update(flipped_bytes)
 
       offset += TRIT_HASH_LENGTH
 
-  def _reset(self):
+  def reset(self):
     self.k = keccak_384()

iota/crypto/kerl/pykerl_py2.py

@@ -9,9 +9,9 @@
 
 from sha3 import keccak_384
 
+from iota.crypto.kerl import Kerl
 from iota.crypto.kerl.conv import convertToBytes, convertToTrits, \
   trits_to_trytes, trytes_to_trits
-from iota.crypto.kerl import pykerl
 
 
 class TestKerl(TestCase):
@@ -35,7 +35,7 @@ def test_correct_first(self):
 
         trits = trytes_to_trits(inp)
 
-        kerl = pykerl.Kerl()
+        kerl = Kerl()
         kerl.absorb(trits)
         trits_out = []
         kerl.squeeze(trits_out)
@@ -59,7 +59,7 @@ def test_output_greater_243(self):
 
         trits = trytes_to_trits(inp)
 
-        kerl = pykerl.Kerl()
+        kerl = Kerl()
         kerl.absorb(trits)
         trits_out = []
         kerl.squeeze(trits_out, length=486)
@@ -85,7 +85,7 @@ def test_input_greater_243(self):
 
         trits = trytes_to_trits(inp)
 
-        kerl = pykerl.Kerl()
+        kerl = Kerl()
         kerl.absorb(trits)
         trits_out = []
         kerl.squeeze(trits_out, length=486)
@@ -133,7 +133,7 @@ def test_generate_trytes_hash(self):
 
                 trits = trytes_to_trits(trytes)
 
-                kerl = pykerl.Kerl()
+                kerl = Kerl()
                 kerl.absorb(trits)
                 trits_out = []
                 kerl.squeeze(trits_out)
@@ -167,7 +167,7 @@ def test_generate_multi_trytes_and_hash(self):
 
                 trits = trytes_to_trits(trytes)
 
-                kerl = pykerl.Kerl()
+                kerl = Kerl()
                 kerl.absorb(trits)
                 trits_out = []
                 kerl.squeeze(trits_out)
@@ -203,7 +203,7 @@ def test_generate_trytes_and_multi_squeeze(self):
 
                 trits = trytes_to_trits(trytes)
 
-                kerl = pykerl.Kerl()
+                kerl = Kerl()
                 kerl.absorb(trits)
 
                 trits_out = []