1.Cleanup unused packages 2.Fix download.py 3.Update tests

Author: learnforpractice

examples/mixin_msg_test.py

@@ -1,5 +1,5 @@
 from flask import Flask, redirect, request
-import requests
+import httpx
 import json
 
 import mixin_config
@@ -51,7 +51,7 @@ def get_auth_token():
         "client_secret": mixin_config.client_secret,
     }
 
-    r = requests.post(get_auth_token_url, json=post_data)
+    r = httpx.post(get_auth_token_url, json=post_data)
     r_json = r.json()
     print(r_json)
 

pyproject.toml

@@ -181,7 +181,7 @@ async def __genNetworkPostRequest(self, path, body, auth_token=""):
         r = await self.client.post(url, data=body, headers=headers)
 # {'error': {'status': 202, 'code': 20118, 'description': 'Invalid PIN format.'}}
 
-        # r = requests.post(url, data=body, headers=headers)
+        # r = httpx.post(url, data=body, headers=headers)
 # {'error': {'status': 202, 'code': 401, 'description': 'Unauthorized, maybe invalid token.'}}
         r = r.json()
         if 'error' in r:

pysrc/mixin_bot_api.py

@@ -5,7 +5,7 @@
 import signal
 import shutil
 import tempfile
-import requests
+import httpx
 import shlex, subprocess
 from subprocess import Popen, PIPE
 
@@ -162,7 +162,7 @@ def _start(self):
             try:
                 data = {'method': 'getinfo', 'params': []}
                 headers = {'Content-type': 'application/json', 'Accept': 'text/plain'}
-                r = requests.post('http://127.0.0.1:8007', json=data, headers=headers)
+                r = httpx.post('http://127.0.0.1:8007', json=data, headers=headers)
                 r = r.json()
                 break
             except Exception as e:

pysrc/testnet.py

@@ -1,8 +1,5 @@
-pycparser>=2.19
 pycryptodome>=3.7.2
 PyJWT>=2.4.0
-python-dateutil>=2.7.5
-requests>=2.21.0
 websocket-client>=0.54.0
 websockets
 dataclasses-json

requirements-dev.txt

@@ -2,7 +2,6 @@ pycparser>=2.19
 pycryptodome>=3.7.2
 PyJWT>=2.4.0
 python-dateutil>=2.7.5
-requests>=2.21.0
 websockets>=9.1
 cryptography>=3.4.7
 dataclasses-json

requirements.txt

@@ -9,16 +9,19 @@
     f'mixin_python-{version}-cp38-cp38-macosx_10_15_x86_64.whl',
     f'mixin_python-{version}-cp39-cp39-macosx_10_15_x86_64.whl',
     f'mixin_python-{version}-cp310-cp310-macosx_10_15_x86_64.whl',
+    f'mixin_python-{version}-cp311-cp311-macosx_10_15_x86_64.whl',
 
     f'mixin_python-{version}-cp37-cp37m-win_amd64.whl',
     f'mixin_python-{version}-cp38-cp38-win_amd64.whl',
     f'mixin_python-{version}-cp39-cp39-win_amd64.whl',
     f'mixin_python-{version}-cp310-cp310-win_amd64.whl',
+    f'mixin_python-{version}-cp311-cp311-win_amd64.whl',
 
     f'mixin_python-{version}-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl',
     f'mixin_python-{version}-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl',
     f'mixin_python-{version}-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl',
     f'mixin_python-{version}-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl',
+    f'mixin_python-{version}-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl',
 ]
 
 url = f'https://github.com/learnforpractice/mixin-python/releases/download/v{version}/'

scripts/download.py

@@ -35,12 +35,10 @@
     data_files = data_files,
     scripts=[],
     install_requires=[
-        "pycparser>=2.19",
         "PyJWT>=2.4.0",
-        "python-dateutil>=2.7.5",
-        "requests>=2.21.0",
         "websockets>=9.1",
         "cryptography>=3.4.7",
+        "dataclasses-json",
         "httpx"
     ],
     tests_require=['pytest'],

setup.py

@@ -21,20 +21,21 @@
 
 logger = log.get_logger(__name__)
 
