Skip to content

Commit

Permalink
Black formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
gabedonnan committed Jan 4, 2024
1 parent ebab69a commit b2450af
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 47 deletions.
58 changes: 21 additions & 37 deletions pythereum/dclasses.py
Original file line number Diff line number Diff line change
Expand Up @@ -480,81 +480,65 @@ class TransactionFull:
"""

block_hash: HexStr | None = field(
default=None,
metadata=config(decoder=hex_decoder, encoder=hex_encoder)
default=None, metadata=config(decoder=hex_decoder, encoder=hex_encoder)
)
block_number: int | None = field(
default=None,
metadata=config(decoder=hex_int_decoder, encoder=hex_int_encoder)
default=None, metadata=config(decoder=hex_int_decoder, encoder=hex_int_encoder)
)
from_address: HexStr | None = field(
default=None,
metadata=config(field_name="from", decoder=hex_decoder, encoder=hex_encoder)
metadata=config(field_name="from", decoder=hex_decoder, encoder=hex_encoder),
)
gas: int | None = field(
default=None,
metadata=config(decoder=hex_int_decoder, encoder=hex_int_encoder)
default=None, metadata=config(decoder=hex_int_decoder, encoder=hex_int_encoder)
)
gas_price: int | None = field(
default=None,
metadata=config(decoder=hex_int_decoder, encoder=hex_int_encoder)
default=None, metadata=config(decoder=hex_int_decoder, encoder=hex_int_encoder)
)
max_fee_per_gas: int | None = field(
default=None,
metadata=config(decoder=hex_int_decoder, encoder=hex_int_encoder)
default=None, metadata=config(decoder=hex_int_decoder, encoder=hex_int_encoder)
)
max_priority_fee_per_gas: int | None = field(
default=None,
metadata=config(decoder=hex_int_decoder, encoder=hex_int_encoder)
default=None, metadata=config(decoder=hex_int_decoder, encoder=hex_int_encoder)
)
hash: HexStr | None = field(
default=None,
metadata=config(decoder=hex_decoder, encoder=hex_encoder)
default=None, metadata=config(decoder=hex_decoder, encoder=hex_encoder)
)
input: HexStr | None = field(
default=None,
metadata=config(decoder=hex_decoder, encoder=hex_encoder)
default=None, metadata=config(decoder=hex_decoder, encoder=hex_encoder)
)
nonce: int | None = field(
default=None,
metadata=config(decoder=hex_int_decoder, encoder=hex_int_encoder)
default=None, metadata=config(decoder=hex_int_decoder, encoder=hex_int_encoder)
)
to_address: HexStr | None = field(
default=None,
metadata=config(field_name="to", decoder=hex_decoder, encoder=hex_encoder)
metadata=config(field_name="to", decoder=hex_decoder, encoder=hex_encoder),
)
transaction_index: int | None = field(
default=None,
metadata=config(decoder=hex_int_decoder, encoder=hex_int_encoder)
default=None, metadata=config(decoder=hex_int_decoder, encoder=hex_int_encoder)
)
value: int | None = field(
default=None,
metadata=config(decoder=hex_int_decoder, encoder=hex_int_encoder)
default=None, metadata=config(decoder=hex_int_decoder, encoder=hex_int_encoder)
)
type: int | None = field(
default=None,
metadata=config(decoder=hex_int_decoder, encoder=hex_int_encoder)
default=None, metadata=config(decoder=hex_int_decoder, encoder=hex_int_encoder)
)
access_list: list["Access"] | None = field(
metadata=config(decoder=access_list_decoder, encoder=access_list_encoder),
default_factory=list
default_factory=list,
)
chain_id: int | None = field(
default=None,
metadata=config(decoder=hex_int_decoder, encoder=hex_int_encoder)
default=None, metadata=config(decoder=hex_int_decoder, encoder=hex_int_encoder)
)
v: int | None = field(
default=None,
metadata=config(decoder=hex_int_decoder, encoder=hex_int_encoder)
default=None, metadata=config(decoder=hex_int_decoder, encoder=hex_int_encoder)
)
r: HexStr | None = field(
default=None,
metadata=config(decoder=hex_decoder, encoder=hex_encoder)
)
default=None, metadata=config(decoder=hex_decoder, encoder=hex_encoder)
)
s: HexStr | None = field(
default=None,
metadata=config(decoder=hex_decoder, encoder=hex_encoder)
)
default=None, metadata=config(decoder=hex_decoder, encoder=hex_encoder)
)


@dataclass_json(letter_case=LetterCase.CAMEL)
Expand Down
18 changes: 10 additions & 8 deletions pythereum/rpc.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@
Transaction,
TransactionFull,
FeeHistory,
Proof, MempoolInfo,
Proof,
MempoolInfo,
)


Expand Down Expand Up @@ -233,7 +234,9 @@ def __init__(
"""
self._id = 0
if use_socket_pool:
self._pool = WebsocketPool(url, pool_size, connection_max_payload_size, connection_timeout)
self._pool = WebsocketPool(
url, pool_size, connection_max_payload_size, connection_timeout
)
else:
self._pool = None
self.session = ClientSession()
Expand Down Expand Up @@ -1378,13 +1381,15 @@ async def get_mempool_parity(
self,
tx_limit: int,
tx_filter: dict,
websocket: websockets.WebSocketClientProtocol | None = None
websocket: websockets.WebSocketClientProtocol | None = None,
) -> TransactionFull | list[TransactionFull]:
"""
Access the memory pool for a given OpenEthereum parity node, does not work on other node types
Under testing, feel free to improve.
"""
msg = await self._send_message("parity_pendingTransactions", [tx_limit, tx_filter], websocket)
msg = await self._send_message(
"parity_pendingTransactions", [tx_limit, tx_filter], websocket
)
match msg:
case None:
return msg
Expand All @@ -1408,10 +1413,7 @@ async def get_mempool_geth(
case None:
return msg
case _:
transactions = {
"pending": [],
"queued": []
}
transactions = {"pending": [], "queued": []}

for tx_group in transactions.keys():
if tx_group in msg:
Expand Down
12 changes: 10 additions & 2 deletions pythereum/socket_pool.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@ class WebsocketPool:
"""

def __init__(
self, url: str, pool_size: int = 6, connection_max_payload_size: int = 2**20, connection_timeout: int = 20
self,
url: str,
pool_size: int = 6,
connection_max_payload_size: int = 2**20,
connection_timeout: int = 20,
):
self._url = url
self._id = 0
Expand All @@ -35,7 +39,11 @@ async def start(self) -> None:
# Creates a number of sockets equal to the maximum pool size
sockets = await gather(
*(
connect(self._url, max_size=self._max_payload_size, ping_interval=self._timeout)
connect(
self._url,
max_size=self._max_payload_size,
ping_interval=self._timeout,
)
for _ in range(self._max_pool_size)
)
)
Expand Down

0 comments on commit b2450af

Please sign in to comment.