Skip to content

Commit

Permalink
Revert "Merge branch 'main' of https://github.com/phantasma-io/app-ph…
Browse files Browse the repository at this point in the history
…antasma-new"

This reverts commit f7e2bdc, reversing
changes made to 3492dd5.
  • Loading branch information
rduarte83 committed Dec 7, 2023
1 parent f7e2bdc commit d1cdc00
Show file tree
Hide file tree
Showing 149 changed files with 7 additions and 8 deletions.
Binary file modified tests/snapshots/nanos/test_app_mainmenu/00000.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/snapshots/nanos/test_app_mainmenu/00001.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/snapshots/nanos/test_app_mainmenu/00003.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed tests/snapshots/nanos/test_app_mainmenu/00004.png
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file modified tests/snapshots/nanos/test_get_public_key_confirm_refused/00001.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file added tests/snapshots/nanos/test_sign_tx_long_tx/00000.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tests/snapshots/nanos/test_sign_tx_long_tx/00001.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tests/snapshots/nanos/test_sign_tx_long_tx/00002.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tests/snapshots/nanos/test_sign_tx_long_tx/00003.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tests/snapshots/nanos/test_sign_tx_long_tx/00004.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tests/snapshots/nanos/test_sign_tx_long_tx/00005.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tests/snapshots/nanos/test_sign_tx_long_tx/00006.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tests/snapshots/nanos/test_sign_tx_refused/00000.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tests/snapshots/nanos/test_sign_tx_refused/00001.png
Binary file added tests/snapshots/nanos/test_sign_tx_refused/00002.png
Binary file added tests/snapshots/nanos/test_sign_tx_refused/00003.png
Binary file added tests/snapshots/nanos/test_sign_tx_refused/00004.png
Binary file added tests/snapshots/nanos/test_sign_tx_refused/00005.png
Binary file added tests/snapshots/nanos/test_sign_tx_refused/00006.png
Binary file added tests/snapshots/nanos/test_sign_tx_refused/00007.png
Binary file added tests/snapshots/nanosp/test_app_mainmenu/00000.png
Binary file added tests/snapshots/nanosp/test_app_mainmenu/00001.png
Binary file added tests/snapshots/nanosp/test_app_mainmenu/00002.png
Binary file added tests/snapshots/nanosp/test_app_mainmenu/00003.png
Binary file added tests/snapshots/nanox/test_app_mainmenu/00000.png
Binary file added tests/snapshots/nanox/test_app_mainmenu/00001.png
Binary file added tests/snapshots/nanox/test_app_mainmenu/00002.png
Binary file added tests/snapshots/nanox/test_app_mainmenu/00003.png
Binary file added tests/snapshots/nanox/test_sign_tx_long_tx/00000.png
Binary file added tests/snapshots/nanox/test_sign_tx_long_tx/00001.png
Binary file added tests/snapshots/nanox/test_sign_tx_long_tx/00002.png
Binary file added tests/snapshots/nanox/test_sign_tx_long_tx/00003.png
Binary file added tests/snapshots/nanox/test_sign_tx_long_tx/00004.png
Binary file added tests/snapshots/nanox/test_sign_tx_refused/00000.png
Binary file added tests/snapshots/nanox/test_sign_tx_refused/00001.png
Binary file added tests/snapshots/nanox/test_sign_tx_refused/00002.png
Binary file added tests/snapshots/nanox/test_sign_tx_refused/00003.png
Binary file added tests/snapshots/nanox/test_sign_tx_refused/00004.png
Binary file added tests/snapshots/nanox/test_sign_tx_refused/00005.png
Binary file added tests/snapshots/stax/test_app_mainmenu/00000.png
Binary file added tests/snapshots/stax/test_app_mainmenu/00001.png
Binary file added tests/snapshots/stax/test_app_mainmenu/00002.png
Binary file added tests/snapshots/stax/test_app_mainmenu/00003.png
Binary file added tests/snapshots/stax/test_app_mainmenu/00004.png
Binary file added tests/snapshots/stax/test_app_mainmenu/00005.png
Binary file added tests/snapshots/stax/test_app_mainmenu/00006.png
Binary file added tests/snapshots/stax/test_app_mainmenu/00007.png
Binary file added tests/snapshots/stax/test_app_mainmenu/00008.png
Binary file added tests/snapshots/stax/test_app_mainmenu/00009.png
Binary file added tests/snapshots/stax/test_app_mainmenu/00010.png
3 changes: 1 addition & 2 deletions tests/test_app_mainmenu.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ def test_app_mainmenu(firmware, navigator, test_name):
instructions = [
NavInsID.RIGHT_CLICK,
NavInsID.RIGHT_CLICK,
NavInsID.RIGHT_CLICK,
NavInsID.RIGHT_CLICK,
NavInsID.RIGHT_CLICK
]
else:
instructions = [
Expand Down
4 changes: 2 additions & 2 deletions tests/test_pubkey_cmd.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ def test_get_public_key_confirm_accepted(firmware, backend, navigator, test_name
response = client.get_async_response().data
_, public_key, _, chain_code = unpack_get_public_key_response(response)

'''ref_public_key, ref_chain_code = calculate_public_key_and_chaincode(CurveChoice.Secp256k1, path=path)
ref_public_key, ref_chain_code = calculate_public_key_and_chaincode(CurveChoice.Secp256k1, path=path)
assert public_key.hex() == ref_public_key
assert chain_code.hex() == ref_chain_code'''
assert chain_code.hex() == ref_chain_code


# In this test we check that the GET_PUBLIC_KEY in confirmation mode replies an error if the user refuses
Expand Down
8 changes: 4 additions & 4 deletions tests/test_sign_cmd.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ def test_sign_tx_short_tx(firmware, backend, navigator, test_name):
# Use the app interface instead of raw interface
client = BoilerplateCommandSender(backend)
# The path used for this entire test
path: str = "m/44'/60'/0'/0/0"
path: str = "m/44'/1'/0'/0/0"

# First we need to get the public key of the device in order to build the transaction
rapdu = client.get_public_key(path=path)
Expand Down Expand Up @@ -62,7 +62,7 @@ def test_sign_tx_short_tx(firmware, backend, navigator, test_name):
def test_sign_tx_long_tx(firmware, backend, navigator, test_name):
# Use the app interface instead of raw interface
client = BoilerplateCommandSender(backend)
path: str = "m/44'/60'/0'/0/0"
path: str = "m/44'/1'/0'/0/0"

rapdu = client.get_public_key(path=path)
_, public_key, _, _ = unpack_get_public_key_response(rapdu.data)
Expand Down Expand Up @@ -101,7 +101,7 @@ def test_sign_tx_long_tx(firmware, backend, navigator, test_name):
def test_sign_tx_refused(firmware, backend, navigator, test_name):
# Use the app interface instead of raw interface
client = BoilerplateCommandSender(backend)
path: str = "m/44'/60'/0'/0/0"
path: str = "m/44'/1'/0'/0/0"

rapdu = client.get_public_key(path=path)
_, pub_key, _, _ = unpack_get_public_key_response(rapdu.data)
Expand All @@ -117,7 +117,7 @@ def test_sign_tx_refused(firmware, backend, navigator, test_name):
with pytest.raises(ExceptionRAPDU) as e:
with client.sign_tx(path=path, transaction=transaction):
navigator.navigate_until_text_and_compare(NavInsID.RIGHT_CLICK,
[NavInsID.BOTH_CLICK],
[NavInsID.BOTH_CLICK],
"Reject",
ROOT_SCREENSHOT_PATH,
test_name)
Expand Down

0 comments on commit d1cdc00

Please sign in to comment.