Fix integration test failures

Author: superstructor

convex_api/api.py

@@ -728,9 +728,8 @@ def _transaction_submit(
         logger.debug(f'_transaction_submit {submit_url} {data}')
         result = parse_obj_as(SubmitTransactionResponse, self._post(submit_url, data))
         logger.debug(f'_transaction_submit response {result}')
-        # TODO: Fix this
-        # if 'errorCode' in result:
-        #     raise ConvexAPIError('_transaction_submit', result['errorCode'], result['value'])
+        if result.errorCode is not None:
+            raise ConvexAPIError('_transaction_submit', result.errorCode, result.value)
         return result
 
     def _transaction_query(
@@ -749,9 +748,8 @@ def _transaction_query(
         logger.debug(f'_transaction_query {query_url} {query_data}')
         result = parse_obj_as(QueryResponse, self._post(query_url, query_data))
         logger.debug(f'_transaction_query repsonse {result}')
-        # TODO: Fix this
-        # if 'errorCode' in result:
-        #     raise ConvexAPIError('_transaction_query', result['errorCode'], result['value'])
+        if result.errorCode is not None:
+            raise ConvexAPIError('_transaction_query', result.errorCode, result.value)
         return result
 
     @property

convex_api/models.py

@@ -1,4 +1,4 @@
-from typing import Any
+from typing import Any, Union
 
 from pydantic import (
     BaseModel,
@@ -54,6 +54,7 @@ class QueryRequest(BaseModel):
 class QueryResponse(BaseModel):
     """REST API response from a query request."""
     value: Any
+    errorCode: Union[str, None] = None
 
 
 class PrepareTransactionRequest(BaseModel):
@@ -81,3 +82,4 @@ class SubmitTransactionRequest(BaseModel):
 class SubmitTransactionResponse(BaseModel):
     """REST API response from a submit transaction request."""
     value: Any
+    errorCode: Union[str, None] = None

convex_api/tool/command/command_base.py

@@ -76,11 +76,11 @@ def print_help(self):
         if self._sub_parser is not None:
             self._sub_parser.choices[self._name].print_help()
 
-    def resolve_to_name_address(self, name_address: str, output: Output) -> Union[NameAddress, None]:
+    def resolve_to_name_address(self, name_address: Union[str, int], output: Output) -> Union[NameAddress, None]:
         name = None
         address = None
 
-        if name_address:
+        if isinstance(name_address, str):
             address = self._convex.resolve_account_name(name_address)
             name = name_address
 
@@ -110,7 +110,7 @@ def import_key_pair(self, args: BaseArgs):
 
         return key_pair
 
-    def load_account(self, args: BaseArgs, name_address: str, output: Output):
+    def load_account(self, args: BaseArgs, name_address: Union[str, int], output: Output):
 
         info = self.resolve_to_name_address(name_address, output)
         if not info:

convex_api/tool/command/query_command.py

@@ -21,7 +21,7 @@
 class QueryArgs(BaseArgs):
     command: Literal['query']
     query: str
-    name_address: Union[str, int]
+    name_address: Union[str, int, None]
 
 
 class QueryCommand(CommandBase):

convex_api/tool/command/submit_command.py

@@ -65,5 +65,5 @@ def execute(self, args: Namespace, output: Output):
         if not result:
             return
 
-        output.add_line(json.dumps(result))
+        output.add_line(result.json())
         output.set_values(result.dict())

tests/intergration/test_contract.py

@@ -32,6 +32,8 @@ def test_convex_api_deploy_contract(convex_url: str, test_account: Account):
     if owner_address:
         # if so then rebuild the owner account using the same key_pair
         owner_account = Account(test_account.key_pair, owner_address)
+        # and topup the account to avoid out of juice errors
+        convex.topup_account(owner_account, TEST_FUNDING_AMOUNT)
     else:
         owner_address = test_account.address
 

tests/intergration/test_convex_multi_thread.py

@@ -125,9 +125,9 @@ def process_convex_depoly(convex: API, result_value: Any):
 def test_convex_api_multi_thread_deploy(convex_url: str):
     process_count = 10
     convex = API(convex_url)
-    # key_pair = KeyPair()
-    # account = convex.create_account(key_pair)
-    # request_amount = convex.request_funds(TEST_FUNDING_AMOUNT, account)
+    key_pair = KeyPair()
+    account = convex.create_account(key_pair)
+    convex.request_funds(TEST_FUNDING_AMOUNT, account)
     process_items: Dict[int, Dict[str, Any]] = {}
     for index in range(process_count):
         result_value = Value('i', 0)