test(sign-message): match the supported review order

Author: BitHighlander

tests/common.py

@@ -125,19 +125,11 @@ def assertEqual(self, lhs, rhs):
     def assertEndsWith(self, s, suffix):
         self.assertTrue(s.endswith(suffix), "'{}'.endswith('{}')".format(s, suffix))
 
-    def firmware_version(self):
+    def requires_firmware(self, ver_required):
         self.client.init_device()
         features = self.client.features
         version = "%s.%s.%s" % (features.major_version, features.minor_version, features.patch_version)
-        return semver.VersionInfo.parse(version)
-
-    def firmware_at_least(self, ver_required):
-        """Return whether the connected firmware includes a versioned feature."""
-        return self.firmware_version() >= semver.VersionInfo.parse(ver_required)
-
-    def requires_firmware(self, ver_required):
-        version = self.firmware_version()
-        if version < semver.VersionInfo.parse(ver_required):
+        if semver.VersionInfo.parse(version) < semver.VersionInfo.parse(ver_required):
             self.skipTest("Firmware version " + ver_required + " or higher is required to run this test")
 
     def requires_taproot(self):

tests/test_protection_levels.py

@@ -127,28 +127,16 @@ def test_reset_device(self):
         self.assertRaises(Exception, self.client.reset_device, False, 128, True, False, 'label', 'english')
 
     def test_sign_message(self):
-        authentication_first = self.firmware_at_least("7.16.0")
         with self.client:
             self.setup_mnemonic_pin_passphrase()
             self.client.clear_session()
-            if authentication_first:
-                expected_responses = [
-                    proto.PinMatrixRequest(),
-                    proto.PassphraseRequest(),
-                    proto.ButtonRequest(),
-                    proto.ButtonRequest(
-                        code=proto_types.ButtonRequest_SignMessage),
-                    proto.MessageSignature(),
-                ]
-            else:
-                expected_responses = [
-                    proto.ButtonRequest(),
-                    proto.PinMatrixRequest(),
-                    proto.PassphraseRequest(),
-                    proto.ButtonRequest(),
-                    proto.MessageSignature(),
-                ]
-            self.client.set_expected_responses(expected_responses)
+            self.client.set_expected_responses([
+                proto.ButtonRequest(),
+                proto.PinMatrixRequest(),
+                proto.PassphraseRequest(),
+                proto.ButtonRequest(),
+                proto.MessageSignature(),
+            ])
             self.client.sign_message('Bitcoin', [], 'testing message')
 
     def test_verify_message(self):