fix after rebase

pull/3171/head
Piotr Roslaniec 2023-07-13 10:01:07 +02:00
parent 748ee2ae55
commit d8772b1667
5 changed files with 9 additions and 6 deletions

View File

@ -11,7 +11,7 @@ python_version = "3"
constant-sorrow = ">=0.1.0a9" constant-sorrow = ">=0.1.0a9"
bytestring-splitter = ">=2.4.0" bytestring-splitter = ">=2.4.0"
hendrix = ">=4.0" hendrix = ">=4.0"
nucypher-core = {git="https://github.com/nucypher/nucypher-core.git", ref="6489fdb5b0d2677348e2266662c0a40c8a2b1699", subdirectory="nucypher-core-python"} nucypher-core = {git="https://github.com/nucypher/nucypher-core.git", ref="290263a4d50af270cf0e94d8ece61ef4db5cd8a9", subdirectory="nucypher-core-python"}
# Cryptography # Cryptography
cryptography = ">=3.2" cryptography = ">=3.2"
mnemonic = "*" mnemonic = "*"

2
Pipfile.lock generated
View File

@ -1122,7 +1122,7 @@
}, },
"nucypher-core": { "nucypher-core": {
"git": "https://github.com/nucypher/nucypher-core.git", "git": "https://github.com/nucypher/nucypher-core.git",
"ref": "6489fdb5b0d2677348e2266662c0a40c8a2b1699", "ref": "290263a4d50af270cf0e94d8ece61ef4db5cd8a9",
"subdirectory": "nucypher-core-python" "subdirectory": "nucypher-core-python"
}, },
"packaging": { "packaging": {

View File

@ -45,7 +45,6 @@ from nucypher.blockchain.eth.signers import Signer
from nucypher.blockchain.eth.token import NU from nucypher.blockchain.eth.token import NU
from nucypher.blockchain.eth.trackers import dkg from nucypher.blockchain.eth.trackers import dkg
from nucypher.blockchain.eth.trackers.pre import WorkTracker from nucypher.blockchain.eth.trackers.pre import WorkTracker
from nucypher.crypto.ferveo.dkg import DecryptionShareSimple, FerveoVariant, Transcript
from nucypher.crypto.powers import ( from nucypher.crypto.powers import (
CryptoPower, CryptoPower,
RitualisticPower, RitualisticPower,

View File

@ -678,10 +678,14 @@ class Bob(Character):
raise Ursula.NotEnoughUrsulas(f"Not enough Ursulas to decrypt: {failures}") raise Ursula.NotEnoughUrsulas(f"Not enough Ursulas to decrypt: {failures}")
self.log.debug("Got enough shares to decrypt.") self.log.debug("Got enough shares to decrypt.")
if decryption_request.variant == FerveoVariant.PRECOMPUTED.value: if decryption_request.variant == FerveoVariant.precomputed:
share_type = DecryptionSharePrecomputed share_type = DecryptionSharePrecomputed
elif decryption_request.variant == FerveoVariant.SIMPLE.value: elif decryption_request.variant == FerveoVariant.simple:
share_type = DecryptionShareSimple share_type = DecryptionShareSimple
else:
raise ValueError(
f"Unknown decryption request variant: {decryption_request.variant}"
)
gathered_shares = {} gathered_shares = {}
for provider_address, encrypted_decryption_response in successes.items(): for provider_address, encrypted_decryption_response in successes.items():

View File

@ -55,7 +55,7 @@ msgpack==1.0.5
msgpack-python==0.5.6 msgpack-python==0.5.6
multidict==5.2.0 ; python_version >= '3.6' multidict==5.2.0 ; python_version >= '3.6'
mypy-extensions==0.4.4 ; python_version >= '2.7' mypy-extensions==0.4.4 ; python_version >= '2.7'
nucypher-core@git+https://github.com/nucypher/nucypher-core.git@6489fdb5b0d2677348e2266662c0a40c8a2b1699#subdirectory=nucypher-core-python nucypher-core@git+https://github.com/nucypher/nucypher-core.git@290263a4d50af270cf0e94d8ece61ef4db5cd8a9#subdirectory=nucypher-core-python
packaging==23.1 ; python_version >= '3.7' packaging==23.1 ; python_version >= '3.7'
parsimonious==0.9.0 parsimonious==0.9.0
pendulum==3.0.0a1 ; python_version >= '3.7' and python_version < '4.0' pendulum==3.0.0a1 ; python_version >= '3.7' and python_version < '4.0'