diff --git a/tests/device_tests/test_msg_applysettings.py b/tests/device_tests/test_msg_applysettings.py index 0431829ae..37dd3b741 100644 --- a/tests/device_tests/test_msg_applysettings.py +++ b/tests/device_tests/test_msg_applysettings.py @@ -21,8 +21,8 @@ from trezorlib.tools import parse_path EXPECTED_RESPONSES_NOPIN = [ messages.ButtonRequest(), - messages.Success(), - messages.Features(), + messages.Success, + messages.Features, ] EXPECTED_RESPONSES_PIN_T1 = [messages.PinMatrixRequest()] + EXPECTED_RESPONSES_NOPIN EXPECTED_RESPONSES_PIN_TT = [messages.ButtonRequest()] + EXPECTED_RESPONSES_NOPIN diff --git a/tests/device_tests/test_msg_backup_device.py b/tests/device_tests/test_msg_backup_device.py index fefaa028b..1d22b2f6c 100644 --- a/tests/device_tests/test_msg_backup_device.py +++ b/tests/device_tests/test_msg_backup_device.py @@ -56,8 +56,8 @@ def test_backup_bip39(client): messages.ButtonRequest(code=B.ResetDevice), messages.ButtonRequest(code=B.Success), messages.ButtonRequest(code=B.Success), - messages.Success(), - messages.Features(), + messages.Success, + messages.Features, ] ) device.backup(client) @@ -119,8 +119,8 @@ def test_backup_slip39_basic(client): messages.ButtonRequest(code=B.ResetDevice), messages.ButtonRequest(code=B.Success), messages.ButtonRequest(code=B.Success), - messages.Success(), - messages.Features(), + messages.Success, + messages.Features, ] ) device.backup(client) @@ -239,8 +239,8 @@ def test_backup_slip39_advanced(client): messages.ButtonRequest(code=B.ResetDevice), messages.ButtonRequest(code=B.Success), # show seeds ends here messages.ButtonRequest(code=B.Success), - messages.Success(), - messages.Features(), + messages.Success, + messages.Features, ] ) device.backup(client) diff --git a/tests/device_tests/test_msg_change_wipe_code_t1.py b/tests/device_tests/test_msg_change_wipe_code_t1.py index 17355f0bb..56c53c894 100644 --- a/tests/device_tests/test_msg_change_wipe_code_t1.py +++ b/tests/device_tests/test_msg_change_wipe_code_t1.py @@ -48,7 +48,7 @@ def _set_wipe_code(client, pin, wipe_code): client.set_expected_responses( [messages.ButtonRequest()] + pin_matrices - + [messages.Success(), messages.Features()] + + [messages.Success, messages.Features] ) device.change_wipe_code(client) diff --git a/tests/device_tests/test_msg_change_wipe_code_t2.py b/tests/device_tests/test_msg_change_wipe_code_t2.py index e3280df06..5c5e1cd64 100644 --- a/tests/device_tests/test_msg_change_wipe_code_t2.py +++ b/tests/device_tests/test_msg_change_wipe_code_t2.py @@ -59,7 +59,7 @@ def test_set_remove_wipe_code(client): with client: client.set_expected_responses( - [messages.ButtonRequest()] * 5 + [messages.Success(), messages.Features()] + [messages.ButtonRequest()] * 5 + [messages.Success, messages.Features] ) client.use_pin_sequence([PIN4, WIPE_CODE4, WIPE_CODE4]) device.change_wipe_code(client) @@ -71,7 +71,7 @@ def test_set_remove_wipe_code(client): # Test change wipe code. with client: client.set_expected_responses( - [messages.ButtonRequest()] * 5 + [messages.Success(), messages.Features()] + [messages.ButtonRequest()] * 5 + [messages.Success, messages.Features] ) client.use_pin_sequence([PIN4, WIPE_CODE6, WIPE_CODE6]) device.change_wipe_code(client) @@ -83,7 +83,7 @@ def test_set_remove_wipe_code(client): # Test remove wipe code. with client: client.set_expected_responses( - [messages.ButtonRequest()] * 3 + [messages.Success(), messages.Features()] + [messages.ButtonRequest()] * 3 + [messages.Success, messages.Features] ) client.use_pin_sequence([PIN4]) device.change_wipe_code(client, remove=True) @@ -125,7 +125,7 @@ def test_set_wipe_code_to_pin(client): with client: client.set_expected_responses( - [messages.ButtonRequest()] * 6 + [messages.Success(), messages.Features()] + [messages.ButtonRequest()] * 6 + [messages.Success, messages.Features] ) client.use_pin_sequence([PIN4, PIN4, WIPE_CODE4, WIPE_CODE4]) device.change_wipe_code(client) @@ -139,7 +139,7 @@ def test_set_pin_to_wipe_code(client): # Set wipe code. with client: client.set_expected_responses( - [messages.ButtonRequest()] * 4 + [messages.Success(), messages.Features()] + [messages.ButtonRequest()] * 4 + [messages.Success, messages.Features] ) client.use_pin_sequence([WIPE_CODE4, WIPE_CODE4]) device.change_wipe_code(client) diff --git a/tests/device_tests/test_msg_nem_signtx_mosaics_t2.py b/tests/device_tests/test_msg_nem_signtx_mosaics_t2.py index 55befcb51..92b00eab4 100644 --- a/tests/device_tests/test_msg_nem_signtx_mosaics_t2.py +++ b/tests/device_tests/test_msg_nem_signtx_mosaics_t2.py @@ -194,7 +194,7 @@ class TestMsgNEMSignTxMosaics: proto.ButtonRequest(code=B.ConfirmOutput), proto.ButtonRequest(code=B.ConfirmOutput), proto.ButtonRequest(code=B.SignTx), - proto.NEMSignedTx(), + proto.NEMSignedTx, ] ) client.set_input_flow(input_flow) diff --git a/tests/device_tests/test_msg_nem_signtx_transfers.py b/tests/device_tests/test_msg_nem_signtx_transfers.py index 222f0e05f..64f3d15b7 100644 --- a/tests/device_tests/test_msg_nem_signtx_transfers.py +++ b/tests/device_tests/test_msg_nem_signtx_transfers.py @@ -37,7 +37,7 @@ class TestMsgNEMSignTx: proto.ButtonRequest(code=proto.ButtonRequestType.ConfirmOutput), # Confirm recipient proto.ButtonRequest(code=proto.ButtonRequestType.SignTx), - proto.NEMSignedTx(), + proto.NEMSignedTx, ] ) @@ -79,7 +79,7 @@ class TestMsgNEMSignTx: proto.ButtonRequest(code=proto.ButtonRequestType.ConfirmOutput), # Confirm recipient proto.ButtonRequest(code=proto.ButtonRequestType.SignTx), - proto.NEMSignedTx(), + proto.NEMSignedTx, ] ) diff --git a/tests/device_tests/test_msg_ping.py b/tests/device_tests/test_msg_ping.py index b9a85b12b..4c3ea16bc 100644 --- a/tests/device_tests/test_msg_ping.py +++ b/tests/device_tests/test_msg_ping.py @@ -19,7 +19,7 @@ from trezorlib import messages def test_ping(client): with client: - client.set_expected_responses([messages.Success()]) + client.set_expected_responses([messages.Success]) res = client.ping("random data") assert res == "random data" @@ -27,7 +27,7 @@ def test_ping(client): client.set_expected_responses( [ messages.ButtonRequest(code=messages.ButtonRequestType.ProtectCall), - messages.Success(), + messages.Success, ] ) res = client.ping("random data", button_protection=True) diff --git a/tests/device_tests/test_msg_resetdevice_bip39_t2.py b/tests/device_tests/test_msg_resetdevice_bip39_t2.py index e863a2a13..d79c81212 100644 --- a/tests/device_tests/test_msg_resetdevice_bip39_t2.py +++ b/tests/device_tests/test_msg_resetdevice_bip39_t2.py @@ -71,8 +71,8 @@ def reset_device(client, strength): proto.ButtonRequest(code=B.ResetDevice), proto.ButtonRequest(code=B.Success), proto.ButtonRequest(code=B.Success), - proto.Success(), - proto.Features(), + proto.Success, + proto.Features, ] ) client.set_input_flow(input_flow) @@ -184,8 +184,8 @@ class TestMsgResetDeviceT2: proto.ButtonRequest(code=B.ResetDevice), proto.ButtonRequest(code=B.Success), proto.ButtonRequest(code=B.Success), - proto.Success(), - proto.Features(), + proto.Success, + proto.Features, ] ) client.set_input_flow(input_flow) diff --git a/tests/device_tests/test_msg_resetdevice_slip39_advanced.py b/tests/device_tests/test_msg_resetdevice_slip39_advanced.py index cb2fbb21b..d95e70de8 100644 --- a/tests/device_tests/test_msg_resetdevice_slip39_advanced.py +++ b/tests/device_tests/test_msg_resetdevice_slip39_advanced.py @@ -145,8 +145,8 @@ class TestMsgResetDeviceT2: proto.ButtonRequest(code=B.ResetDevice), proto.ButtonRequest(code=B.Success), # show seeds ends here proto.ButtonRequest(code=B.Success), - proto.Success(), - proto.Features(), + proto.Success, + proto.Features, ] ) client.set_input_flow(input_flow) diff --git a/tests/device_tests/test_msg_resetdevice_slip39_basic.py b/tests/device_tests/test_msg_resetdevice_slip39_basic.py index 4482379d3..3fc694458 100644 --- a/tests/device_tests/test_msg_resetdevice_slip39_basic.py +++ b/tests/device_tests/test_msg_resetdevice_slip39_basic.py @@ -92,8 +92,8 @@ def reset_device(client, strength): proto.ButtonRequest(code=B.ResetDevice), proto.ButtonRequest(code=B.Success), proto.ButtonRequest(code=B.Success), - proto.Success(), - proto.Features(), + proto.Success, + proto.Features, ] ) client.set_input_flow(input_flow) diff --git a/tests/device_tests/test_reset_backup.py b/tests/device_tests/test_reset_backup.py index 64069d6dc..9d58fe73b 100644 --- a/tests/device_tests/test_reset_backup.py +++ b/tests/device_tests/test_reset_backup.py @@ -57,8 +57,8 @@ def backup_flow_bip39(client): messages.ButtonRequest(code=B.ResetDevice), messages.ButtonRequest(code=B.Success), messages.ButtonRequest(code=B.Success), - messages.Success(), - messages.Features(), + messages.Success, + messages.Features, ] ) client.set_input_flow(input_flow) @@ -102,8 +102,8 @@ def backup_flow_slip39_basic(client): * 5 # individual shares + [ messages.ButtonRequest(code=B.Success), - messages.Success(), - messages.Features(), + messages.Success, + messages.Features, ] ) device.backup(client) @@ -163,8 +163,8 @@ def backup_flow_slip39_advanced(client): * 25 # individual shares + [ messages.ButtonRequest(code=B.Success), - messages.Success(), - messages.Features(), + messages.Success, + messages.Features, ] ) device.backup(client) @@ -240,8 +240,8 @@ def test_skip_backup_manual(client, backup_type, backup_flow): messages.EntropyRequest(), messages.ButtonRequest(code=B.ResetDevice), messages.ButtonRequest(code=B.ResetDevice), - messages.Success(), - messages.Features(), + messages.Success, + messages.Features, ] ) device.reset( diff --git a/tests/device_tests/test_reset_recovery_bip39.py b/tests/device_tests/test_reset_recovery_bip39.py index be88710cf..7fe6dd54f 100644 --- a/tests/device_tests/test_reset_recovery_bip39.py +++ b/tests/device_tests/test_reset_recovery_bip39.py @@ -75,8 +75,8 @@ def reset(client, strength=128, skip_backup=False): messages.ButtonRequest(code=B.ResetDevice), messages.ButtonRequest(code=B.Success), messages.ButtonRequest(code=B.Success), - messages.Success(), - messages.Features(), + messages.Success, + messages.Features, ] ) client.set_input_flow(input_flow) @@ -136,8 +136,8 @@ def recover(client, mnemonic): messages.ButtonRequest(code=B.RecoveryHomepage), messages.ButtonRequest(code=B.MnemonicInput), messages.ButtonRequest(code=B.Success), - messages.Success(), - messages.Features(), + messages.Success, + messages.Features, ] ) ret = device.recover(client, pin_protection=False, label="label") diff --git a/tests/device_tests/test_reset_recovery_slip39_advanced.py b/tests/device_tests/test_reset_recovery_slip39_advanced.py index 175ad2a6a..86eed36ea 100644 --- a/tests/device_tests/test_reset_recovery_slip39_advanced.py +++ b/tests/device_tests/test_reset_recovery_slip39_advanced.py @@ -170,8 +170,8 @@ def reset(client, strength=128): messages.ButtonRequest(code=B.ResetDevice), messages.ButtonRequest(code=B.Success), # show seeds ends here messages.ButtonRequest(code=B.Success), - messages.Success(), - messages.Features(), + messages.Success, + messages.Features, ] ) client.set_input_flow(input_flow) diff --git a/tests/device_tests/test_reset_recovery_slip39_basic.py b/tests/device_tests/test_reset_recovery_slip39_basic.py index 7e4682039..43ad63cba 100644 --- a/tests/device_tests/test_reset_recovery_slip39_basic.py +++ b/tests/device_tests/test_reset_recovery_slip39_basic.py @@ -102,8 +102,8 @@ def reset(client, strength=128): messages.ButtonRequest(code=B.ResetDevice), messages.ButtonRequest(code=B.Success), messages.ButtonRequest(code=B.Success), - messages.Success(), - messages.Features(), + messages.Success, + messages.Features, ] ) client.set_input_flow(input_flow) diff --git a/tests/persistence_tests/test_wipe_code.py b/tests/persistence_tests/test_wipe_code.py index 0bf118eb1..092ee9937 100644 --- a/tests/persistence_tests/test_wipe_code.py +++ b/tests/persistence_tests/test_wipe_code.py @@ -40,7 +40,7 @@ def setup_device_core(client, pin, wipe_code): with client: client.set_expected_responses( - [messages.ButtonRequest()] * 5 + [messages.Success(), messages.Features()] + [messages.ButtonRequest()] * 5 + [messages.Success, messages.Features] ) client.set_input_flow(input_flow) device.change_wipe_code(client)