upgrade to remove export, and add address symbol

Author: billbsing

convex_api/api.py

@@ -350,7 +350,7 @@ def request_funds(self, amount, account):
         """
         faucet_url = urljoin(self._url, '/api/v1/faucet')
         faucet_data = {
-            'address': f'#{account.address}',
+            'address': account.address,
             'amount': amount
         }
         logger.debug(f'request_funds {faucet_url} {faucet_data}')
@@ -689,7 +689,7 @@ def _transaction_prepare(self, transaction, address, language=None, sequence_num
             language = self._language
         prepare_url = urljoin(self._url, '/api/v1/transaction/prepare')
         data = {
-            'address': f'#{address}',
+            'address': to_address(address),
             'lang': language,
             'source': transaction,
         }
@@ -711,7 +711,7 @@ def _transaction_submit(self, address, public_key, hash_data, signed_data):
         """
         submit_url = urljoin(self._url, '/api/v1/transaction/submit')
         data = {
-            'address': f'#{to_address(address)}',
+            'address': to_address(address),
             'accountKey': public_key,
             'hash': hash_data,
             'sig': remove_0x_prefix(signed_data)
@@ -732,7 +732,7 @@ def _transaction_query(self, address, transaction, language=None):
 
         query_url = urljoin(self._url, '/api/v1/query')
         query_data = {
-            'address': f'#{address}',
+            'address': address,
             'lang': language,
             'source': transaction,
         }

convex_api/registry.py

@@ -38,11 +38,11 @@ def clear(self):
         self._address = None
 
     def register(self, name, contract_address, account):
-        result = self._convex.send(f'(call #{self.address} (register {{:name "{name}"}}))', account)
+        result = self._convex.send(f'(call #{self.address} (register {{:name (symbol "{name}")}}))', account)
         logger.debug(f'register result: {result}')
         if result and 'value' in result:
             try:
-                result = self._convex.send(f'(call #{self.address} (cns-update "{name}" {contract_address}))', account)
+                result = self._convex.send(f'(call #{self.address} (cns-update (symbol "{name}") #{contract_address}))', account)
                 logger.debug(f'cns-update result: {result}')
                 if result and 'value' in result:
                     items = result['value']

tests/conftest.py

@@ -6,6 +6,7 @@
 
 import logging
 import pytest
+import secrets
 
 from convex_api.account import Account
 from convex_api.api import API
@@ -51,7 +52,8 @@ def test_key_pair(test_key_pair_info):
 
 @pytest.fixture(scope='module')
 def test_account(convex, test_key_pair):
-    account = convex.setup_account(TEST_ACCOUNT_NAME, test_key_pair)
+    test_account_name = f'{TEST_ACCOUNT_NAME}.{secrets.token_hex(8)}'
+    account = convex.setup_account(test_account_name, test_key_pair)
     convex.topup_account(account)
     return account
 

tests/intergration/test_account_api.py

@@ -3,6 +3,9 @@
 
 """
 
+import pytest
+import secrets
+
 from convex_api import (
     Account,
     API,
@@ -11,6 +14,10 @@
 
 TEST_ACCOUNT_NAME = 'test.convex-api'
 
+@pytest.fixture
+def account_name():
+    return f'{TEST_ACCOUNT_NAME}-{secrets.token_hex(8)}'
+
 def test_account_api_create_account(convex_url):
 
     convex = API(convex_url)
@@ -33,26 +40,26 @@ def test_account_api_multi_create_account(convex_url):
     assert(account_1.address != account_2.address)
 
 
-def test_account_name(convex_url, test_key_pair_info):
+def test_account_name(convex_url, test_key_pair_info, account_name):
     convex = API(convex_url)
     import_key_pair = KeyPair.import_from_bytes(test_key_pair_info['private_bytes'])
-    if convex.resolve_account_name(TEST_ACCOUNT_NAME):
-        account = convex.load_account(TEST_ACCOUNT_NAME, import_key_pair)
+    if convex.resolve_account_name(account_name):
+        account = convex.load_account(account_name, import_key_pair)
     else:
         account = convex.create_account(import_key_pair)
         convex.topup_account(account)
-        account = convex.register_account_name(TEST_ACCOUNT_NAME, account)
+        account = convex.register_account_name(account_name, account)
     assert(account.address)
     assert(account.name)
-    assert(account.name == TEST_ACCOUNT_NAME)
-    assert(convex.resolve_account_name(TEST_ACCOUNT_NAME) == account.address)
+    assert(account.name == account_name)
+    assert(convex.resolve_account_name(account_name) == account.address)
 
 
-def test_account_setup_account(convex_url, test_key_pair_info):
+def test_account_setup_account(convex_url, test_key_pair_info, account_name):
     convex = API(convex_url)
     import_key_pair = KeyPair.import_from_bytes(test_key_pair_info['private_bytes'])
-    account = convex.setup_account(TEST_ACCOUNT_NAME, import_key_pair)
+    account = convex.setup_account(account_name, import_key_pair)
     assert(account.address)
     assert(account.name)
-    assert(account.name == TEST_ACCOUNT_NAME)
-    assert(convex.resolve_account_name(TEST_ACCOUNT_NAME) == account.address)
+    assert(account.name == account_name)
+    assert(convex.resolve_account_name(account_name) == account.address)

tests/intergration/test_api.py

@@ -99,7 +99,7 @@ def test_convex_account_name_registry(convex_url, test_account, test_key_pair):
 
 def test_convex_resolve_name(convex_url):
     convex = API(convex_url)
-    address = convex.resolve_name('convex.nft-tokens')
+    address = convex.resolve_name('convex.trust')
     assert(address)
 
 
@@ -175,10 +175,20 @@ def test_convex_api_call(convex_url):
 (def storage-example
     (deploy
         '(do
-            (def stored-data nil)
-            (defn get [] stored-data)
-            (defn set [x] (def stored-data x))
-            (export get set)
+            (def stored-data
+                ^{:private? true}
+                nil
+            )
+            (defn get
+                ^{:callable? true}
+                []
+                stored-data
+            )
+            (defn set
+                ^{:callable? true}
+                [x]
+                ( def stored-data x)
+            )
         )
     )
 )
@@ -207,11 +217,11 @@ def test_convex_api_call(convex_url):
     call_get_result = convex.query('call storage_example get()', account)
     assert(call_get_result['value'] == test_number)
 
-    call_get_result = convex.query(f'call #{contract_address} get()', account)
+    call_get_result = convex.query(f'call {contract_address} get()', account)
     assert(call_get_result['value'] == test_number)
 
     with pytest.raises(ConvexRequestError, match='400'):
-        call_set_result = convex.send(f'call #{contract_address}.set({test_number})', account)
+        call_set_result = convex.send(f'call {contract_address}.set({test_number})', account)
 
     address = convex.get_address('storage_example', account)
     assert(address == contract_address)

tests/intergration/test_convex_break.py

@@ -25,12 +25,29 @@ def test_convex_recursion(convex, test_account):
 (def chain-{index}
     (deploy
         '(do
-            (def stored-data nil)
-            (def chain-address nil)
-            (defn get [] (call chain-address (get)))
-            (defn set [x] (if chain-address (call chain-address(set x)) (def stored-data x)) )
-            (defn set-chain-address [x] (def chain-address x))
-            (export get set set-chain-address)
+            (def stored-data
+                ^{{:private? true}}
+                nil
+            )
+            (def chain-address
+                ^{{:private? true}}
+                nil
+            )
+            (defn get
+                ^{{:callable? true}}
+                []
+                (call chain-address (get))
+            )
+            (defn set
+                ^{{:callable? true}}
+                [x]
+                ( if chain-address (call chain-address(set x)) (def stored-data x))
+            )
+            (defn set-chain-address
+                ^{{:callable? true}}
+                [x]
+                (def chain-address x)
+            )
         )
     )
 )
@@ -62,19 +79,28 @@ def test_schedule_transfer(convex, test_account, other_account):
 (def transfer-for-ever
     (deploy
         '(do
-            (defn tx-delay [to-address amount]
+            (defn tx-delay
+                ^{:callable? true}
+                [to-address amount]
                 (transfer to-address amount)
                 (def call-address *address*)
                 (schedule (+ *timestamp* 1000) (call call-address (tx-delay to-address amount)))
             )
-            (defn tx-now [to-address amount]
+            (defn tx-now
+                ^{:callable? true}
+                [to-address amount]
                 (transfer to-address amount)
             )
-            (defn show-schedule []
+            (defn show-schedule
+                ^{:callable? true}
+                []
                 [(get *state* :schedule) *address*]
             )
-            (defn receive-coin [sender amount data] (accept amount))
-            (export show-schedule tx-delay tx-now, receive-coin)
+            (defn receive-coin
+                ^{:callable? true}
+                [sender amount data]
+                (accept amount)
+            )
         )
     )
 )

tests/intergration/test_convex_multi_thread.py

@@ -85,10 +85,20 @@ def process_convex_depoly(convex, result_value):
 (def storage-example
     (deploy
         '(do
-            (def stored-data nil)
-            (defn get [] stored-data)
-            (defn set [x] (def stored-data x))
-            (export get set)
+            (def stored-data
+                ^{:private? true}
+                nil
+            )
+            (defn get
+                ^{:callable? true}
+                []
+                stored-data
+            )
+            (defn set
+                ^{:callable? true}
+                [x]
+                (def stored-data x)
+            )
         )
     )
 )

tests/intergration/tool/test_account_command.py

@@ -68,7 +68,7 @@ def test_account_info_command(convex_url, test_account):
     output = Output()
     command.execute(args, output)
     assert(output.values['balance'])
-    assert(output.values['memorySize'])
+    assert(output.values['address'])
     assert(output.values['sequence'])
     assert(output.values['type'])
 
@@ -80,7 +80,7 @@ def test_account_info_command(convex_url, test_account):
     output = Output()
     command.execute(args, output)
     assert(output.values['balance'])
-    assert(output.values['memorySize'])
+    assert(output.values['address'])
     assert(output.values['sequence'])
     assert(output.values['type'])