remove CONVEX_SCRYPT

Author: billbsing

convex_api/api.py

@@ -37,8 +37,9 @@
 class API:
 
     LANGUAGE_LISP = 'convex-lisp'
-    LANGUAGE_SCRYPT = 'convex-scrypt'
-    LANGUAGE_ALLOWED = [LANGUAGE_LISP, LANGUAGE_SCRYPT]
+    # Convex Scrypt Language disabled
+    # LANGUAGE_SCRYPT = 'convex-scrypt'
+    LANGUAGE_ALLOWED = [LANGUAGE_LISP]
 
     def __init__(self, url, language=LANGUAGE_LISP):
         self._url = url
@@ -420,8 +421,10 @@ def get_address(self, function_name, address_account):
         """
 
         line = f'(address {function_name})'
+        """
         if self._language == API.LANGUAGE_SCRYPT:
             line = f'address({function_name})'
+        """
         result = self.query(line, address_account)
         if result and 'value' in result:
             return to_address(result['value'])
@@ -469,8 +472,10 @@ def get_balance(self, address_account, account_from=None):
             else:
                 address_from = account_from.address
         line = f'(balance #{address})'
+        """
         if self._language == API.LANGUAGE_SCRYPT:
             line = f'balance(#{address})'
+        """
         try:
 
             result = self._transaction_query(address_from, line)
@@ -522,9 +527,10 @@ def transfer(self, to_address_account, amount, account):
             raise ValueError(f'You must provide a valid to account/address ({transfer_to_address}) to transfer funds too')
 
         line = f'(transfer #{transfer_to_address} {amount})'
+        """
         if self._language == API.LANGUAGE_SCRYPT:
             line = f'transfer(#{transfer_to_address}, {amount})'
-
+        """
         result = self.send(line, account)
         if result and 'value' in result:
             return result['value']
@@ -577,8 +583,10 @@ def transfer_account(self, from_account, to_account):
             raise ValueError('You need to have the to account registered with an address')
 
         line = f'(set-key {from_account.key_pair.public_key_checksum})'
+        """
         if self._language == API.LANGUAGE_SCRYPT:
             line = f'set-key({from_account.key_pair.public_key_checksum})'
+        """
         result = self.send(line, to_account)
         if result and 'value' in result and from_account.key_pair.is_equal(result['value']):
             return Account(from_account.key_pair, to_account.address, to_account.name)

tests/intergration/test_api.py

@@ -25,8 +25,8 @@ def test_api_language_setup(convex_url):
     convex = API(convex_url, API.LANGUAGE_LISP)
     assert(convex.language == API.LANGUAGE_LISP)
 
-    convex = API(convex_url, API.LANGUAGE_SCRYPT)
-    assert(convex.language == API.LANGUAGE_SCRYPT)
+    # convex = API(convex_url, API.LANGUAGE_SCRYPT)
+    # assert(convex.language == API.LANGUAGE_SCRYPT)
 
     with pytest.raises(ValueError, match='language'):
         convex = API(convex_url, "bad-language")
@@ -135,7 +135,8 @@ def test_convex_api_send_basic_lisp(convex_url, test_account):
     assert 'value' in result
     assert(result['value'] == [2, 3, 4, 5, 6])
 
-def test_convex_api_send_basic_scrypt(convex_url, test_account):
+
+def DISABLED_test_convex_api_send_basic_scrypt(convex_url, test_account):
     convex = API(convex_url, API.LANGUAGE_SCRYPT)
     request_amount = convex.request_funds(TEST_FUNDING_AMOUNT, test_account)
     result = convex.send('map(inc, [1, 2, 3, 4, 5])', test_account)
@@ -197,7 +198,7 @@ def test_convex_api_call(convex_url):
     assert(call_get_result['value'] == test_number)
 
     # now api calls using language scrypt
-
+    """
     convex = API(convex_url, API.LANGUAGE_SCRYPT)
     test_number = secrets.randbelow(1000)
     call_set_result = convex.send(f'call storage_example set({test_number})', account)
@@ -214,7 +215,7 @@ def test_convex_api_call(convex_url):
 
     address = convex.get_address('storage_example', account)
     assert(address == contract_address)
-
+    """
 def test_convex_api_transfer(convex_url):
     convex = API(convex_url)
     key_pair = KeyPair()
@@ -239,7 +240,8 @@ def test_convex_api_query_lisp(convex_url, test_account):
     # return value is the address as a checksum
     assert(to_address(result['value']) == test_account.address)
 
-def test_convex_api_query_scrypt(convex_url, test_account):
+
+def DISABLED_test_convex_api_query_scrypt(convex_url, test_account):
     convex = API(convex_url, API.LANGUAGE_SCRYPT)
     result = convex.query(f'address({test_account.address})', test_account)
     assert(result)

tests/intergration/test_basic_api.py

@@ -11,9 +11,11 @@
 from convex_api.utils import (
     to_hex,
     remove_0x_prefix,
-    to_bytes
+    to_bytes,
+    to_public_key_checksum
 )
 
+
 PRIVATE_TEST_KEY = 0x973f69bcd654b264759170724e1e30ccd2e75fc46b7993fd24ce755f0a8c24d0
 PUBLIC_ADDRESS = '5288fec4153b702430771dfac8aed0b21cafca4344dae0d47b97f0bf532b3306'
 
@@ -29,13 +31,23 @@ def get_test_account():
     assert(public_address == PUBLIC_ADDRESS)
     return private_key, public_address
 
+def generate_test_keys():
+    private_key = Ed25519PrivateKey.generate()
+    public_key = private_key.public_key()
+    public_key_bytes = public_key.public_bytes(
+        encoding=serialization.Encoding.Raw,
+        format=serialization.PublicFormat.Raw
+    )
+    public_address = remove_0x_prefix(to_hex(public_key_bytes))
+    return private_key, public_address
+
 
 def create_account(convex_url, public_address):
     account_data = {
-        'accountKey': public_address,
+        'accountKey': remove_0x_prefix(to_public_key_checksum(public_address)),
     }
-    print('create_account send', account_data)
     url = f'{convex_url}/api/v1/createAccount'
+    print('create_account send to ', url, 'data:', account_data)
     response = requests.post(url, data=json.dumps(account_data))
     assert(response.status_code == 200)
     result = response.json()
@@ -57,7 +69,7 @@ def request_funds(convex_url, address):
 
 def test_submit_transaction(convex_url):
 
-    private_key, public_address = get_test_account()
+    private_key, public_address = generate_test_keys()
     address = create_account(convex_url, public_address)
     request_funds(convex_url, address)
     # faucet request amount
@@ -99,7 +111,7 @@ def test_submit_transaction(convex_url):
 
 
 def test_query_lisp(convex_url):
-    private_key, public_address = get_test_account()
+    private_key, public_address = generate_test_keys()
     address = create_account(convex_url, public_address)
     request_funds(convex_url, address)
     query_data = {
@@ -118,8 +130,8 @@ def test_query_lisp(convex_url):
     assert(result['value'] > 0)
 
 
-def test_query_scrypt(convex_url):
-    private_key, public_address = get_test_account()
+def DISABLED_test_query_scrypt(convex_url):
+    private_key, public_address = generate_test_keys()
     address = create_account(convex_url, public_address)
     request_funds(convex_url, address)
     query_data = {