Merge pull request #65 from tntech-ngin/fix/code-style

[FIX] Remove unused files and fix code style

.github/workflows/python-publish.yml

@@ -4,8 +4,6 @@ on:
  push:
  branches:
  - main
- tags:
- - 'v*'
 
 jobs:
  update-version:
@@ -106,12 +104,11 @@ jobs:
 
  publish-to-pypi:
  name: Publish Python 🐍 distribution 📦 to PyPI
- if: startsWith(github.ref, 'refs/tags/') # only publish to PyPI on tag pushes
  needs: build
  runs-on: ubuntu-latest
  environment:
  name: pypi
- url: https://pypi.org/p/ndn-hydra-repo # Replace <package-name> with your PyPI project name
+ url: https://pypi.org/p/ndn-hydra-repo # TODO: Replace <package-name> with our PyPI project name
  permissions:
  id-token: write # IMPORTANT: mandatory for trusted publishing
 

ndn_hydra/repo/group_messages/claim.py

@@ -15,14 +15,17 @@
 from ndn_hydra.repo.modules.global_view import GlobalView
 from ndn_hydra.repo.group_messages.specific_message import SpecificMessage
 
+
 class ClaimTypes:
  REQUEST = 1
  COMMITMENT = 2
+
+
 class ClaimMessageTypes:
  NODE_NAME = 84
  FAVOR = 86
 
- TYPE = 91 # 1=request; 2=commitment
+ TYPE = 91  # 1=request; 2=commitment
  CLAIMER_NODE_NAME = 92
  CLAIMER_NONCE = 93
  AUTHORIZER_NODE_NAME = 94
@@ -39,8 +42,9 @@ class ClaimMessageTlv(TlvModel):
  authorizer_node_name = BytesField(ClaimMessageTypes.AUTHORIZER_NODE_NAME)
  authorizer_nonce = BytesField(ClaimMessageTypes.AUTHORIZER_NONCE)
 
+
 class ClaimMessage(SpecificMessage):
- def __init__(self, nid:str, seqno:int, raw_bytes:bytes):
+ def __init__(self, nid: str, seqno: int, raw_bytes: bytes):
  super(ClaimMessage, self).__init__(nid, seqno)
  self.message = ClaimMessageTlv.parse(raw_bytes)
 
@@ -68,10 +72,12 @@ async def apply(self, global_view, data_storage, fetch_file, svs, config):
  if authorizer_node_name == config['node_name']:
  from .message import Message, MessageTypes
  commit = False
- if (len(backuped_bys) == 0) and (stored_bys[-1] == config['node_name']) and (authorizer_nonce == file['file_name']):
+ if (len(backuped_bys) == 0) and (stored_bys[-1] == config['node_name']) and (
+ authorizer_nonce == file['file_name']):
  global_view.add_backup(file_name, claimer_node_name, 0, claimer_nonce)
  commit = True
- if (len(backuped_bys) > 0) and (backuped_bys[-1]['node_name'] == config['node_name']) and (authorizer_nonce == backuped_bys[-1]['nonce']):
+ if (len(backuped_bys) > 0) and (backuped_bys[-1]['node_name'] == config['node_name']) and (
+ authorizer_nonce == backuped_bys[-1]['nonce']):
  global_view.add_backup(file_name, claimer_node_name, len(backuped_bys), claimer_nonce)
  commit = True
  if commit == True:
@@ -89,4 +95,4 @@ async def apply(self, global_view, data_storage, fetch_file, svs, config):
  self.logger.info(f"\n[MSG][CLAIM.C]*"
  f"\n\tClaimer name={claimer_node_name};"
  f"\n\tfile={file_name}")
- global_view.update_node(node_name, favor, self.seqno)
+ global_view.update_node(node_name, favor, self.seqno)

ndn_hydra/repo/group_messages/remove.py

@@ -15,16 +15,20 @@
 from ndn_hydra.repo.group_messages.specific_message import SpecificMessage
 from ndn_hydra.repo.modules.file_remover import remove_file
 
