Add ruff and update

Chia-Network · Dec 19, 2024 · da4f652 · da4f652
1 parent 6c61d17
commit da4f652
Show file tree

Hide file tree

Showing 10 changed files with 198 additions and 179 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,18 +1,6 @@
 repos:
--   repo: local
-    hooks:
-    -   id: isort
-        name: isort
-        entry: isort
-        require_serial: true
-        language: python
-        language_version: python3
-        types_or: [cython, pyi, python]
-        args: ['--filter-files']
-        minimum_pre_commit_version: '2.9.2'
-        additional_dependencies: [isort==5.13.2]
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+    rev: v5.0.0
     hooks:
     -   id: check-yaml
     -   id: end-of-file-fixer
@@ -21,18 +9,26 @@ repos:
     -   id: check-merge-conflict
     -   id: check-ast
     -   id: debug-statements
--   repo: https://github.com/psf/black
-    rev: 24.4.2
-    hooks:
-    -   id: black
--   repo: https://github.com/pycqa/flake8
-    rev: 7.0.0
+-   repo: local
     hooks:
-    - id: flake8
+      - id: ruff_format
+        name: ruff format
+        entry: ruff format
+        language: system
+        require_serial: true
+        types_or: [python, pyi]
+
 -   repo: local
     hooks:
     -   id: mypy
         name: mypy
         entry: mypy
         language: system
         pass_filenames: false
+-   repo: local
+    hooks:
+      - id: ruff
+        name: Ruff
+        entry: ruff check --fix
+        language: system
+        types: [python]
diff --git a/chianft/__init__.py b/chianft/__init__.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from pkg_resources import DistributionNotFound, get_distribution
 
 try:

diff --git a/chianft/cmds/cli.py b/chianft/cmds/cli.py
@@ -120,9 +120,7 @@ def create_spend_bundles_cmd(
     """
 
     async def do_command() -> None:
-        maybe_clients = await get_node_and_wallet_clients(
-            node_rpc_port, wallet_rpc_port, fingerprint
-        )
+        maybe_clients = await get_node_and_wallet_clients(node_rpc_port, wallet_rpc_port, fingerprint)
         if maybe_clients is None:
             print("Failed to connect to wallet and node")
             return
@@ -145,7 +143,7 @@ async def do_command() -> None:
             )
             with open(bundle_output, "wb") as f:
                 pickle.dump(spend_bundles, f)
-            print("Successfully created {} spend bundles".format(len(spend_bundles)))
+            print(f"Successfully created {len(spend_bundles)} spend bundles")
         finally:
             node_client.close()
             wallet_client.close()
@@ -205,9 +203,7 @@ def submit_spend_bundles_cmd(
     """
 
     async def do_command() -> None:
-        maybe_clients = await get_node_and_wallet_clients(
-            node_rpc_port, wallet_rpc_port, fingerprint
-        )
+        maybe_clients = await get_node_and_wallet_clients(node_rpc_port, wallet_rpc_port, fingerprint)
         if maybe_clients is None:
             print("Failed to connect to wallet and node")
             return
@@ -224,9 +220,7 @@ async def do_command() -> None:
                 spends.append(SpendBundle.from_bytes(spend_bytes))
 
             minter = Minter(wallet_client, node_client)
-            await minter.submit_spend_bundles(
-                spends, fee, create_sell_offer=create_sell_offer
-            )
+            await minter.submit_spend_bundles(spends, fee, create_sell_offer=create_sell_offer)
 
         finally:
             node_client.close()

diff --git a/chianft/util/clients.py b/chianft/util/clients.py
@@ -1,5 +1,7 @@
+from __future__ import annotations
+
 from pprint import pprint
-from typing import Optional, Tuple
+from typing import Optional
 
 import aiohttp
 
@@ -25,9 +27,7 @@ async def get_node_client(
         return full_node_client
     except Exception as e:
         if isinstance(e, aiohttp.ClientConnectorError):
-            pprint(
-                f"Connection error. Check if full node is running at {full_node_rpc_port}"
-            )
+            pprint(f"Connection error. Check if full node is running at {full_node_rpc_port}")
         else:
             pprint(f"Exception from 'full node' {e}")
         return None
@@ -41,9 +41,7 @@ async def get_wallet_client(
             config = load_config(DEFAULT_ROOT_PATH, "config.yaml")
             self_hostname = config["self_hostname"]
             wallet_rpc_port = config["wallet"]["rpc_port"]
-        wallet_client = await WalletRpcClient.create(
-            self_hostname, uint16(wallet_rpc_port), DEFAULT_ROOT_PATH, config
-        )
+        wallet_client = await WalletRpcClient.create(self_hostname, uint16(wallet_rpc_port), DEFAULT_ROOT_PATH, config)
         return wallet_client
     except Exception as e:
         if isinstance(e, aiohttp.ClientConnectorError):
@@ -57,7 +55,7 @@ async def get_node_and_wallet_clients(
     full_node_rpc_port: Optional[int],
     wallet_rpc_port: Optional[int],
     fingerprint: Optional[int],
-) -> Optional[Tuple[Optional[FullNodeRpcClient], Optional[WalletRpcClient]]]:
+) -> Optional[tuple[Optional[FullNodeRpcClient], Optional[WalletRpcClient]]]:
     try:
         full_node_client = await get_node_client(full_node_rpc_port)
         wallet_client = await get_wallet_client(wallet_rpc_port)
@@ -76,8 +74,4 @@ async def get_node_and_wallet_clients(
 def get_additional_data() -> bytes:
     config = load_config(DEFAULT_ROOT_PATH, "config.yaml")
     selected_network = config["farmer"]["selected_network"]
-    return bytes.fromhex(
-        config["farmer"]["network_overrides"]["constants"][selected_network][
-            "GENESIS_CHALLENGE"
-        ]
-    )
+    return bytes.fromhex(config["farmer"]["network_overrides"]["constants"][selected_network]["GENESIS_CHALLENGE"])