Merge pull request #22 from starkbank/refactor/details

Refactor details in code structure

Author: cdottori-stark

ellipticcurve/ecdsa.py

@@ -1,10 +1,9 @@
 from hashlib import sha256
-from .utils.compatibility import toBytes
 from .signature import Signature
 from .math import Math
 from .utils.binary import BinaryAscii
 from .utils.integer import RandomInteger
-from .utils.compatibility import toBytes
+from .utils.compatibility import *
 
 
 class Ecdsa:
@@ -14,15 +13,17 @@ def sign(cls, message, privateKey, hashfunc=sha256):
         hashMessage = hashfunc(toBytes(message)).digest()
         numberMessage = BinaryAscii.numberFromString(hashMessage)
         curve = privateKey.curve
+
         r, s, randSignPoint = 0, 0, None
-        while  r == 0 or s == 0:
+        while r == 0 or s == 0:
             randNum = RandomInteger.between(1, curve.N - 1)
             randSignPoint = Math.multiply(curve.G, n=randNum, A=curve.A, P=curve.P, N=curve.N)
             r = randSignPoint.x % curve.N
             s = ((numberMessage + r * privateKey.secret) * (Math.inv(randNum, curve.N))) % curve.N
         recoveryId = randSignPoint.y & 1
         if randSignPoint.y > curve.N:
             recoveryId += 2
+
         return Signature(r=r, s=s, recoveryId=recoveryId)
 
     @classmethod

ellipticcurve/signature.py

@@ -1,5 +1,4 @@
 from .utils.compatibility import *
-from .utils.compatibility import intTypes
 from .utils.base import Base64
 from .utils.binary import BinaryAscii
 from .utils.der import encodeSequence, encodeInteger, removeSequence, removeInteger
@@ -10,16 +9,16 @@ class Signature:
     def __init__(self, r, s, recoveryId=None):
         self.r = r
         self.s = s
-        self.recid = recoveryId
+        self.recoveryId = recoveryId
 
     def toDer(self, withRecoveryId=False):
         encodedSequence = encodeSequence(encodeInteger(self.r), encodeInteger(self.s))
         if not withRecoveryId:
             return encodedSequence
-        return chr(27 + self.recid) + encodedSequence
+        return chr(27 + self.recoveryId) + encodedSequence
 
     def toBase64(self, withRecoveryId=False):
-        return toString(Base64.encode(toBytes(self.toDer(withRecoveryId))))
+        return toString(Base64.encode(toBytes(self.toDer(withRecoveryId=withRecoveryId))))
 
     @classmethod
     def fromDer(cls, string, recoveryByte=False):
@@ -28,6 +27,7 @@ def fromDer(cls, string, recoveryByte=False):
             recoveryId = string[0] if isinstance(string[0], intTypes) else ord(string[0])
             recoveryId -= 27
             string = string[1:]
+
         rs, empty = removeSequence(string)
         if len(empty) != 0:
             raise Exception("trailing junk after DER signature: %s" % BinaryAscii.hexFromBinary(empty))
@@ -36,7 +36,8 @@ def fromDer(cls, string, recoveryByte=False):
         s, empty = removeInteger(rest)
         if len(empty) != 0:
             raise Exception("trailing junk after DER numbers: %s" % BinaryAscii.hexFromBinary(empty))
-        return Signature(r, s, recoveryId)
+
+        return Signature(r=r, s=s, recoveryId=recoveryId)
 
     @classmethod
     def fromBase64(cls, string, recoveryByte=False):

tests/testSignatureWithRecoveryId.py

@@ -20,7 +20,7 @@ def testDerConversion(self):
 
         self.assertEqual(signature1.r, signature2.r)
         self.assertEqual(signature1.s, signature2.s)
-        self.assertEqual(signature1.recid, signature2.recid)
+        self.assertEqual(signature1.recoveryId, signature2.recoveryId)
 
     def testBase64Conversion(self):
         privateKey = PrivateKey()
@@ -34,4 +34,4 @@ def testBase64Conversion(self):
 
         self.assertEqual(signature1.r, signature2.r)
         self.assertEqual(signature1.s, signature2.s)
-        self.assertEqual(signature1.recid, signature2.recid)
+        self.assertEqual(signature1.recoveryId, signature2.recoveryId)