+
 class RemoveMessageTypes:
  NODE_NAME = 84
  FAVOR = 86
+
+
 class RemoveMessageTlv(TlvModel):
  node_name = BytesField(RemoveMessageTypes.NODE_NAME)
  favor = BytesField(RemoveMessageTypes.FAVOR)
  file_name = NameField()
 
+
 class RemoveMessage(SpecificMessage):
- def __init__(self, nid:str, seqno:int, raw_bytes:bytes):
+ def __init__(self, nid: str, seqno: int, raw_bytes: bytes):
  super(RemoveMessage, self).__init__(nid, seqno)
  self.message = RemoveMessageTlv.parse(raw_bytes)
 
@@ -44,4 +48,4 @@ async def apply(self, global_view, data_storage, fetch_file, svs, config):
  if config['node_name'] in file['stores']:
  remove_file(data_storage, file)
 
- global_view.update_node(node_name, float(self.message.favor.tobytes().decode()), self.seqno)
+ global_view.update_node(node_name, float(self.message.favor.tobytes().decode()), self.seqno)

ndn_hydra/repo/group_messages/specific_message.py

@@ -11,6 +11,7 @@
 from ndn_hydra.repo.modules.global_view import GlobalView
 import logging
 
+
 class SpecificMessage:
  def __init__(self, nid:str, seqno:int) -> None:
  self.nid, self.seqno, self.logger = nid, seqno, logging.getLogger()

ndn_hydra/repo/group_messages/store.py

@@ -13,16 +13,20 @@
 from ndn_hydra.repo.group_messages.specific_message import SpecificMessage
 from ndn_hydra.repo.modules.global_view import GlobalView
 
+
 class StoreMessageTypes:
  NODE_NAME = 84
  FAVOR = 86
+
+
 class StoreMessageTlv(TlvModel):
  node_name = BytesField(StoreMessageTypes.NODE_NAME)
  favor = BytesField(StoreMessageTypes.FAVOR)
  file_name = NameField()
 
+
 class StoreMessage(SpecificMessage):
- def __init__(self, nid:str, seqno:int, raw_bytes:bytes):
+ def __init__(self, nid: str, seqno: int, raw_bytes: bytes):
  super(StoreMessage, self).__init__(nid, seqno)
  self.message = StoreMessageTlv.parse(raw_bytes)
 
@@ -40,4 +44,4 @@ async def apply(self, global_view, data_storage, fetch_file, svs, config):
  else:
  global_view.store_file(file_name, node_name)
 
- global_view.update_node(node_name, float(self.message.favor.tobytes().decode()), self.seqno)
+ global_view.update_node(node_name, float(self.message.favor.tobytes().decode()), self.seqno)

ndn_hydra/repo/group_messages/update.py

@@ -13,19 +13,22 @@
 from ndn_hydra.repo.modules.global_view import GlobalView
 from ndn_hydra.repo.group_messages.specific_message import SpecificMessage
 
+
 class UpdateMessageTypes:
  NODE_NAME = 84
  FAVOR = 86
  EXPIRATION_DATE = 95
 
+
 class UpdateMessageTlv(TlvModel):
  node_name = BytesField(UpdateMessageTypes.NODE_NAME)
  favor = BytesField(UpdateMessageTypes.FAVOR)
  file_name = NameField()
  expiration_time = UintField(UpdateMessageTypes.EXPIRATION_DATE)
 
+
 class UpdateMessage(SpecificMessage):
- def __init__(self, nid:str, seqno:int, raw_bytes:bytes):
+ def __init__(self, nid: str, seqno: int, raw_bytes: bytes):
  super(UpdateMessage, self).__init__(nid, seqno)
  self.message = UpdateMessageTlv.parse(raw_bytes)
 
@@ -42,4 +45,4 @@ async def apply(self, global_view, data_storage, fetch_file, svs, config):
  else:
  global_view.update_file(file_name, expiration_time)
 
- global_view.update_node(node_name, float(self.message.favor.tobytes().decode()), self.seqno)
+ global_view.update_node(node_name, float(self.message.favor.tobytes().decode()), self.seqno)