1
0

Move estimated_fee to Transaction class

It's not a function of the wallet but of the transaction
so it more naturally belongs there.
This commit is contained in:
Neil Booth
2015-11-28 21:28:54 +09:00
parent e9061ea371
commit 90dee43998
5 changed files with 14 additions and 16 deletions

View File

@@ -207,7 +207,7 @@ class Wallet_2fa(Multisig_Wallet):
return price
def estimated_fee(self, tx, fee_per_kb):
fee = Multisig_Wallet.estimated_fee(self, tx, fee_per_kb)
fee = tx.estimated_fee(fee_per_kb)
fee += self.extra_fee(tx)
return fee
@@ -440,5 +440,3 @@ class TrustedCoinPlugin(BasePlugin):
wallet.add_master_public_key('x3/', xpub3)
return True