Fix stax test failing due to ragger python package changes and SDK up…

…grade.

Add target field in makefile to distinguish between stax and flex. Both use same BOLOS_SDK

Makefile

@@ -54,18 +54,20 @@ scan-build:	scan-build-nanos scan-build-nanosp	\
 app_%_dbg.tgz:	app/src/*.[ch]	\
 	app/src/parser/*.[ch]	\
 	app/Makefile
+	target=$(shell echo $*); \
 	SDK=$(shell echo $* | tr "[:lower:]" "[:upper:]")_SDK;	\
 	$(DOCKER_RUN_APP_BUILDER) bash -c						\
-		"BOLOS_SDK=\$$$$SDK make -C app DEBUG=1"
+		"BOLOS_SDK=\$$$$SDK  TARGET=\$$$$target make -C app DEBUG=1"
 	$(DOCKER_RUN_APP_BUILDER) bash -c "cd app/bin/ && tar cz ." > $@
 
 
 app_%.tgz:	app/src/*.[ch]		\
 		app/src/parser/*.[ch]	\
 		app/Makefile
+	target=$(shell echo $*); \
 	SDK=$(shell echo $* | tr "[:lower:]" "[:upper:]")_SDK;	\
 	$(DOCKER_RUN_APP_BUILDER) bash -c						\
-		"BOLOS_SDK=\$$$$SDK make -C app"
+		"BOLOS_SDK=\$$$$SDK TARGET=\$$$$target make -C app"
 	$(DOCKER_RUN_APP_BUILDER) bash -c "cd app/bin/ && tar cz ." > $@
 
 clean:

tests/integration/stax/utils.py

@@ -22,10 +22,10 @@
 from ragger.backend import SpeculosBackend
 from ragger.backend.interface import RaisePolicy
 from ragger.firmware import Firmware
-from ragger.firmware.stax.screen import MetaScreen
-from ragger.firmware.stax.use_cases import UseCaseHomeExt, UseCaseSettings, UseCaseAddressConfirmation, UseCaseReview, UseCaseChoice
-from ragger.firmware.stax.layouts import ChoiceList
-from ragger.firmware.stax.positions import BUTTON_LOWER_LEFT, BUTTON_LOWER_RIGHT, BUTTON_ABOVE_LOWER_MIDDLE, BUTTON_LOWER_MIDDLE
+from ragger.firmware.touch.screen import MetaScreen
+from ragger.firmware.touch.use_cases import UseCaseHomeExt, UseCaseSettings, UseCaseAddressConfirmation, UseCaseReview, UseCaseChoice
+from ragger.firmware.touch.layouts import ChoiceList
+from ragger.firmware.touch.positions import STAX_BUTTON_LOWER_LEFT, STAX_BUTTON_LOWER_RIGHT, STAX_BUTTON_ABOVE_LOWER_MIDDLE, STAX_BUTTON_LOWER_MIDDLE
 
 MAX_ATTEMPTS = 50
 
@@ -140,7 +140,7 @@ def review_confirm_signing(self, expected_apdu):
     def enable_expert_mode(self, expert_enabled=False):
         if not expert_enabled:
             self.assert_screen("enable_expert_mode")
-            self.welcome.client.finger_touch(BUTTON_ABOVE_LOWER_MIDDLE.x, BUTTON_ABOVE_LOWER_MIDDLE.y)
+            self.welcome.client.finger_touch(STAX_BUTTON_ABOVE_LOWER_MIDDLE.x, STAX_BUTTON_ABOVE_LOWER_MIDDLE.y)
             self.assert_screen("enabled_expert_mode")
 
     def expert_mode_splash(self, expert_enabled=False):
@@ -151,17 +151,17 @@ def expert_mode_splash(self, expert_enabled=False):
 
 
     def review_reject_signing(self, confirmRejection = True):
-        self.welcome.client.finger_touch(BUTTON_LOWER_LEFT.x, BUTTON_LOWER_RIGHT.y)
+        self.welcome.client.finger_touch(STAX_BUTTON_LOWER_LEFT.x, STAX_BUTTON_LOWER_RIGHT.y)
         # Rejection confirmation page
         self.assert_screen("confirm_rejection")
         if confirmRejection:
             self.welcome.client.pause_ticker()
-            self.welcome.client.finger_touch(BUTTON_ABOVE_LOWER_MIDDLE.x, BUTTON_ABOVE_LOWER_MIDDLE.y)
+            self.welcome.client.finger_touch(STAX_BUTTON_ABOVE_LOWER_MIDDLE.x, STAX_BUTTON_ABOVE_LOWER_MIDDLE.y)
             self.assert_screen("reject_review")
             self.review.tap()
             self.welcome.client.resume_ticker()
         else:
-            self.welcome.client.finger_touch(BUTTON_LOWER_MIDDLE.x, BUTTON_LOWER_MIDDLE.y)
+            self.welcome.client.finger_touch(STAX_BUTTON_LOWER_MIDDLE.x, STAX_BUTTON_LOWER_MIDDLE.y)
 
 def stax_app(prefix) -> TezosAppScreen:
     port = os.environ["PORT"]
@@ -201,7 +201,7 @@ def verify_reject_response_common(app, tag, err_code):
     app.review.reject()
     app.assert_screen("reject_review")
     app.welcome.client.pause_ticker()
-    app.welcome.client.finger_touch(BUTTON_ABOVE_LOWER_MIDDLE.x, BUTTON_ABOVE_LOWER_MIDDLE.y)
+    app.welcome.client.finger_touch(STAX_BUTTON_ABOVE_LOWER_MIDDLE.x, STAX_BUTTON_ABOVE_LOWER_MIDDLE.y)
     app.assert_screen("rejected")
     app.review.tap()
     app.welcome.client.resume_ticker()

tests/requirements.txt

@@ -3,6 +3,6 @@ setuptools
 pkginfo
 cryptography
 base58
-pytezos==3.10.3
+pytezos
 GitPython
 pytest-xdist