fix(core): exclude get/set U2F counter from BITCOIN_ONLY

core/src/apps/workflow_handlers.py

@@ -46,10 +46,6 @@ def find_message_handler_module(msg_type: int) -> str:
         return "apps.management.apply_flags"
     elif msg_type == MessageType.ChangePin:
         return "apps.management.change_pin"
-    elif msg_type == MessageType.SetU2FCounter:
-        return "apps.management.set_u2f_counter"
-    elif msg_type == MessageType.GetNextU2FCounter:
-        return "apps.management.get_next_u2f_counter"
     elif msg_type == MessageType.SdProtect:
         return "apps.management.sd_protect"
     elif msg_type == MessageType.ChangeWipeCode:
@@ -87,6 +83,11 @@ def find_message_handler_module(msg_type: int) -> str:
         if False:
             raise RuntimeError
 
+        elif msg_type == MessageType.SetU2FCounter:
+            return "apps.management.set_u2f_counter"
+        elif msg_type == MessageType.GetNextU2FCounter:
+            return "apps.management.get_next_u2f_counter"
+
         # webauthn
         elif msg_type == MessageType.WebAuthnListResidentCredentials:
             return "apps.webauthn.list_resident_credentials"

tests/device_tests/test_u2f_counter.py

@@ -14,9 +14,12 @@
 # You should have received a copy of the License along with this library.
 # If not, see <https://www.gnu.org/licenses/lgpl-3.0.html>.
 
+import pytest
+
 from trezorlib import fido
 
 
+@pytest.mark.altcoin
 def test_u2f_counter(client):
     assert fido.get_next_counter(client) == 0
     assert fido.get_next_counter(client) == 1