From 83e3b74cbf6f0352f22790df8ea158953b238619 Mon Sep 17 00:00:00 2001 From: Julien Nicoulaud Date: Wed, 23 Oct 2024 17:39:32 +0200 Subject: [PATCH 1/2] test: update tests by reference --- .../data/format_address_name_input.json | 30 ---------- .../data/format_address_name_resolved.json | 57 ------------------- ...at_address_name_using_constants_input.json | 37 +----------- ...address_name_using_constants_resolved.json | 57 ------------------- 4 files changed, 2 insertions(+), 179 deletions(-) diff --git a/tests/convert/resolved/data/format_address_name_input.json b/tests/convert/resolved/data/format_address_name_input.json index 7643ad66..f63f4f67 100644 --- a/tests/convert/resolved/data/format_address_name_input.json +++ b/tests/convert/resolved/data/format_address_name_input.json @@ -42,36 +42,6 @@ "formats": { "TestPrimaryType": { "fields": [ - { - "path": "param1", - "label": "Minimal parameters set", - "format": "addressName" - }, - { - "path": "param1", - "label": "types specified", - "format": "addressName", - "params": { - "types": [ - "wallet", - "eoa", - "token", - "contract", - "collection" - ] - } - }, - { - "path": "param1", - "label": "sources specified", - "format": "addressName", - "params": { - "sources": [ - "local", - "ens" - ] - } - }, { "path": "param1", "label": "All parameters specified", diff --git a/tests/convert/resolved/data/format_address_name_resolved.json b/tests/convert/resolved/data/format_address_name_resolved.json index dfbb070e..61776c03 100644 --- a/tests/convert/resolved/data/format_address_name_resolved.json +++ b/tests/convert/resolved/data/format_address_name_resolved.json @@ -43,63 +43,6 @@ "formats": { "TestPrimaryType": { "fields": [ - { - "path": { - "type": "data", - "absolute": true, - "elements": [ - { - "type": "field", - "identifier": "param1" - } - ] - }, - "label": "Minimal parameters set", - "format": "addressName" - }, - { - "path": { - "type": "data", - "absolute": true, - "elements": [ - { - "type": "field", - "identifier": "param1" - } - ] - }, - "label": "types specified", - "format": "addressName", - "params": { - "types": [ - "wallet", - "eoa", - "token", - "contract", - "collection" - ] - } - }, - { - "path": { - "type": "data", - "absolute": true, - "elements": [ - { - "type": "field", - "identifier": "param1" - } - ] - }, - "label": "sources specified", - "format": "addressName", - "params": { - "sources": [ - "local", - "ens" - ] - } - }, { "path": { "type": "data", diff --git a/tests/convert/resolved/data/format_address_name_using_constants_input.json b/tests/convert/resolved/data/format_address_name_using_constants_input.json index 4a79d802..f25f479e 100644 --- a/tests/convert/resolved/data/format_address_name_using_constants_input.json +++ b/tests/convert/resolved/data/format_address_name_using_constants_input.json @@ -40,10 +40,7 @@ "metadata": { "constants": { "path": "#.param1", - "label1": "Minimal parameters set", - "label2": "types specified", - "label3": "sources specified", - "label4": "All parameters specified" + "label": "All parameters specified" } }, "display": { @@ -52,37 +49,7 @@ "fields": [ { "path": "$.metadata.constants.path", - "label": "$.metadata.constants.label1", - "format": "addressName" - }, - { - "path": "$.metadata.constants.path", - "label": "$.metadata.constants.label2", - "format": "addressName", - "params": { - "types": [ - "wallet", - "eoa", - "token", - "contract", - "collection" - ] - } - }, - { - "path": "$.metadata.constants.path", - "label": "$.metadata.constants.label3", - "format": "addressName", - "params": { - "sources": [ - "local", - "ens" - ] - } - }, - { - "path": "$.metadata.constants.path", - "label": "$.metadata.constants.label4", + "label": "$.metadata.constants.label", "format": "addressName", "params": { "types": [ diff --git a/tests/convert/resolved/data/format_address_name_using_constants_resolved.json b/tests/convert/resolved/data/format_address_name_using_constants_resolved.json index dfbb070e..61776c03 100644 --- a/tests/convert/resolved/data/format_address_name_using_constants_resolved.json +++ b/tests/convert/resolved/data/format_address_name_using_constants_resolved.json @@ -43,63 +43,6 @@ "formats": { "TestPrimaryType": { "fields": [ - { - "path": { - "type": "data", - "absolute": true, - "elements": [ - { - "type": "field", - "identifier": "param1" - } - ] - }, - "label": "Minimal parameters set", - "format": "addressName" - }, - { - "path": { - "type": "data", - "absolute": true, - "elements": [ - { - "type": "field", - "identifier": "param1" - } - ] - }, - "label": "types specified", - "format": "addressName", - "params": { - "types": [ - "wallet", - "eoa", - "token", - "contract", - "collection" - ] - } - }, - { - "path": { - "type": "data", - "absolute": true, - "elements": [ - { - "type": "field", - "identifier": "param1" - } - ] - }, - "label": "sources specified", - "format": "addressName", - "params": { - "sources": [ - "local", - "ens" - ] - } - }, { "path": { "type": "data", From 2dd1dbd8ddbcef65f99d7aa218a96834a4667687 Mon Sep 17 00:00:00 2001 From: Julien Nicoulaud Date: Wed, 23 Oct 2024 17:45:04 +0200 Subject: [PATCH 2/2] test: update EIP-712 roundtrip tests --- .../eip712/test_convert_eip712_round_trip.py | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/tests/convert/ledger/eip712/test_convert_eip712_round_trip.py b/tests/convert/ledger/eip712/test_convert_eip712_round_trip.py index 5f17ee79..a5b0958b 100644 --- a/tests/convert/ledger/eip712/test_convert_eip712_round_trip.py +++ b/tests/convert/ledger/eip712/test_convert_eip712_round_trip.py @@ -104,13 +104,20 @@ def _cleanup_formats(formats: dict[str, Any]) -> Any: del_by_path(message, "screens") if "fields" in message: for field in message["fields"]: - # Other formats are always converted to RAW - if "format" in field and field["format"] not in ( - FieldFormat.AMOUNT, - FieldFormat.TOKEN_AMOUNT, - FieldFormat.DATE, - ): - field["format"] = "raw" + if "format" in field: + format = field["format"] + + # Address name format parameters cannot be preserved + if format == "addressName": + del_by_path(field, "params") + + # Other formats are always converted to RAW + if format not in ( + FieldFormat.AMOUNT, + FieldFormat.TOKEN_AMOUNT, + FieldFormat.DATE, + ): + field["format"] = "raw" return formats