Fix simple hash functest (#258)

Both the simple_hasgh and the merkle_log tests used the same
asset signature which meant they were using the same asset for the test.
Changing the signature then made the simple_hash test pass and the
merkle_log fail as expected.

Additionally fixed pylint error about using 'yield from'

Fixes AB#9157

Author: eccles

archivist/archivistpublic.py

@@ -429,8 +429,7 @@ def list(
             except KeyError as ex:
                 raise ArchivistBadFieldError(f"No {field} found") from ex
 
-            for record in records:
-                yield record
+            yield from records
 
             page_token = data.get("next_page_token")
             if not page_token:

functests/execassets.py

@@ -46,12 +46,12 @@
     "behaviours": ASSET_BEHAVIOURS,
     "proof_mechanism": ProofMechanism.SIMPLE_HASH.name,
     "attributes": {
-        "arc_display_name": ASSET_NAME,
-        "arc_namespace": getenv("DATATRAILS_UNIQUE_ID"),
-        "arc_firmware_version": "1.0",
-        "arc_serial_number": "vtl-x4-07",
         "arc_description": "Traffic flow control light at A603 North East",
+        "arc_display_name": f"{ASSET_NAME} (SIMPLE_HASH)",
         "arc_display_type": "Traffic light with violation camera",
+        "arc_firmware_version": "1.0",
+        "arc_namespace": getenv("DATATRAILS_UNIQUE_ID"),
+        "arc_serial_number": "vtl-x4-07",
         "some_custom_attribute": "value",
     },
     "attachments": [
@@ -79,12 +79,12 @@
     "behaviours": ASSET_BEHAVIOURS,
     "proof_mechanism": ProofMechanism.MERKLE_LOG.name,
     "attributes": {
-        "arc_display_name": ASSET_NAME,
-        "arc_namespace": getenv("DATATRAILS_UNIQUE_ID"),
-        "arc_firmware_version": "1.0",
-        "arc_serial_number": "vtl-x4-07",
         "arc_description": "Traffic flow control light at A603 North East",
+        "arc_display_name": f"{ASSET_NAME} (MERKLE_LOG)",
         "arc_display_type": "Traffic light with violation camera",
+        "arc_firmware_version": "1.0",
+        "arc_namespace": getenv("DATATRAILS_UNIQUE_ID"),
+        "arc_serial_number": "vtl-x4-07",
         "some_custom_attribute": "value",
     },
     "attachments": [
@@ -117,7 +117,7 @@ def setUp(self):
             client_secret=getenv("DATATRAILS_APPREG_SECRET"),
             client_secret_filename=getenv("DATATRAILS_APPREG_SECRET_FILENAME"),
         )
-        self.arch = Archivist(getenv("DATATRAILS_URL"), auth, max_time=600)
+        self.arch = Archivist(getenv("DATATRAILS_URL"), auth, max_time=30)
         self.attrs = deepcopy(ATTRS)
         self.traffic_light = deepcopy(ATTRS)
         self.traffic_light["arc_display_type"] = "Traffic light with violation camera"

unittests/testassetsconstants.py

@@ -529,7 +529,7 @@ class TestAssetsBaseConfirm(TestCase):
     maxDiff = None
 
     def setUp(self):
-        self.arch = Archivist("url", "authauthauth", max_time=100)
+        self.arch = Archivist("url", "authauthauth", max_time=30)
 
     def tearDown(self):
         self.arch.close()