xync-client 0.0.11.dev20__tar.gz → 0.0.11.dev23__tar.gz

{xync_client-0.0.11.dev20/xync_client.egg-info → xync_client-0.0.11.dev23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xync-client
-Version: 0.0.11.dev20
+Version: 0.0.11.dev23
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 Project-URL: Homepage, https://gitlab.com/XyncNet/client
 Project-URL: Repository, https://gitlab.com/XyncNet/client

{xync_client-0.0.11.dev20 → xync_client-0.0.11.dev23}/tests/TestEx.py

@@ -34,7 +34,7 @@ class TestEx(BaseTest):
             ok = self.is_flat_dict(curs)
             t, _ = await ExTest.update_or_create({"ok": ok}, ex=client.ex, action=ExAction.curs)
             assert t.ok, "No curs"
-            logging.info(f"{client.ex.name}:{ExAction.pms.name} - ok")
+            logging.info(f"{client.ex.name}:{ExAction.curs.name} - ok")
 
     # 22
     async def test_cur_pms_map(self, clients: list[BaseExClient]):
@@ -43,4 +43,22 @@ class TestEx(BaseTest):
             ok = self.is_map_of_ids(cur_pms)
             t, _ = await ExTest.update_or_create({"ok": ok}, ex=client.ex, action=ExAction.cur_pms_map)
             assert t.ok, "No pms for cur"
-            logging.info(f"{client.ex.name}:{ExAction.pms.name} - ok")
+            logging.info(f"{client.ex.name}:{ExAction.cur_pms_map.name} - ok")
+
+    # 23
+    async def test_coins(self, clients: list[BaseExClient]):
+        for client in clients:
+            coins: FlatDict = await client.coins()
+            ok = self.is_flat_dict(coins)
+            t, _ = await ExTest.update_or_create({"ok": ok}, ex=client.ex, action=ExAction.coins)
+            assert t.ok, "No coins"
+            logging.info(f"{client.ex.name}:{ExAction.coins.name} - ok")
+
+    # 24
+    async def test_ads(self, clients: list[BaseExClient]):
+        for client in clients:
+            ads: FlatDict = await client.ads("USDT", "RUB", False)
+            ok = self.is_list_of_dicts(ads)
+            t, _ = await ExTest.update_or_create({"ok": ok}, ex=client.ex, action=ExAction.ads)
+            assert t.ok, "No ads"
+            logging.info(f"{client.ex.name}:{ExAction.ads.name} - ok")

xync_client-0.0.11.dev23/tests/_todo_refact/Wallet/test_agent.py

@@ -0,0 +1,162 @@
+from asyncio import AbstractEventLoop, get_running_loop
+
+import pytest
+import uvloop
+from tortoise.backends.asyncpg import AsyncpgDBClient
+from x_model import init_db
+from xync_schema import models
+from xync_schema.models import Agent, ExAction, TestEx
+from xync_schema.pydantic import FiatNew
+
+from xync_client.TgWallet.agent import AgentClient
+from xync_client.loader import PG_DSN
+
+
+@pytest.mark.asyncio(loop_scope="class")
+class TestWallet:
+    loop: AbstractEventLoop
+
+    @pytest.fixture(scope="class")
+    def event_loop_policy(self):
+        return uvloop.EventLoopPolicy()
+
+    @pytest.fixture(scope="class")
+    async def cn(self, event_loop_policy) -> AsyncpgDBClient:
+        TestWallet.loop = get_running_loop()
+        cn: AsyncpgDBClient = await init_db(PG_DSN, models, True)
+        yield cn
+        await cn.close()
+
+    @pytest.fixture(scope="class")
+    async def ac(self, cn) -> AgentClient:
+        agent = await Agent.get(user_id=1038938370).prefetch_related("ex")
+        tg = await agent.client()
+        yield tg
+        await tg.close()
+
+    # 25 - fiats
+    async def test_fiats(self, ac):
+        fiats = await ac.my_fiats()
+        await TestEx.update_or_create(
+            {"ok": (ok := isinstance(fiats, dict))}, ex__name=ac.agent.ex.name, action=ExAction.my_fiats
+        )
+        assert ok, "Failed to get fiats"
+
+    # 26 - fiat_new
+    async def test_fiat_new(self, ac):
+        await ac.all_pms()
+        fiat = FiatNew(cur_id=1, pm_id=1, detail="123456789098765", name="Satoshi")
+        add_pm = await ac.fiat_new(fiat)
+        await TestEx.update_or_create(
+            {"ok": add_pm["status"] == "SUCCESS"}, ex__name="TgWallet", action=ExAction.fiat_new
+        )
+        assert add_pm["status"] == "SUCCESS", "Failed to create"
+
+    # # 27 - fiat_edit
+    # async def test_fiat_edit(self, ac):
+    #     editid = await ac.my_fiats()
+    #     pms = await ac.all_pms()
+    #     add_pm = await ac.fiat_upd(editid["data"][0]["id"], pms[0]["code"], "RUB", pms[0]["name"], "9876543214442")
+    #     await TestEx.update_or_create(
+    #         {"ok": add_pm["status"] == "SUCCESS"}, ex__name="TgWallet", action=ExAction.fiat_upd
+    #     )
+    #     assert add_pm["status"] == "SUCCESS", "Failed to edit"
+    #
+    # # 28 - fiat_del
+    # async def test_fiat_del(self, ac):
+    #     delid = await ac.my_fiats()
+    #     dl = await ac.fiat_del(delid["data"][0]["id"])
+    #     await TestEx.update_or_create({"ok": dl["status"] == "SUCCESS"}, ex__name="TgWallet", action=ExAction.fiat_del)
+    #     assert dl["status"] == "SUCCESS", "Fiat doesn't delete"
+    #
+    # # 29 - my_ads
+    # async def test_my_ads(self, ac):
+    #     ads = await ac.my_ads()
+    #     await TestEx.update_or_create({"ok": ads["status"] == "SUCCESS"}, ex__name="TgWallet", action=ExAction.my_ads)
+    #     assert ads["status"] == "SUCCESS", "No data"
+
+    # # 10 - ad_new
+    # async def test_ad_new(self, ac):
+    #     fiats = [(await ac.fiats())['data'][0]['id']]
+    #     ad = await ac.ad_new(fiats=fiats, amount=1000, coin="NOT", cur="EGP", tt="SALE")
+    #     await TestEx.update_or_create({"ok": ad['status'] == 'SUCCESS'}, ex__name="TgWallet", action=ExAction.ad_new)
+    #     assert ad['status'] == "SUCCESS", "No data"
+    #
+    # # 11 - ad_upd
+    # async def test_ad_upd(self, ac):
+    #     fiats = [(await ac.fiats())['data'][0]['id']]
+    #     ad = (await ac.my_ads())['data'][0]
+    #     upd = await ac.ad_upd(ad['type'], ad['id'], fiats, 1000)
+    #     await TestEx.update_or_create({"ok": upd['status'] == 'SUCCESS'}, ex__name="TgWallet", action=ExAction.ad_upd)
+    #     assert upd['status'] == "SUCCESS", "No data"
+    #
+    # # 13, 14 - ad_on/ad_off
+    # async def test_ad_off_on(self, ac):
+    #     ad = (await ac.my_ads())["data"][0]
+    #     if ad['status'] == "ACTIVE":
+    #         resulst_off = await ac.ad_off(ad['type'], ad['id'])
+    #         assert resulst_off['status'] == "SUCCESS", "Inactivate failed"
+    #     resulst_on = await ac.ad_on(ad['type'], ad['id'])
+    #     assert resulst_on['status'] == "SUCCESS", "Activate failed"
+    #     await TestEx.update_or_create({"ok": resulst_on['status'] == 'SUCCESS'}, ex__name="TgWallet",
+    #                                   action=ExAction.ad_on)
+    #     resulst_off = await ac.ad_off(ad['type'], ad['id'])
+    #     await TestEx.update_or_create({"ok": resulst_off['status'] == 'SUCCESS'}, ex__name="TgWallet",
+    #                                   action=ExAction.ad_off)
+    #     assert resulst_off['status'] == "SUCCESS", "Inactivate failed"
+    #
+    # # 12 - ad_del
+    # async def test_ad_del(self, ac):
+    #     ad = (await ac.my_ads())['data'][0]
+    #     ad_del = await ac.ad_del(ad['type'], ad['id'])
+    #     await TestEx.update_or_create({"ok": ad_del['status'] == 'SUCCESS'}, ex__name="TgWallet",
+    #                                   action=ExAction.ad_del)
+    #     assert ad_del['status'] == "SUCCESS", "No data"
+    #
+    # # 15 - order_approve
+    # async def test_order_approve(self, ac):
+    #     orders = await ac.my_orders()
+    #     agent = await Agent.get(user_id=2093307892)
+    #     tgw = Private(agent)
+    #     kyc = await tgw.get_kyc()
+    #     if orders['data'][0]['seller']['userId'] == kyc:
+    #         typ = 'SALE'
+    #     elif orders['data'][0]['buyer']['userId'] == kyc:
+    #         typ = 'BUY'
+    #     else:
+    #         typ = None
+    #     approved = await ac.order_approve(orders['data'][0]['id'], typ)
+    #     assert approved['status'] == "SUCCESS", "No approved"
+    #
+    # # 16 - order_reject
+    # async def test_order_reject(self, ac):
+    #     orders = await ac.my_orders()
+    #     assert len(orders['data']), "No orders. You need create at least one order at first!"
+    #     order_reject = await ac.order_reject(orders['data'][0]['id'])
+    #     await TestEx.update_or_create({"ok": order_reject['status'] == 'SUCCESS'}, ex__name="TgWallet",
+    #                                   action=ExAction.order_reject)
+    #     assert order_reject['status'] == "SUCCESS", "No data"
+    #
+    # # 19 - order_paid
+    # async def test_upload_file_order_paid(self, ac):
+    #     orders = await ac.my_orders()
+    #     agent = await Agent.get(user_id=1038938370)
+    #     tgw = Private(agent)
+    #     kyc = await tgw.get_kyc()
+    #     if orders['data'][0]['seller']['userId'] == kyc:
+    #         typ = 'SALE'
+    #     elif orders['data'][0]['buyer']['userId'] == kyc:
+    #         typ = 'BUY'
+    #     else:
+    #         typ = None
+    #     order_id = await ac.order_approve(orders['data'][0]['id'], typ)
+    #     upload = await ac.upload_file(order_id, 'Screenshot_788.png')
+    #     assert upload['status'] == "SUCCESS", "No upload"
+    #     paid = await ac.order_paid(orders['data'][0]['id'], upload['data']['file'])
+    #     assert paid['status'] == "SUCCESS", "No data"
+    #
+    # # 20 - order_payment_confirm
+    # async def test_order_payment_confirm(self, ac):
+    #     orders = await ac.my_orders()
+    #     confirm = await ac.order_payment_confirm(orders['data'][0]['id'])
+    #     assert confirm['status'] == "SUCCESS", "No confirm"

xync_client-0.0.11.dev23/tests/_todo_refact/Wallet/test_ex.py

@@ -0,0 +1,36 @@
+import pytest
+from xync_schema.models import ExAction, TestEx
+
+
+@pytest.mark.asyncio(loop_scope="class")
+class TestWallet(TestEx):
+    # 20 - all_pms
+    # async def test_pms(self, cl: ExClient):
+    #     await self.pms(cl)
+
+    # 21 - all_curs
+    async def test_all_curs(self, cl):
+        curs = await cl.curs()
+        test, _ = await TestEx.update_or_create({"ok": bool(curs)}, ex__name="TgWallet", action=ExAction.curs)
+        assert test.ok, "No curs"
+
+    # 22 - all_pms
+    async def test_cur_pms_map(self, cl):
+        pms = await cl.cur_pms_map()
+        test, _ = await TestEx.update_or_create({"ok": bool(pms)}, ex__name="TgWallet", action=ExAction.pms)
+        assert test.ok, "No pms"
+
+    # 23 - all_coins
+    async def test_all_coins(self, cl):
+        coins = await cl.coins()
+        test, _ = await TestEx.update_or_create({"ok": bool(coins)}, ex__name="TgWallet", action=ExAction.coins)
+        assert test.ok, "No coins"
+
+    # 24 - all_ads
+    async def test_cur_filter(self, cl):
+        for cur in "RUB", "AZN", "GEL":
+            for coin in "TON", "USDT", "BTC":
+                for tt in True, False:
+                    ads = await cl.ads(coin, cur, tt)
+                    assert len(ads), "No data"
+        await TestEx.update_or_create({"ok": bool(ads)}, ex__name="TgWallet", action=ExAction.ads)

{xync_client-0.0.11.dev20 → xync_client-0.0.11.dev23}/xync_client/Gate/ex.py

@@ -5,9 +5,9 @@ from json import JSONDecoder
 from bs4 import BeautifulSoup, Script
 from x_model import init_db
 from xync_schema import models
-from xync_schema.models import Coin, Cur, Pm, Ad, Ex
+from xync_schema.models import Coin, Cur, Pm, Ex
 
-from xync_client.Abc.Base import MapOfIdsList, DictOfDicts, FlatDict
+from xync_client.Abc.Base import MapOfIdsList, DictOfDicts, FlatDict, ListOfDicts
 from xync_client.Abc.Ex import BaseExClient
 from xync_client.loader import PG_DSN
 
@@ -54,7 +54,7 @@ class ExClient(BaseExClient):
         return curs
 
     # 24: ads
-    async def ads(self, coin: Coin, cur: Cur, is_sell: bool, pms: list[Pm] = None) -> list[Ad]:
+    async def ads(self, coin: Coin, cur: Cur, is_sell: bool, pms: list[Pm] = None) -> ListOfDicts:
         pass
 
 

{xync_client-0.0.11.dev20 → xync_client-0.0.11.dev23/xync_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xync-client
-Version: 0.0.11.dev20
+Version: 0.0.11.dev23
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 Project-URL: Homepage, https://gitlab.com/XyncNet/client
 Project-URL: Repository, https://gitlab.com/XyncNet/client

{xync_client-0.0.11.dev20 → xync_client-0.0.11.dev23}/xync_client.egg-info/SOURCES.txt

@@ -4,17 +4,19 @@
 README.md
 makefile
 pyproject.toml
+tests/AgentTest.py
+tests/BaseTest.py
+tests/OrderTest.py
 tests/TestEx.py
-tests/__init__.py
-tests/_test_ex.py
-tests/Abc/AgentTest.py
-tests/Abc/BaseTest.py
-tests/Abc/OrderTest.py
-tests/Binance/test_binance.py
-tests/Bybit/test_bybit.py
-tests/Bybit/test_bybit_p2p.py
-tests/Gate/test_gate.py
-tests/Htx/test_htx_p2p.py
+tests/_todo_refact/__init__.py
+tests/_todo_refact/_test_ex.py
+tests/_todo_refact/Binance/test_binance.py
+tests/_todo_refact/Bybit/test_bybit.py
+tests/_todo_refact/Bybit/test_bybit_p2p.py
+tests/_todo_refact/Gate/test_gate.py
+tests/_todo_refact/Htx/test_htx_p2p.py
+tests/_todo_refact/Wallet/test_agent.py
+tests/_todo_refact/Wallet/test_ex.py
 xync_client/__init__.py
 xync_client/loader.py
 xync_client.egg-info/PKG-INFO