Refactor #28

Author: GLEF1X

benchmarks/p2p/test_performance.py

@@ -1,5 +1,6 @@
 # pip install pytest-benchmark pyqiwip2p
 import os
+from typing import Any, Callable, Dict, Tuple
 
 import pytest
 from pyqiwip2p.AioQiwip2p import AioQiwiP2P
@@ -26,7 +27,9 @@ async def create_bill_with_pyQiwiP2P():
 
 
 @pytest.fixture()
-def aio_benchmark(benchmark: BenchmarkFixture) -> BenchmarkFixture:
+def aio_benchmark(
+    benchmark: BenchmarkFixture,
+) -> Callable[[Any, Tuple[Any, ...], Dict[str, Any]], None]:
     import asyncio
     import threading
 

glQiwiApi/core/event_fetching/class_based/bill.py

@@ -22,7 +22,7 @@ def bill_id(self) -> str:
 
     @property
     def bill_sum(self) -> Amount:
-        return self.event.amount
+        return self.event.value
 
     @property
     def pay_url(self) -> str:

glQiwiApi/core/event_fetching/dispatcher.py

@@ -48,7 +48,7 @@ def __init__(self) -> None:
 
     async def process_event(self, event: Event, *args: Any) -> None:
         """
-        Feed handlers withf\\ event.
+        Feed handlers with event.
 
         :param event: any object that will be propagated to handlers
         """

glQiwiApi/core/event_fetching/webhooks/__init__.py

@@ -3,4 +3,4 @@
 from . import app  # noqa
 from .views import QiwiBillWebhookView, QiwiTransactionWebhookView
 
-__all__ = ('QiwiBillWebhookView', 'QiwiTransactionWebhookView', 'BaseWebhookView', 'app.py')
+__all__ = ('QiwiBillWebhookView', 'QiwiTransactionWebhookView', 'BaseWebhookView', 'app')

glQiwiApi/core/session/holder.py

@@ -3,7 +3,7 @@
 import abc
 from dataclasses import dataclass
 from types import TracebackType
-from typing import Any, Dict, Generic, Mapping, Optional, Set, Type, TypeVar, cast
+from typing import Any, Dict, Generic, Mapping, Optional, Type, TypeVar, cast
 
 import aiohttp
 from aiohttp import ClientResponse

glQiwiApi/qiwi/clients/p2p/methods/create_p2p_bill.py

@@ -1,6 +1,6 @@
 import uuid
 from datetime import datetime, timedelta
-from typing import Any, ClassVar, Dict, List, Optional, Union
+from typing import Any, ClassVar, Dict, List, Optional
 
 from pydantic import Field, validator
 

glQiwiApi/qiwi/clients/p2p/types.py

@@ -20,7 +20,7 @@ class Customer(HashableBase):
 
 
 class BillStatus(HashableBase):
-    amount: str
+    value: str
     changed_datetime: Optional[datetime] = Field(None, alias='changedDateTime')
 
 
@@ -61,13 +61,13 @@ def invoice_uid(self) -> str:
 class RefundedBill(HashableBase):
     """object: RefundedBill"""
 
-    amount: Amount
+    value: Amount
     datetime: datetime
     refund_id: str = Field(..., alias='refundId')
     status: str
 
     def __str__(self) -> str:
-        return f'№{self.refund_id} {self.status} {self.amount} {self.datetime}'
+        return f'№{self.refund_id} {self.status} {self.value} {self.datetime}'
 
 
 class BillWebhookPayload(Bill):
@@ -79,13 +79,13 @@ class BillWebhook(HashableBase):
     bill: BillWebhookPayload = Field(..., alias='bill')
 
     def __repr__(self) -> str:
-        return f'#{self.bill.id} {self.bill.amount} {self.bill.status} '
+        return f'#{self.bill.id} {self.bill.value} {self.bill.status} '
 
     def verify_signature(self, sha256_signature: str, secret_p2p_key: str) -> None:
         webhook_key = base64.b64decode(bytes(secret_p2p_key, 'utf-8'))
         bill = self.bill
 
-        invoice_params = f'{bill.amount.currency}|{bill.amount.amount}|{bill.id}|{bill.site_id}|{bill.status.amount}'
+        invoice_params = f'{bill.value.currency}|{bill.value.value}|{bill.id}|{bill.site_id}|{bill.status.value}'
         generated_signature = hmac.new(
             webhook_key, invoice_params.encode('utf-8'), hashlib.sha256
         ).hexdigest()

glQiwiApi/qiwi/clients/wallet/methods/authenticate_wallet.py

@@ -1,4 +1,4 @@
-from typing import Any, ClassVar, Dict, Optional
+from typing import Any, ClassVar, Dict
 
 from pydantic import Field
 

glQiwiApi/qiwi/clients/wallet/methods/detect_mobile_number.py

@@ -18,7 +18,7 @@ class DetectMobileNumber(QiwiAPIMethod[MobileOperator]):
     @classmethod
     def parse_http_response(cls, response: HTTPResponse) -> ReturningType:
         mobile_operator: MobileOperator = super().parse_http_response(response)
-        if mobile_operator.code.amount == '2' or mobile_operator.code.name == 'ERROR':
+        if mobile_operator.code.value == '2' or mobile_operator.code.name == 'ERROR':
             raise MobileOperatorCannotBeDeterminedError(
                 response, custom_message=mobile_operator.message
             )

glQiwiApi/qiwi/clients/wallet/methods/get_available_balances.py

@@ -1,7 +1,6 @@
 from typing import ClassVar, List
 
 from glQiwiApi.qiwi.base import QiwiAPIMethod
-from glQiwiApi.qiwi.clients.wallet.types import Balance
 from glQiwiApi.qiwi.clients.wallet.types.balance import AvailableBalance