Nucypher
/
nucypher
mirror of https://github.com/nucypher/nucypher.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixes incorrect splitter in map versioning and grant test assertion.

pull/2687/head
Kieran Prasch 2021-06-25 13:43:41 -07:00 committed by Kieran R. Prasch
parent 7642300fe0
commit 81ca745bfa
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nucypher/policy/maps.py
View File

@ -351,13 +351,13 @@ class SignedTreasureMap(TreasureMap):
cls._splitters['unversioned'] = BytestringKwargifier(cls, cls._splitters['unversioned'] = BytestringKwargifier(cls,
blockchain_signature=EIP712_MESSAGE_SIGNATURE_SIZE, blockchain_signature=EIP712_MESSAGE_SIGNATURE_SIZE,
public_signature=Signature, public_signature=signature_splitter,
hrac=(bytes, HRAC_LENGTH), hrac=(bytes, HRAC_LENGTH),
message_kit=(UmbralMessageKit, VariableLengthBytestring), message_kit=(UmbralMessageKit, VariableLengthBytestring),
) )
cls._splitters[1] = TreasureMapSplitter(cls, cls._splitters[1] = TreasureMapSplitter(cls,
blockchain_signature=EIP712_MESSAGE_SIGNATURE_SIZE, blockchain_signature=EIP712_MESSAGE_SIGNATURE_SIZE,
public_signature=Signature, public_signature=signature_splitter,
hrac=(bytes, HRAC_LENGTH), hrac=(bytes, HRAC_LENGTH),
message_kit=(UmbralMessageKit, VariableLengthBytestring), message_kit=(UmbralMessageKit, VariableLengthBytestring),
) )

9
tests/acceptance/characters/test_decentralized_grant.py
View File

@ -15,12 +15,14 @@ You should have received a copy of the GNU Affero General Public License
along with nucypher. If not, see <https://www.gnu.org/licenses/>. along with nucypher. If not, see <https://www.gnu.org/licenses/>.
""" """
import datetime import datetime
import maya import maya
import pytest import pytest
from nucypher.crypto.kits import PolicyMessageKit
from nucypher.crypto.utils import keccak_digest from nucypher.crypto.utils import keccak_digest
from nucypher.datastore.models import PolicyArrangement
from nucypher.datastore.models import TreasureMap as DatastoreTreasureMap from nucypher.datastore.models import TreasureMap as DatastoreTreasureMap
from nucypher.policy.maps import SignedTreasureMap from nucypher.policy.maps import SignedTreasureMap
@ -50,7 +52,10 @@ def test_decentralized_grant(blockchain_alice, blockchain_bob, blockchain_ursula
for ursula in blockchain_ursulas: for ursula in blockchain_ursulas:
if ursula.checksum_address in policy.treasure_map.destinations: if ursula.checksum_address in policy.treasure_map.destinations:
kfrag_kit = policy.treasure_map.destinations[ursula.checksum_address] kfrag_kit = policy.treasure_map.destinations[ursula.checksum_address]
assert bool(kfrag_kit) # TODO: try to decrypt?
# TODO: try to decrypt?
# TODO: Use a new type for EncryptedKFrags?
assert isinstance(kfrag_kit, PolicyMessageKit)
def test_alice_sets_treasure_map_decentralized(enacted_blockchain_policy, blockchain_alice, blockchain_bob, blockchain_ursulas): def test_alice_sets_treasure_map_decentralized(enacted_blockchain_policy, blockchain_alice, blockchain_bob, blockchain_ursulas):

1
tests/integration/characters/test_federated_grant_and_revoke.py
View File

@ -54,7 +54,6 @@ def test_federated_grant(federated_alice, federated_bob, federated_ursulas):
assert ursula.checksum_address in policy.treasure_map.destinations assert ursula.checksum_address in policy.treasure_map.destinations
def test_federated_alice_can_decrypt(federated_alice, federated_bob): def test_federated_alice_can_decrypt(federated_alice, federated_bob):
""" """
Test that alice can decrypt data encrypted by an enrico Test that alice can decrypt data encrypted by an enrico