work on onboarding and pep8 compliance. re-worded about

src/onionrblocks/blockimporter.py

@@ -3,6 +3,17 @@
 
     Import block data and save it
 '''
+from onionrexceptions import BlacklistedBlock
+from onionrexceptions import DiskAllocationReached
+from onionrexceptions import InvalidProof
+import logger
+from onionrutils import validatemetadata
+from onionrutils import blockmetadata
+from coredb import blockmetadb
+import onionrstorage
+import onionrcrypto as crypto
+from . import onionrblacklist
+
 '''
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,39 +28,41 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 '''
-import onionrexceptions, logger
-from onionrutils import validatemetadata, blockmetadata
-from coredb import blockmetadb
-from . import onionrblacklist
-import onionrstorage
-import onionrcrypto as crypto
-def importBlockFromData(content):
+
+
+def import_block_from_data(content):
     blacklist = onionrblacklist.OnionrBlackList()
-    retData = False
+    ret_data = False
 
     try:
         content = content.encode()
     except AttributeError:
         pass
 
-    dataHash = crypto.hashers.sha3_hash(content)
+    data_hash = crypto.hashers.sha3_hash(content)
 
-    if blacklist.inBlacklist(dataHash):
-        raise onionrexceptions.BlacklistedBlock('%s is a blacklisted block' % (dataHash,))
+    if blacklist.inBlacklist(data_hash):
+        raise BlacklistedBlock(f'%s is a blacklisted block {data_hash}')
 
-    metas = blockmetadata.get_block_metadata_from_data(content) # returns tuple(metadata, meta), meta is also in metadata
+    # returns tuple(metadata, meta), meta is also in metadata
+    metas = blockmetadata.get_block_metadata_from_data(content)
     metadata = metas[0]
-    if validatemetadata.validate_metadata(metadata, metas[2]): # check if metadata is valid
-        if crypto.cryptoutils.verify_POW(content): # check if POW is enough/correct
-            logger.info('Imported block passed proof, saving.', terminal=True)
+
+    # check if metadata is valid
+    if validatemetadata.validate_metadata(metadata, metas[2]):
+        # check if POW is enough/correct
+        if crypto.cryptoutils.verify_POW(content):
+            logger.info(f'Imported block passed proof, saving: {data_hash}.',
+                        terminal=True)
             try:
                 blockHash = onionrstorage.set_data(content)
-            except onionrexceptions.DiskAllocationReached:
+            except DiskAllocationReached:
                 logger.warn('Failed to save block due to full disk allocation')
             else:
                 blockmetadb.add_to_block_DB(blockHash, dataSaved=True)
-                blockmetadata.process_block_metadata(blockHash) # caches block metadata values to block database
-                retData = True
+                # caches block metadata values to block database
+                blockmetadata.process_block_metadata(blockHash)
+                ret_data = True
         else:
-            raise onionrexceptions.InvalidProof
-    return retData
+            raise InvalidProof
+    return ret_data