style: fix typing errors

shamir_mnemonic/cli.py

@@ -177,6 +177,7 @@ def print_group_status(idx: int) -> None:
 
     def print_status() -> None:
         bn = style(str(recovery_state.groups_complete()), bold=True)
+        assert recovery_state.parameters is not None
         bt = style(str(recovery_state.parameters.group_threshold), bold=True)
         click.echo()
         if recovery_state.parameters.group_count > 1:

shamir_mnemonic/recovery.py

@@ -101,6 +101,8 @@ def recover(self, passphrase: bytes) -> bytes:
             if group.is_complete():
                 reduced_groups[group_index] = group.get_minimal_group()
 
+            # some groups have been added so parameters must be known
+            assert self.parameters is not None
             if len(reduced_groups) >= self.parameters.group_threshold:
                 break
 

shamir_mnemonic/shamir.py

@@ -21,7 +21,7 @@
 
 import hmac
 import secrets
-from typing import Any, Dict, Iterable, List, NamedTuple, Sequence, Set, Tuple
+from typing import Any, Dict, Iterable, Iterator, List, NamedTuple, Sequence, Set, Tuple
 
 import attr
 
@@ -49,7 +49,7 @@ class ShareGroup:
     def __init__(self) -> None:
         self.shares: Set[Share] = set()
 
-    def __iter__(self) -> Iterable[Share]:
+    def __iter__(self) -> Iterator[Share]:
         return iter(self.shares)
 
     def __len__(self) -> int:
@@ -94,7 +94,7 @@ def group_parameters(self) -> ShareGroupParameters:
     def member_threshold(self) -> int:
         return next(iter(self.shares)).member_threshold
 
-    def is_complete(self) -> int:
+    def is_complete(self) -> bool:
         if self.shares:
             return len(self.shares) >= self.member_threshold()
         else:
@@ -295,7 +295,7 @@ def split_ems(
     group_threshold: int,
     groups: Sequence[Tuple[int, int]],
     encrypted_master_secret: EncryptedMasterSecret,
-) -> List[List[str]]:
+) -> List[List[Share]]:
     """
     Split an Encrypted Master Secret into mnemonic shares.