fix(tests): correctly list asset definitions in CLI tests

Signed-off-by: Marin Veršić <[email protected]>

client_cli/pytests/src/client_cli/client_cli.py

@@ -166,7 +166,7 @@ def asset(self, asset_definition=None, account=None, value_of_type=None):
         self.command.insert(2, "asset")
         if asset_definition and account and value_of_type:
             self.command.append(
-                "--asset-id="
+                "--id="
                 + asset_definition.name
                 + "#"
                 + asset_definition.domain
@@ -198,7 +198,7 @@ def transfer(self, asset, source_account, target_account, quantity: str):
         self.command.append("transfer")
         self.command.append("--to=" + repr(target_account))
         self.command.append(
-            "--asset-id="
+            "--id="
             + asset.name
             + "#"
             + asset.domain
@@ -226,7 +226,7 @@ def burn(self, account, asset, quantity: str):
         self.command.append("asset")
         self.command.append("burn")
         self.command.append(
-            "--asset-id="
+            "--id="
             + asset.name
             + "#"
             + asset.domain
@@ -239,7 +239,7 @@ def burn(self, account, asset, quantity: str):
         self.execute()
         return self
 
-    def definition(self, asset: str, domain: str, type_: str):
+    def asset_definition(self, asset: str, domain: str, type_: str):
         """
         Executes the 'definition' command for the given asset, domain, and value type.
 
@@ -252,7 +252,9 @@ def definition(self, asset: str, domain: str, type_: str):
         :return: The current ClientCli object.
         :rtype: ClientCli
         """
-        self.command.append("--definition-id=" + asset + "#" + domain)
+        self.command.insert(2, "definition")
+        self.command.insert(2, "asset")
+        self.command.append("--id=" + asset + "#" + domain)
         self.command.append("--type=" + type_)
         self.execute()
         return self

client_cli/pytests/src/client_cli/have.py

@@ -79,11 +79,10 @@ def asset_definition(expected):
     :param expected: The expected asset definition object.
     :return: True if the asset definition is present, False otherwise.
     """
-    expected_domain = expected.split("#")[1]
 
     def asset_definition_in_asset_definitions() -> bool:
         asset_definitions = iroha.list_filter(
-            f'{{"Identifiable": {{"Is": "{expected_domain}"}}}}'
+            f'{{"Identifiable": {{"Is": "{expected}"}}}}'
         ).asset_definitions()
         return expected_in_actual(expected, asset_definitions)
 

client_cli/pytests/src/client_cli/iroha.py

@@ -106,16 +106,17 @@ def asset_definitions(self) -> Dict[str, str]:
         :return: Dict of asset definitions ids with there value type.
         :rtype: Dict[str, str]
         """
-        self._execute_command("domain")
+        self.command.insert(2, "definition")
+        self._execute_command("asset")
+
         if self.stdout is not None:
-            domains = json.loads(self.stdout)
+            asset_defs = json.loads(self.stdout)
+
             asset_definitions = {}
-            for domain in domains:
-                asset_defs = domain.get("asset_definitions")
-                for asset_def in asset_defs.values():
-                    type_ = asset_def.get("type_")
-                    if type_:
-                        asset_definitions[asset_def["id"]] = type_
+            for asset_def in asset_defs:
+                type_ = asset_def.get("type_")
+                if type_:
+                    asset_definitions[asset_def["id"]] = type_
             return asset_definitions
         else:
             return {}

client_cli/pytests/test/assets/test_register_asset_definitions.py

@@ -20,7 +20,7 @@ def test_register_asset_definition_with_numeric_type(
         f'with "{GIVEN_numeric_type}" value type'
         f'in the "{GIVEN_registered_domain.name}" domain'
     ):
-        client_cli.register().asset().definition(
+        client_cli.register().asset_definition(
             asset=GIVEN_fake_asset_name,
             domain=GIVEN_registered_domain.name,
             type_=GIVEN_numeric_type,
@@ -42,7 +42,7 @@ def test_register_asset_definition_with_store_type(
         f'with "{GIVEN_store_type}" value type'
         f'in the "{GIVEN_registered_domain.name}" domain'
     ):
-        client_cli.register().asset().definition(
+        client_cli.register().asset_definition(
             asset=GIVEN_fake_asset_name,
             domain=GIVEN_registered_domain.name,
             type_=GIVEN_store_type,
@@ -64,7 +64,7 @@ def test_register_asset_with_existing_name(
         f'with the same name "{GIVEN_registered_asset_definition_with_numeric_type.name}"'
         f'in the "{GIVEN_registered_asset_definition_with_numeric_type.domain}" domain'
     ):
-        client_cli.register().asset().definition(
+        client_cli.register().asset_definition(
             asset=GIVEN_registered_asset_definition_with_numeric_type.name,
             domain=GIVEN_registered_asset_definition_with_numeric_type.domain,
             type_=GIVEN_registered_asset_definition_with_numeric_type.type_,
@@ -82,7 +82,7 @@ def test_register_asset_with_empty_name(GIVEN_registered_domain):
         "WHEN client_cli tries to register an asset definition with an empty name"
         f'in the "{GIVEN_registered_domain.name}" domain'
     ):
-        client_cli.register().asset().definition(
+        client_cli.register().asset_definition(
             asset="", domain=GIVEN_registered_domain.name, type_="Numeric"
         )
     with allure.step(f'THEN сlient_cli should have the asset error: "{Stderr.EMPTY}"'):
@@ -96,7 +96,7 @@ def test_register_asset_with_not_existing_domain(
     with allure.step(
         "WHEN client_cli tries to register an asset definition with not existing domain"
     ):
-        client_cli.register().asset().definition(
+        client_cli.register().asset_definition(
             asset=GIVEN_fake_asset_name,
             domain=GIVEN_not_existing_name,
             type_=GIVEN_numeric_type,
@@ -112,7 +112,7 @@ def test_register_asset_with_too_long_type(
     with allure.step(
         "WHEN client_cli tries to register an asset definition with too long value type"
     ):
-        client_cli.register().asset().definition(
+        client_cli.register().asset_definition(
             asset=GIVEN_fake_asset_name,
             domain=GIVEN_registered_domain.name,
             type_="coin",

client_cli/pytests/test/conftest.py

@@ -109,7 +109,7 @@ def GIVEN_currently_account_quantity_with_two_quantity_of_asset(
         f'GIVEN the asset_definition "{name}" '
         f'in the "{GIVEN_currently_authorized_account.domain}" domain'
     ):
-        client_cli.register().asset().definition(
+        client_cli.register().asset_definition(
             asset=asset.definition.name,
             domain=asset.definition.domain,
             type_=asset.definition.type_,
@@ -140,7 +140,7 @@ def GIVEN_numeric_asset_for_account(
     with allure.step(
         f'GIVEN the asset_definition "{asset_def.name}" ' f'in the "{domain}" domain'
     ):
-        client_cli.register().asset().definition(
+        client_cli.register().asset_definition(
             asset=asset.definition.name,
             domain=asset.definition.domain,
             type_=asset.definition.type_,
@@ -168,7 +168,7 @@ def GIVEN_registered_asset_definition_with_numeric_type(
         f'GIVEN the asset_definition "{GIVEN_fake_asset_name}" '
         f'in the "{GIVEN_registered_domain.name}" domain'
     ):
-        client_cli.register().asset().definition(
+        client_cli.register().asset_definition(
             asset=asset_def.name,
             domain=asset_def.domain,
             type_=asset_def.type_,
@@ -212,7 +212,7 @@ def GIVEN_registered_asset_definition_with_store_type(
         f'GIVEN the asset_definition "{GIVEN_fake_asset_name}" '
         f'in the "{GIVEN_registered_domain.name}" domain'
     ):
-        client_cli.register().asset().definition(
+        client_cli.register().asset_definition(
             asset=asset_def.name,
             domain=asset_def.domain,
             type=asset_def.type,