From 39940d2a71f6eb108eb77dce1946394f75d5db54 Mon Sep 17 00:00:00 2001 From: Scott Sadler Date: Thu, 13 Oct 2016 16:12:27 +0200 Subject: [PATCH] prevent adding None as fulfillment / condition to Transaction --- transaction.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/transaction.py b/transaction.py index 984ee31b..c40a3970 100644 --- a/transaction.py +++ b/transaction.py @@ -499,18 +499,14 @@ class Transaction(object): return inputs def add_fulfillment(self, fulfillment): - if (fulfillment is not None and not - isinstance(fulfillment, Fulfillment)): - raise TypeError('`fulfillment` must be a Fulfillment instance or ' - 'None') - else: - self.fulfillments.append(fulfillment) + if not isinstance(fulfillment, Fulfillment): + raise TypeError('`fulfillment` must be a Fulfillment instance') + self.fulfillments.append(fulfillment) def add_condition(self, condition): - if condition is not None and not isinstance(condition, Condition): + if not isinstance(condition, Condition): raise TypeError('`condition` must be a Condition instance or None') - else: - self.conditions.append(condition) + self.conditions.append(condition) def sign(self, private_keys): # TODO: Singing should be possible with at least one of all private