diff --git a/src/solana/_layouts/vote_instructions.py b/src/solana/_layouts/vote_instructions.py index fb475c34..4dafcffc 100644 --- a/src/solana/_layouts/vote_instructions.py +++ b/src/solana/_layouts/vote_instructions.py @@ -1,5 +1,4 @@ """Byte layouts for vote program instructions.""" - from enum import IntEnum from construct import ( diff --git a/src/solana/exceptions.py b/src/solana/exceptions.py index 1ffa377e..a868cce7 100644 --- a/src/solana/exceptions.py +++ b/src/solana/exceptions.py @@ -1,5 +1,4 @@ """Exceptions native to solana-py.""" - from typing import Any, Callable diff --git a/src/solana/rpc/api.py b/src/solana/rpc/api.py index 4f7a41ee..5a130d0b 100644 --- a/src/solana/rpc/api.py +++ b/src/solana/rpc/api.py @@ -1,5 +1,4 @@ """API client to interact with the Solana JSON RPC Endpoint.""" # pylint: disable=too-many-lines - from __future__ import annotations from time import sleep, time diff --git a/src/solana/rpc/async_api.py b/src/solana/rpc/async_api.py index 85be235d..62ad9c49 100644 --- a/src/solana/rpc/async_api.py +++ b/src/solana/rpc/async_api.py @@ -1,5 +1,4 @@ """Async API client to interact with the Solana JSON RPC Endpoint.""" # pylint: disable=too-many-lines - import asyncio from time import time from typing import Dict, List, Optional, Sequence, Union diff --git a/src/solana/rpc/commitment.py b/src/solana/rpc/commitment.py index e3bfb8cf..b0f9dbbe 100644 --- a/src/solana/rpc/commitment.py +++ b/src/solana/rpc/commitment.py @@ -4,7 +4,6 @@ In descending order of commitment (most finalized to least finalized), clients may specify: """ - from typing import NewType Commitment = NewType("Commitment", str) diff --git a/src/solana/rpc/providers/async_base.py b/src/solana/rpc/providers/async_base.py index 85bc01be..fd144338 100644 --- a/src/solana/rpc/providers/async_base.py +++ b/src/solana/rpc/providers/async_base.py @@ -1,5 +1,4 @@ """Async base RPC Provider.""" - from typing import Type from solders.rpc.requests import Body diff --git a/src/solana/rpc/providers/async_http.py b/src/solana/rpc/providers/async_http.py index 4c50f286..e86ba566 100644 --- a/src/solana/rpc/providers/async_http.py +++ b/src/solana/rpc/providers/async_http.py @@ -1,5 +1,4 @@ """Async HTTP RPC Provider.""" - from typing import Dict, Optional, Tuple, Type, overload import httpx diff --git a/src/solana/rpc/providers/base.py b/src/solana/rpc/providers/base.py index fc9584ad..be58fcc1 100644 --- a/src/solana/rpc/providers/base.py +++ b/src/solana/rpc/providers/base.py @@ -1,5 +1,4 @@ """Base RPC Provider.""" - from solders.rpc.requests import Body from typing_extensions import Type diff --git a/src/solana/rpc/providers/core.py b/src/solana/rpc/providers/core.py index 5ad7adb0..0be1a350 100644 --- a/src/solana/rpc/providers/core.py +++ b/src/solana/rpc/providers/core.py @@ -1,5 +1,4 @@ """Helper code for HTTP provider classes.""" - import itertools import logging import os diff --git a/src/solana/rpc/providers/http.py b/src/solana/rpc/providers/http.py index 2d2ec918..f6757e97 100644 --- a/src/solana/rpc/providers/http.py +++ b/src/solana/rpc/providers/http.py @@ -1,5 +1,4 @@ """HTTP RPC Provider.""" - from typing import Tuple, Type, overload import httpx diff --git a/src/solana/rpc/types.py b/src/solana/rpc/types.py index 6036e370..17e834e9 100644 --- a/src/solana/rpc/types.py +++ b/src/solana/rpc/types.py @@ -1,5 +1,4 @@ """RPC types.""" - from typing import NamedTuple, NewType, Optional from solders.pubkey import Pubkey diff --git a/src/solana/transaction.py b/src/solana/transaction.py index dbcd178c..b7525262 100644 --- a/src/solana/transaction.py +++ b/src/solana/transaction.py @@ -1,5 +1,4 @@ """Library to package an atomic sequence of instructions to a transaction.""" - from __future__ import annotations from typing import Any, List, NamedTuple, Optional, Sequence, Tuple, Union diff --git a/src/solana/utils/security_txt.py b/src/solana/utils/security_txt.py index 7f8ef81d..6c226364 100644 --- a/src/solana/utils/security_txt.py +++ b/src/solana/utils/security_txt.py @@ -1,5 +1,6 @@ """Utils for security.txt.""" + from dataclasses import dataclass, fields from typing import Any, List, Optional diff --git a/src/solana/utils/validate.py b/src/solana/utils/validate.py index 0f0ab4f6..ee83c584 100644 --- a/src/solana/utils/validate.py +++ b/src/solana/utils/validate.py @@ -1,5 +1,4 @@ """Validation utilities.""" - from __future__ import annotations from enum import IntEnum diff --git a/src/solana/vote_program.py b/src/solana/vote_program.py index 875445a9..e1f5f1a8 100644 --- a/src/solana/vote_program.py +++ b/src/solana/vote_program.py @@ -1,5 +1,4 @@ """Library to interface with the vote program.""" - from __future__ import annotations from typing import NamedTuple diff --git a/src/spl/memo/constants.py b/src/spl/memo/constants.py index 23c65edd..07f41cc8 100644 --- a/src/spl/memo/constants.py +++ b/src/spl/memo/constants.py @@ -1,5 +1,4 @@ """Memo program constants.""" - from solders.pubkey import Pubkey MEMO_PROGRAM_ID: Pubkey = Pubkey.from_string("MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr") diff --git a/src/spl/memo/instructions.py b/src/spl/memo/instructions.py index eebefc59..8313804f 100644 --- a/src/spl/memo/instructions.py +++ b/src/spl/memo/instructions.py @@ -1,5 +1,4 @@ """Memo program instructions.""" - from __future__ import annotations from typing import NamedTuple diff --git a/src/spl/token/_layouts.py b/src/spl/token/_layouts.py index 7dcc1269..f9228f17 100644 --- a/src/spl/token/_layouts.py +++ b/src/spl/token/_layouts.py @@ -1,5 +1,4 @@ """Token instruction layouts.""" - from enum import IntEnum from construct import Bytes, Int8ul, Int32ul, Int64ul, Pass, Switch diff --git a/src/spl/token/instructions.py b/src/spl/token/instructions.py index e420ea67..705d5ece 100644 --- a/src/spl/token/instructions.py +++ b/src/spl/token/instructions.py @@ -326,9 +326,9 @@ def decode_initialize_mint(instruction: Instruction) -> InitializeMintParams: program_id=instruction.program_id, mint=instruction.accounts[0].pubkey, mint_authority=Pubkey(parsed_data.args.mint_authority), - freeze_authority=( - Pubkey(parsed_data.args.freeze_authority) if parsed_data.args.freeze_authority_option else None - ), + freeze_authority=Pubkey(parsed_data.args.freeze_authority) + if parsed_data.args.freeze_authority_option + else None, ) diff --git a/tests/conftest.py b/tests/conftest.py index 79395e8a..6cdd699d 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,5 +1,4 @@ """Fixtures for pytest.""" - import asyncio import time from typing import NamedTuple diff --git a/tests/integration/test_async_http_client.py b/tests/integration/test_async_http_client.py index 9d15f9c7..babd7bc7 100644 --- a/tests/integration/test_async_http_client.py +++ b/tests/integration/test_async_http_client.py @@ -1,5 +1,4 @@ """Tests for the HTTP API Client.""" - from typing import Tuple import pytest @@ -541,8 +540,8 @@ async def test_batch_request(test_http_client_async: AsyncClient): parsers = (GetBlockHeightResp, GetFirstAvailableBlockResp) resp: Tuple[ Resp[GetBlockHeightResp], Resp[GetFirstAvailableBlockResp] - ] = await test_http_client_async._provider.make_batch_request( + ] = await test_http_client_async._provider.make_batch_request( # pylint: disable=protected-access reqs, parsers - ) # pylint: disable=protected-access + ) assert_valid_response(resp[0]) assert_valid_response(resp[1]) diff --git a/tests/integration/test_http_client.py b/tests/integration/test_http_client.py index d67d7a35..d947281b 100644 --- a/tests/integration/test_http_client.py +++ b/tests/integration/test_http_client.py @@ -1,5 +1,4 @@ """Tests for the HTTP API Client.""" - from typing import Tuple import pytest @@ -525,8 +524,8 @@ def test_batch_request(test_http_client: Client): parsers = (GetBlockHeightResp, GetFirstAvailableBlockResp) resp: Tuple[ Resp[GetBlockHeightResp], Resp[GetFirstAvailableBlockResp] - ] = test_http_client._provider.make_batch_request( + ] = test_http_client._provider.make_batch_request( # pylint: disable=protected-access reqs, parsers - ) # pylint: disable=protected-access + ) assert_valid_response(resp[0]) assert_valid_response(resp[1]) diff --git a/tests/integration/test_memo.py b/tests/integration/test_memo.py index bdc72149..1c7b3446 100644 --- a/tests/integration/test_memo.py +++ b/tests/integration/test_memo.py @@ -1,5 +1,4 @@ """Tests for the Memo program.""" - import pytest from solders.keypair import Keypair from solders.transaction_status import ParsedInstruction diff --git a/tests/unit/test_async_client.py b/tests/unit/test_async_client.py index 1b14f8ff..d413e302 100644 --- a/tests/unit/test_async_client.py +++ b/tests/unit/test_async_client.py @@ -1,5 +1,4 @@ """Test async client.""" - from unittest.mock import patch import pytest diff --git a/tests/unit/test_client.py b/tests/unit/test_client.py index 74645750..07e0b0ea 100644 --- a/tests/unit/test_client.py +++ b/tests/unit/test_client.py @@ -1,5 +1,4 @@ """Test sync client.""" - from unittest.mock import patch import pytest diff --git a/tests/unit/test_spl_token_instructions.py b/tests/unit/test_spl_token_instructions.py index c74eb25b..f3a12132 100644 --- a/tests/unit/test_spl_token_instructions.py +++ b/tests/unit/test_spl_token_instructions.py @@ -1,5 +1,4 @@ """Unit tests for SPL-token instructions.""" - import spl.token.instructions as spl_token from solders.pubkey import Pubkey from spl.token.constants import TOKEN_PROGRAM_ID, WRAPPED_SOL_MINT diff --git a/tests/unit/test_transaction.py b/tests/unit/test_transaction.py index 2e24b9a1..17bb82fa 100644 --- a/tests/unit/test_transaction.py +++ b/tests/unit/test_transaction.py @@ -1,5 +1,4 @@ """Unit tests for solana.transaction.""" - from base64 import b64decode, b64encode import pytest diff --git a/tests/unit/test_vote_program.py b/tests/unit/test_vote_program.py index 6f6d3b06..ec8c1a48 100644 --- a/tests/unit/test_vote_program.py +++ b/tests/unit/test_vote_program.py @@ -1,5 +1,4 @@ """Unit tests for solana.vote_program.""" - import base64 from solders.hash import Hash