+tmp_dir = os.path.dirname(os.path.abspath(__file__)) + '/.tmp'
+
 class TestMixinApi(object):
 
     @classmethod
     def setup_class(cls):
         cls.nodes = []
         # if '--newtestnet' in sys.argv:
-        if True:
-            for i in range(7):
-                port = 7001+i
-                config_dir = f'/tmp/mixin-{port}'
-                if os.path.exists(config_dir):
-                    shutil.rmtree(config_dir)
+        for i in range(7):
+            port = 7001+i
+            config_dir = f'{tmp_dir}/mixin-{port}'
+            if os.path.exists(config_dir):
+                shutil.rmtree(config_dir)
 
-        if not os.path.exists('/tmp/mixin-7001'):
+        if not os.path.exists(f'{tmp_dir}/mixin-7001'):
             cmd = f'python3 -m pymixin.main setuptestnet'
             args = shlex.split(cmd)
             p = subprocess.Popen(args, stdout=subprocess.PIPE)
@@ -43,12 +44,12 @@ def setup_class(cls):
 
         for i in range(7):
             port = 7001+i
-            # cmd = f'python3 -m mixin.main kernel -dir /tmp/mixin-700{i+1} -port {port}'
-            cmd = f'python3 -m pymixin.main kernel -dir /tmp/mixin-700{i+1} -port {port}'
-            # cmd = f'/Users/newworld/dev/mixin/mixin/mixin kernel -dir /tmp/mixin-700{i+1} -port {port}'
+            # cmd = f'python3 -m mixin.main kernel -dir {tmp_dir}/mixin-700{i+1} -port {port}'
+            cmd = f'python3 -m pymixin.main kernel -dir {tmp_dir}/mixin-700{i+1} -port {port}'
+            # cmd = f'/Users/newworld/dev/mixin/mixin/mixin kernel -dir {tmp_dir}/mixin-700{i+1} -port {port}'
             logger.info(cmd)
             args = shlex.split(cmd)
-            log = open(f'/tmp/mixin-700{i+1}/log.txt', 'a')
+            log = open(f'{tmp_dir}/mixin-700{i+1}/log.txt', 'a')
             p = subprocess.Popen(args, stdout=log, stderr=log)
             cls.nodes.append(p)
         logger.info('++++++')
@@ -99,7 +100,7 @@ async def test_hello(self):
 
     @pytest.mark.asyncio
     async def test_deposit(self):
-        with open('/tmp/mixin-7001/config.toml', 'r') as f:
+        with open(f'{tmp_dir}/mixin-7001/config.toml', 'r') as f:
             for line in f:
                 key = 'signer-key = '
                 start = line.find(key)
@@ -110,7 +111,7 @@ async def test_deposit(self):
                     break
 
         logger.info('++++signer_key: %s', signer_key)
-        with open('/tmp/mixin-7001/genesis.json', 'r') as f:
+        with open(f'{tmp_dir}/mixin-7001/genesis.json', 'r') as f:
             genesis = f.read()
             genesis = json.loads(genesis)
             domain_node = genesis['domains'][0]
@@ -246,7 +247,7 @@ async def test_deposit(self):
     @pytest.mark.asyncio
     async def test_transfer_with_multiple_input(self):
 
-        with open('/tmp/mixin-7001/config.toml', 'r') as f:
+        with open(f'{tmp_dir}/mixin-7001/config.toml', 'r') as f:
             for line in f:
                 key = 'signer-key = '
                 start = line.find(key)
@@ -257,7 +258,7 @@ async def test_transfer_with_multiple_input(self):
                     break
 
         logger.info('++++signer_key: %s', signer_key)
-        with open('/tmp/mixin-7001/genesis.json', 'r') as f:
+        with open(f'{tmp_dir}/mixin-7001/genesis.json', 'r') as f:
             genesis = f.read()
             genesis = json.loads(genesis)
             domain_node = genesis['domains'][0]
@@ -368,7 +369,7 @@ async def test_transfer_with_multiple_input(self):
     @pytest.mark.asyncio
     async def test_transfer_with_multiple_input_with_different_keys(self):
 
-        with open('/tmp/mixin-7001/config.toml', 'r') as f:
+        with open(f'{tmp_dir}/mixin-7001/config.toml', 'r') as f:
             for line in f:
                 key = 'signer-key = '
                 start = line.find(key)
