diff --git a/tests/device_tests/nem/test_signtx_mosaics_t1.py b/tests/device_tests/nem/test_signtx_mosaics.py similarity index 97% rename from tests/device_tests/nem/test_signtx_mosaics_t1.py rename to tests/device_tests/nem/test_signtx_mosaics.py index 6bf0b81dc..37addf5b1 100644 --- a/tests/device_tests/nem/test_signtx_mosaics_t1.py +++ b/tests/device_tests/nem/test_signtx_mosaics.py @@ -21,10 +21,11 @@ from trezorlib.tools import parse_path from ...common import MNEMONIC12 +ADDRESS_N = parse_path("m/44'/1'/0'/0'/0'") + pytestmark = [ pytest.mark.altcoin, pytest.mark.nem, - pytest.mark.skip_t2, pytest.mark.setup_client(mnemonic=MNEMONIC12), ] @@ -32,7 +33,7 @@ pytestmark = [ def test_nem_signtx_mosaic_supply_change(client): tx = nem.sign_tx( client, - parse_path("m/44'/1'/0'/0'/0'"), + ADDRESS_N, { "timeStamp": 74649215, "fee": 2000000, @@ -61,7 +62,7 @@ def test_nem_signtx_mosaic_supply_change(client): def test_nem_signtx_mosaic_creation(client): tx = nem.sign_tx( client, - parse_path("m/44'/1'/0'/0'/0'"), + ADDRESS_N, { "timeStamp": 74649215, "fee": 2000000, @@ -93,7 +94,7 @@ def test_nem_signtx_mosaic_creation(client): def test_nem_signtx_mosaic_creation_properties(client): tx = nem.sign_tx( client, - parse_path("m/44'/1'/0'/0'/0'"), + ADDRESS_N, { "timeStamp": 74649215, "fee": 2000000, @@ -130,7 +131,7 @@ def test_nem_signtx_mosaic_creation_properties(client): def test_nem_signtx_mosaic_creation_levy(client): tx = nem.sign_tx( client, - parse_path("m/44'/1'/0'/0'/0'"), + ADDRESS_N, { "timeStamp": 74649215, "fee": 2000000, diff --git a/tests/device_tests/nem/test_signtx_mosaics_t2.py b/tests/device_tests/nem/test_signtx_mosaics_t2.py deleted file mode 100644 index cbe0be5a9..000000000 --- a/tests/device_tests/nem/test_signtx_mosaics_t2.py +++ /dev/null @@ -1,168 +0,0 @@ -# This file is part of the Trezor project. -# -# Copyright (C) 2012-2019 SatoshiLabs and contributors -# -# This library is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# as published by the Free Software Foundation. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the License along with this library. -# If not, see . - -import pytest - -from trezorlib import nem -from trezorlib.tools import parse_path - -from ...common import MNEMONIC12 - -ADDRESS_N = parse_path("m/44'/1'/0'/0'/0'") - -pytestmark = [ - pytest.mark.altcoin, - pytest.mark.nem, - pytest.mark.skip_t1, - pytest.mark.setup_client(mnemonic=MNEMONIC12), -] - - -# assertion data from T1 - - -def test_nem_signtx_mosaic_supply_change(client): - with client: - tx = nem.sign_tx( - client, - parse_path("m/44'/1'/0'/0'/0'"), - { - "timeStamp": 74649215, - "fee": 2000000, - "type": nem.TYPE_MOSAIC_SUPPLY_CHANGE, - "deadline": 74735615, - "message": {}, - "mosaicId": {"namespaceId": "hellom", "name": "Hello mosaic"}, - "supplyType": 1, - "delta": 1, - "version": (0x98 << 24), - "creationFeeSink": "TALICE2GMA34CXHD7XLJQ536NM5UNKQHTORNNT2J", - "creationFee": 1500, - }, - ) - - assert ( - tx.data.hex() - == "02400000010000987f0e730420000000edfd32f6e760648c032f9acb4b30d514265f6a5b5f8a7154f2618922b406208480841e0000000000ff5f74041a0000000600000068656c6c6f6d0c00000048656c6c6f206d6f73616963010000000100000000000000" - ) - assert ( - tx.signature.hex() - == "928b03c4a69fff35ecf0912066ea705895b3028fad141197d7ea2b56f1eef2a2516455e6f35d318f6fa39e2bb40492ac4ae603260790f7ebc7ea69feb4ca4c0a" - ) - - -def test_nem_signtx_mosaic_creation(client): - test_suite = { - "timeStamp": 74649215, - "fee": 2000000, - "type": nem.TYPE_MOSAIC_CREATION, - "deadline": 74735615, - "message": {}, - "mosaicDefinition": { - "id": {"namespaceId": "hellom", "name": "Hello mosaic"}, - "levy": {}, - "properties": {}, - "description": "lorem", - }, - "version": (0x98 << 24), - "creationFeeSink": "TALICE2GMA34CXHD7XLJQ536NM5UNKQHTORNNT2J", - "creationFee": 1500, - } - - # not using client.nem_sign_tx() because of swiping - tx = nem.sign_tx(client, ADDRESS_N, test_suite) - assert ( - tx.data.hex() - == "01400000010000987f0e730420000000edfd32f6e760648c032f9acb4b30d514265f6a5b5f8a7154f2618922b406208480841e0000000000ff5f7404c100000020000000edfd32f6e760648c032f9acb4b30d514265f6a5b5f8a7154f2618922b40620841a0000000600000068656c6c6f6d0c00000048656c6c6f206d6f73616963050000006c6f72656d04000000150000000c00000064697669736962696c6974790100000030160000000d000000696e697469616c537570706c7901000000301a0000000d000000737570706c794d757461626c650500000066616c7365190000000c0000007472616e7366657261626c650500000066616c7365000000002800000054414c49434532474d4133344358484437584c4a513533364e4d35554e4b5148544f524e4e54324adc05000000000000" - ) - assert ( - tx.signature.hex() - == "537adf4fd9bd5b46e204b2db0a435257a951ed26008305e0aa9e1201dafa4c306d7601a8dbacabf36b5137724386124958d53202015ab31fb3d0849dfed2df0e" - ) - - -def test_nem_signtx_mosaic_creation_properties(client): - test_suite = { - "timeStamp": 74649215, - "fee": 2000000, - "type": nem.TYPE_MOSAIC_CREATION, - "deadline": 74735615, - "message": {}, - "mosaicDefinition": { - "id": {"namespaceId": "hellom", "name": "Hello mosaic"}, - "levy": {}, - "properties": [ - {"name": "divisibility", "value": "4"}, - {"name": "initialSupply", "value": "200"}, - {"name": "supplyMutable", "value": "false"}, - {"name": "transferable", "value": "true"}, - ], - "description": "lorem", - }, - "version": (0x98 << 24), - "creationFeeSink": "TALICE2GMA34CXHD7XLJQ536NM5UNKQHTORNNT2J", - "creationFee": 1500, - } - - # not using client.nem_sign_tx() because of swiping - tx = nem.sign_tx(client, ADDRESS_N, test_suite) - assert ( - tx.data.hex() - == "01400000010000987f0e730420000000edfd32f6e760648c032f9acb4b30d514265f6a5b5f8a7154f2618922b406208480841e0000000000ff5f7404c200000020000000edfd32f6e760648c032f9acb4b30d514265f6a5b5f8a7154f2618922b40620841a0000000600000068656c6c6f6d0c00000048656c6c6f206d6f73616963050000006c6f72656d04000000150000000c00000064697669736962696c6974790100000034180000000d000000696e697469616c537570706c79030000003230301a0000000d000000737570706c794d757461626c650500000066616c7365180000000c0000007472616e7366657261626c650400000074727565000000002800000054414c49434532474d4133344358484437584c4a513533364e4d35554e4b5148544f524e4e54324adc05000000000000" - ) - assert ( - tx.signature.hex() - == "f17c859710060f2ea9a0ab740ef427431cf36bdc7d263570ca282bd66032e9f5737a921be9839429732e663be2bb74ccc16f34f5157ff2ef00a65796b54e800e" - ) - - -def test_nem_signtx_mosaic_creation_levy(client): - test_suite = { - "timeStamp": 74649215, - "fee": 2000000, - "type": nem.TYPE_MOSAIC_CREATION, - "deadline": 74735615, - "message": {}, - "mosaicDefinition": { - "id": {"namespaceId": "hellom", "name": "Hello mosaic"}, - "properties": [ - {"name": "divisibility", "value": "4"}, - {"name": "initialSupply", "value": "200"}, - {"name": "supplyMutable", "value": "false"}, - {"name": "transferable", "value": "true"}, - ], - "levy": { - "type": 1, - "fee": 2, - "recipient": "TALICE2GMA34CXHD7XLJQ536NM5UNKQHTORNNT2J", - "mosaicId": {"namespaceId": "hellom", "name": "Hello mosaic"}, - }, - "description": "lorem", - }, - "version": (0x98 << 24), - "creationFeeSink": "TALICE2GMA34CXHD7XLJQ536NM5UNKQHTORNNT2J", - "creationFee": 1500, - } - - tx = nem.sign_tx(client, ADDRESS_N, test_suite) - assert ( - tx.data.hex() - == "01400000010000987f0e730420000000edfd32f6e760648c032f9acb4b30d514265f6a5b5f8a7154f2618922b406208480841e0000000000ff5f74041801000020000000edfd32f6e760648c032f9acb4b30d514265f6a5b5f8a7154f2618922b40620841a0000000600000068656c6c6f6d0c00000048656c6c6f206d6f73616963050000006c6f72656d04000000150000000c00000064697669736962696c6974790100000034180000000d000000696e697469616c537570706c79030000003230301a0000000d000000737570706c794d757461626c650500000066616c7365180000000c0000007472616e7366657261626c65040000007472756556000000010000002800000054414c49434532474d4133344358484437584c4a513533364e4d35554e4b5148544f524e4e54324a1a0000000600000068656c6c6f6d0c00000048656c6c6f206d6f7361696302000000000000002800000054414c49434532474d4133344358484437584c4a513533364e4d35554e4b5148544f524e4e54324adc05000000000000" - ) - assert ( - tx.signature.hex() - == "b87aac1ddf146d35e6a7f3451f57e2fe504ac559031e010a51261257c37bd50fcfa7b2939dd7a3203b54c4807d458475182f5d3dc135ec0d1d4a9cd42159fd0a" - ) diff --git a/tests/ui_tests/fixtures.json b/tests/ui_tests/fixtures.json index 8e649741a..63aa31f61 100644 --- a/tests/ui_tests/fixtures.json +++ b/tests/ui_tests/fixtures.json @@ -689,10 +689,10 @@ "monero-test_getaddress.py::test_monero_getaddress": "eab8fac3710a0ca28d350f83600ebaf725019f08d7f722a611bb113d5c082887", "monero-test_getwatchkey.py::test_monero_getwatchkey": "49660dcffe0ec2f28055f449d153ce3b001b59d5b529cdbf997dc9a61a6c3b3f", "nem-test_getaddress.py::test_nem_getaddress": "0367ee13eba20326c9962991cfcffaf9d0c6f4306479adc54649efea5e3044c4", -"nem-test_signtx_mosaics_t2.py::test_nem_signtx_mosaic_creation": "4b580f271d2877f02a9bf527a37efd0691fe45c64c6fa753793a7d465bf566a3", -"nem-test_signtx_mosaics_t2.py::test_nem_signtx_mosaic_creation_levy": "3979ad3c3f580c74c3a81c12436a1cf6dde32779911efd761225dabb7789b922", -"nem-test_signtx_mosaics_t2.py::test_nem_signtx_mosaic_creation_properties": "6b897264e5526a47a527c7fcfc14e5af86d3cc13bfc17c16b76418be498ef851", -"nem-test_signtx_mosaics_t2.py::test_nem_signtx_mosaic_supply_change": "88795a8194efe92eae0db3eb5e552c9432928089b805c45abc26b456731cfbf0", +"nem-test_signtx_mosaics.py::test_nem_signtx_mosaic_creation": "4b580f271d2877f02a9bf527a37efd0691fe45c64c6fa753793a7d465bf566a3", +"nem-test_signtx_mosaics.py::test_nem_signtx_mosaic_creation_levy": "3979ad3c3f580c74c3a81c12436a1cf6dde32779911efd761225dabb7789b922", +"nem-test_signtx_mosaics.py::test_nem_signtx_mosaic_creation_properties": "6b897264e5526a47a527c7fcfc14e5af86d3cc13bfc17c16b76418be498ef851", +"nem-test_signtx_mosaics.py::test_nem_signtx_mosaic_supply_change": "88795a8194efe92eae0db3eb5e552c9432928089b805c45abc26b456731cfbf0", "nem-test_signtx_multisig.py::test_nem_signtx_aggregate_modification": "dc3c5f08b0fe05fed099d163cdadf6577141fc6dc9df93cf07f36108c1374a8b", "nem-test_signtx_multisig.py::test_nem_signtx_multisig": "29330e885b2798f94caed8eb1589137ac8f8f4abc6ace90bf4422dc68aca1b29", "nem-test_signtx_multisig.py::test_nem_signtx_multisig_signer": "b55762e19ef5d901f1c4c5240e65ee5d6a4fd52ce89e760e4237de7ab0ecda20",