From 468c70cb0ddb809988e78a468dab5a1936d507fe Mon Sep 17 00:00:00 2001 From: derekpierre Date: Fri, 21 Jul 2023 16:11:39 -0400 Subject: [PATCH] Make public Bob.threshold_decrypt() API no longer take variant as a parameter and instead internally use the default variant value (simple). --- nucypher/characters/lawful.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/nucypher/characters/lawful.py b/nucypher/characters/lawful.py index 708c58a26..2efda4295 100644 --- a/nucypher/characters/lawful.py +++ b/nucypher/characters/lawful.py @@ -438,7 +438,7 @@ class Alice(Character, actors.PolicyAuthor): class Bob(Character): banner = BOB_BANNER - default_dkg_variant = FerveoVariant.SIMPLE + _default_dkg_variant = FerveoVariant.SIMPLE _default_crypto_powerups = [SigningPower, DecryptingPower] _threshold_decryption_client_class = ThresholdDecryptionClient @@ -712,7 +712,6 @@ class Bob(Character): conditions: Lingo, context: Optional[dict] = None, ursulas: Optional[List["Ursula"]] = None, - variant: str = "simple", peering_timeout: int = 60, ) -> bytes: ritual = self.get_ritual_from_id(ritual_id) @@ -730,13 +729,7 @@ class Bob(Character): ) self.remember_node(ursula) - try: - variant = FerveoVariant(getattr(FerveoVariant, variant.upper()).value) - except AttributeError: - raise ValueError( - f"Invalid variant: {variant}; Options are: {list(v.name.lower() for v in list(FerveoVariant))}" - ) - + variant = self._default_dkg_variant threshold = ( (ritual.shares // 2) + 1 if variant == FerveoVariant.SIMPLE