@@ -379,7 +380,7 @@ async def test_transfer_with_multiple_input_with_different_keys(self):
                     break
 
         logger.info('++++signer_key: %s', signer_key)
-        with open('/tmp/mixin-7001/genesis.json', 'r') as f:
+        with open(f'{tmp_dir}/mixin-7001/genesis.json', 'r') as f:
             genesis = f.read()
             genesis = json.loads(genesis)
             domain_node = genesis['domains'][0]
@@ -568,7 +569,7 @@ async def monitor():
                     pass
         # asyncio.create_task(monitor())
 
-        with open('/tmp/mixin-7001/config.toml', 'r') as f:
+        with open(f'{tmp_dir}/mixin-7001/config.toml', 'r') as f:
             for line in f:
                 key = 'signer-key = '
                 start = line.find(key)
@@ -579,7 +580,7 @@ async def monitor():
                     break
 
         logger.info('++++signer_key: %s', signer_key)
-        with open('/tmp/mixin-7001/genesis.json', 'r') as f:
+        with open(f'{tmp_dir}/mixin-7001/genesis.json', 'r') as f:
             genesis = f.read()
             genesis = json.loads(genesis)
             domain_node = genesis['domains'][0]
@@ -678,7 +679,7 @@ async def monitor():
                     pass
         # asyncio.create_task(monitor())
 
-        with open('/tmp/mixin-7001/config.toml', 'r') as f:
+        with open(f'{tmp_dir}/mixin-7001/config.toml', 'r') as f:
             for line in f:
                 key = 'signer-key = '
                 start = line.find(key)
@@ -689,7 +690,7 @@ async def monitor():
                     break
 
         logger.info('++++signer_key: %s', signer_key)
-        with open('/tmp/mixin-7001/genesis.json', 'r') as f:
+        with open(f'{tmp_dir}/mixin-7001/genesis.json', 'r') as f:
             genesis = f.read()
             genesis = json.loads(genesis)
             domain_node = genesis['domains'][0]
@@ -793,7 +794,7 @@ async def monitor():
                     pass
         # asyncio.create_task(monitor())
 
-        with open('/tmp/mixin-7001/config.toml', 'r') as f:
+        with open(f'{tmp_dir}/mixin-7001/config.toml', 'r') as f:
             for line in f:
                 key = 'signer-key = '
                 start = line.find(key)
@@ -804,7 +805,7 @@ async def monitor():
                     break
 
         logger.info('++++signer_key: %s', signer_key)
-        with open('/tmp/mixin-7001/genesis.json', 'r') as f:
+        with open(f'{tmp_dir}/mixin-7001/genesis.json', 'r') as f:
             genesis = f.read()
             genesis = json.loads(genesis)
             domain_node = genesis['domains'][0]
@@ -948,7 +949,7 @@ async def monitor():
                     pass
         asyncio.create_task(monitor())
 
-        with open('/tmp/mixin-7001/config.toml', 'r') as f:
+        with open(f'{tmp_dir}/mixin-7001/config.toml', 'r') as f:
             for line in f:
                 key = 'signer-key = '
                 start = line.find(key)
@@ -959,7 +960,7 @@ async def monitor():
                     break
 
         logger.info('++++signer_key: %s', signer_key)
-        with open('/tmp/mixin-7001/genesis.json', 'r') as f:
+        with open(f'{tmp_dir}/mixin-7001/genesis.json', 'r') as f:
             genesis = f.read()
             genesis = json.loads(genesis)
             domain_node = genesis['domains'][0]
@@ -1116,7 +1117,7 @@ async def monitor():
                     pass
         asyncio.create_task(monitor())
 
-        with open('/tmp/mixin-7001/config.toml', 'r') as f:
+        with open(f'{tmp_dir}/mixin-7001/config.toml', 'r') as f:
             for line in f:
                 key = 'signer-key = '
                 start = line.find(key)
@@ -1127,7 +1128,7 @@ async def monitor():
                     break
 
         logger.info('++++signer_key: %s', signer_key)
-        with open('/tmp/mixin-7001/genesis.json', 'r') as f:
+        with open(f'{tmp_dir}/mixin-7001/genesis.json', 'r') as f:
             genesis = f.read()
             genesis = json.loads(genesis)
             domain_node = genesis['domains'][0]