Fix block

Author: 15Dkatz

backend/blockchain/block.py

@@ -1,10 +1,6 @@
 import time
 
 from backend.util.crypto_hash import crypto_hash
-<<<<<<< HEAD
-=======
-from backend.util.hex_to_binary import hex_to_binary
->>>>>>> a77fccd... Complete proof of work section
 from backend.config import MINE_RATE
 
 GENESIS_DATA = {
@@ -29,12 +25,6 @@ def __init__(self, timestamp, last_hash, hash, data, difficulty, nonce):
         self.difficulty = difficulty
         self.nonce = nonce
 
-<<<<<<< HEAD
-    def add_block(self, data):
-        self.chain.append(Block(data))
-
-=======
->>>>>>> a77fccd... Complete proof of work section
     def __repr__(self):
         return (
             'Block('
@@ -58,7 +48,7 @@ def mine_block(last_block, data):
         nonce = 0
         hash = crypto_hash(timestamp, last_hash, data, difficulty, nonce)
 
-        while hex_to_binary(hash)[0:difficulty] != '0' * difficulty:
+        while hash[0:difficulty] != '0' * difficulty:
             nonce += 1
             timestamp = time.time_ns()
             difficulty = Block.adjust_difficulty(last_block, timestamp)
@@ -77,8 +67,8 @@ def genesis():
     def adjust_difficulty(last_block, new_timestamp):
         """
         Calculate the adjusted difficulty according to the MINE_RATE.
-        Decrease the difficulty for slowly mined blocks.
         Increase the difficulty for quickly mined blocks.
+        Decrease the difficulty for slowly mined blocks.
         """
         if (new_timestamp - last_block.timestamp) < MINE_RATE:
             return last_block.difficulty + 1
@@ -91,14 +81,7 @@ def adjust_difficulty(last_block, new_timestamp):
 def main():
     genesis_block = Block.genesis()
     block = Block.mine_block(genesis_block, 'foo')
-<<<<<<< HEAD
-    print(f'block: {block}')
-
-if __name__ == '__main__':
-    main()
-=======
     print(block)
 
 if __name__ == '__main__':
     main()
->>>>>>> a77fccd... Complete proof of work section