moved generateGenesis to BlockChain

Block.py

@@ -19,6 +19,15 @@ class MerkleTree:
     """
 
     def __init__(self, data):
+        """Takes a list of tx and calculates pairwise hashes until only one element remains
+        
+        Parameters:
+            data (list): List of tx
+
+        Sets:
+            self.data (nested list): List of original data and all lists of pairwise hashes
+        """
+
         def hash_data(data_a, data_b):
             hasher = hashlib.sha256()
             hasher.update(str(data_a).encode() + str(data_b).encode())
@@ -78,9 +87,4 @@ def hash_val(self):
         return hasher.hexdigest()
 
     def get_tx(self):
-        return self.data.data[0]
-
-
-#TODO: move to different module
-def generate_genesis():
-    return Block(["Genesis tx"], 0)
+        return self.data.data[0]

BlockChain.py

@@ -15,6 +15,11 @@
 
 #TODO: replace with netstats at some point
 
+
+def generate_genesis():
+    return Block.Block(['Genesis tx'], 0)
+
+
 if __name__ == "__main__":
     print('Blockchain Simulation: Distributed Object Ordering with Fairness\n')
     memory.append(Block.generate_genesis())

Consensus.py

@@ -6,7 +6,7 @@
 @author: jisu
 """
 
-import hashlib, Block, random
+import hashlib, Block, random, BlockChain
 
 random.seed(0)
 
@@ -111,7 +111,7 @@ def consensus_reached(proposals):
     ids = ['1', '2', '3']
     prios = ['top', 'normal', 'top']
     print(priority_sort(ids, prios))
-    gen = Block.generate_genesis()
+    gen = BlockChain.generate_genesis()
     print(consistency(gen, gen))
     test_block1 = Block.Block([1], 0)
     print(consistency(gen, test_block1))