test: Change MuHash Python implementation to match cpp version again

fjahr · fjahr · commit 9815332d5158 · 2020-12-22T01:48:34.000+01:00
diff --git a/test/functional/test_framework/muhash.py b/test/functional/test_framework/muhash.py
@@ -78,11 +78,13 @@ def __init__(self):
 
     def insert(self, data):
         """Insert a byte array data in the set."""
-        self.numerator = (self.numerator * data_to_num3072(data)) % self.MODULUS
+        data_hash = hashlib.sha256(data).digest()
+        self.numerator = (self.numerator * data_to_num3072(data_hash)) % self.MODULUS
 
     def remove(self, data):
         """Remove a byte array from the set."""
-        self.denominator = (self.denominator * data_to_num3072(data)) % self.MODULUS
+        data_hash = hashlib.sha256(data).digest()
+        self.denominator = (self.denominator * data_to_num3072(data_hash)) % self.MODULUS
 
     def digest(self):
         """Extract the final hash. Does not modify this object."""
@@ -93,12 +95,12 @@ def digest(self):
 class TestFrameworkMuhash(unittest.TestCase):
     def test_muhash(self):
         muhash = MuHash3072()
-        muhash.insert([0]*32)
-        muhash.insert([1] + [0]*31)
-        muhash.remove([2] + [0]*31)
+        muhash.insert(b'\x00' * 32)
+        muhash.insert((b'\x01' + b'\x00' * 31))
+        muhash.remove((b'\x02' + b'\x00' * 31))
         finalized = muhash.digest()
         # This mirrors the result in the C++ MuHash3072 unit test
-        self.assertEqual(finalized[::-1].hex(), "a44e16d5e34d259b349af21c06e65d653915d2e208e4e03f389af750dc0bfdc3")
+        self.assertEqual(finalized[::-1].hex(), "10d312b100cbd32ada024a6646e40d3482fcff103668d2625f10002a607d5863")
 
     def test_chacha20(self):
         def chacha_check(key, result):
