From 1c1df2e3355683484af6427ce3768fb7fa32e6c2 Mon Sep 17 00:00:00 2001 From: Lorenz Herzberger Date: Wed, 22 Feb 2023 10:32:37 +0100 Subject: [PATCH] blackified Signed-off-by: Lorenz Herzberger --- planetmint/backend/models/output.py | 17 +++++---------- tests/backend/test_models.py | 34 +++++++++++------------------ 2 files changed, 19 insertions(+), 32 deletions(-) diff --git a/planetmint/backend/models/output.py b/planetmint/backend/models/output.py index dbe144c..a161f5e 100644 --- a/planetmint/backend/models/output.py +++ b/planetmint/backend/models/output.py @@ -14,20 +14,17 @@ class ConditionDetails: public_key: str = "" threshold: int = None sub_conditions: List[ConditionDetails] = field(default_factory=list) - + def to_dict(self) -> dict: if self.sub_conditions is None: - return { - "type": self.type, - "public_key": self.public_key - } + return {"type": self.type, "public_key": self.public_key} else: return { "type": self.type, "threshold": self.threshold, - "subconditions": [sub_condition.to_dict() for sub_condition in self.sub_conditions] + "subconditions": [sub_condition.to_dict() for sub_condition in self.sub_conditions], } - + @staticmethod def from_dict(details: dict) -> ConditionDetails: sub_conditions = None @@ -121,8 +118,7 @@ def output_with_public_key(output, transaction_id) -> Output: public_keys=output["public_keys"], amount=output["amount"], condition=Condition( - uri=output["condition"]["uri"], - details=ConditionDetails.from_dict(output["condition"]["details"]) + uri=output["condition"]["uri"], details=ConditionDetails.from_dict(output["condition"]["details"]) ), ) @@ -133,7 +129,6 @@ def output_with_sub_conditions(output, transaction_id) -> Output: public_keys=output["public_keys"], amount=output["amount"], condition=Condition( - uri=output["condition"]["uri"], - details=ConditionDetails.from_dict(output["condition"]["details"]) + uri=output["condition"]["uri"], details=ConditionDetails.from_dict(output["condition"]["details"]) ), ) diff --git a/tests/backend/test_models.py b/tests/backend/test_models.py index 3247662..7ba1f68 100644 --- a/tests/backend/test_models.py +++ b/tests/backend/test_models.py @@ -10,39 +10,31 @@ nested_threshold_output = { "condition": { "details": { "subconditions": [ - { - "type": "ed25519-sha-256", - "public_key": "7pT7eBEGJsmpUvRFhu7NUQSZVJVZDeF1xREuYKdVYUKK" - }, - { - "subconditions": [ + {"type": "ed25519-sha-256", "public_key": "7pT7eBEGJsmpUvRFhu7NUQSZVJVZDeF1xREuYKdVYUKK"}, { - "type": "ed25519-sha-256", - "public_key": "746ZbyMgoCJykAdzZ2vZcHzwnndrVnAAh6pv6yLZDiH2" + "subconditions": [ + {"type": "ed25519-sha-256", "public_key": "746ZbyMgoCJykAdzZ2vZcHzwnndrVnAAh6pv6yLZDiH2"}, + {"type": "ed25519-sha-256", "public_key": "EYb188vCQoaYDmW3Agen1u6Fh7xvDWCMnWJK8ueuCdbX"}, + ], + "threshold": 2, + "type": "threshold-sha-256", }, - { - "type": "ed25519-sha-256", - "public_key": "EYb188vCQoaYDmW3Agen1u6Fh7xvDWCMnWJK8ueuCdbX" - } - ], - "threshold": 2, - "type": "threshold-sha-256" - } ], "threshold": 1, - "type": "threshold-sha-256" + "type": "threshold-sha-256", }, - "uri": "ni:///sha-256;hhw6Rf9JgwKYkapwE9qu7oVaI0ArS0hj_dmzAkpIPdc?fpt=threshold-sha-256&cost=266240&subtypes=ed25519-sha-256" + "uri": "ni:///sha-256;hhw6Rf9JgwKYkapwE9qu7oVaI0ArS0hj_dmzAkpIPdc?fpt=threshold-sha-256&cost=266240&subtypes=ed25519-sha-256", }, "public_keys": [ "7pT7eBEGJsmpUvRFhu7NUQSZVJVZDeF1xREuYKdVYUKK", "746ZbyMgoCJykAdzZ2vZcHzwnndrVnAAh6pv6yLZDiH2", - "EYb188vCQoaYDmW3Agen1u6Fh7xvDWCMnWJK8ueuCdbX" - ] + "EYb188vCQoaYDmW3Agen1u6Fh7xvDWCMnWJK8ueuCdbX", + ], } + def test_output_nested_threshold_condition(): output = Output.outputs_dict(nested_threshold_output) assert output output_dict = output.to_dict() - assert nested_threshold_output == output_dict \ No newline at end of file + assert nested_threshold_output == output_dict