From 92f2c3b4d9eede9472875fc55ce9ad9871e5c4bf Mon Sep 17 00:00:00 2001 From: Richard Kiss Date: Tue, 15 Sep 2020 17:09:17 -0700 Subject: [PATCH] Simplify `src/wallet/wallet.py` a bit. --- src/wallet/wallet.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/wallet/wallet.py b/src/wallet/wallet.py index 488f32cf..079eb8f5 100644 --- a/src/wallet/wallet.py +++ b/src/wallet/wallet.py @@ -115,8 +115,9 @@ class Wallet(AbstractWallet): ).puzzle_hash def make_solution( - self, primaries=None, min_time=0, me=None, consumed=None, fee=None + self, primaries=None, min_time=0, me=None, consumed=None, fee=0 ): + assert fee >= 0 condition_list = [] if primaries: for primary in primaries: @@ -248,10 +249,7 @@ class Wallet(AbstractWallet): changepuzzlehash = await self.get_new_puzzlehash() primaries.append({"puzzlehash": changepuzzlehash, "amount": change}) - if fee > 0: - solution = self.make_solution(primaries=primaries, fee=fee) - else: - solution = self.make_solution(primaries=primaries) + solution = self.make_solution(primaries=primaries, fee=fee) output_created = True elif output_created is False and origin_id == coin.name(): primaries = [{"puzzlehash": newpuzzlehash, "amount": amount}] @@ -259,10 +257,7 @@ class Wallet(AbstractWallet): changepuzzlehash = await self.get_new_puzzlehash() primaries.append({"puzzlehash": changepuzzlehash, "amount": change}) - if fee > 0: - solution = self.make_solution(primaries=primaries, fee=fee) - else: - solution = self.make_solution(primaries=primaries) + solution = self.make_solution(primaries=primaries, fee=fee) output_created = True else: solution = self.make_solution()