Merge commit 'aa7aeb046ef72412cadd094666efc8e4c503ef2d' into feature/objectify

This commit is contained in:
Gerald Lonlas
2018-03-02 23:28:36 -08:00
5 changed files with 17 additions and 24 deletions

View File

@@ -194,8 +194,8 @@ class Trade(_DECL_BASE):
"""
open_trade_price = self.calc_open_trade_price()
close_trade_price = self.calc_close_trade_price(
rate=Decimal(rate or self.close_rate),
fee=Decimal(fee or self.fee)
rate=(rate or self.close_rate),
fee=(fee or self.fee)
)
return float("{0:.8f}".format(close_trade_price - open_trade_price))
@@ -213,8 +213,8 @@ class Trade(_DECL_BASE):
open_trade_price = self.calc_open_trade_price()
close_trade_price = self.calc_close_trade_price(
rate=Decimal(rate or self.close_rate),
fee=Decimal(fee or self.fee)
rate=(rate or self.close_rate),
fee=(fee or self.fee)
)
return float("{0:.8f}".format((close_trade_price / open_trade_price) - 1))