X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=market.py;h=0d91f17e35c988086c69b5a5f6d816f403cc699d;hb=7192b2e1315c3dfd1204d609d716dd07e90f3bf4;hp=9122fc07256ce7d30e9e3490912ea54a15c842d7;hpb=aca4d4372553110ab5d76740ff536de83d5617b2;p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FCryptoportfolio%2FTrader.git diff --git a/market.py b/market.py index 9122fc0..0d91f17 100644 --- a/market.py +++ b/market.py @@ -88,23 +88,22 @@ class Market: "inverted": False, "average": (ticker["bid"] + ticker["ask"] ) / 2, }) + return ticker tickers = self.get_tickers() if tickers is None: try: - ticker = self.ccxt.fetch_ticker("{}/{}".format(c1, c2)) - augment_ticker(ticker) + ticker = augment_ticker(self.ccxt.fetch_ticker("{}/{}".format(c1, c2))) except ExchangeError: try: - ticker = invert(self.ccxt.fetch_ticker("{}/{}".format(c2, c1))) + ticker = invert(augment_ticker(self.ccxt.fetch_ticker("{}/{}".format(c2, c1)))) except ExchangeError: ticker = None else: if "{}/{}".format(c1, c2) in tickers: - ticker = tickers["{}/{}".format(c1, c2)] - augment_ticker(ticker) + ticker = augment_ticker(tickers["{}/{}".format(c1, c2)]) elif "{}/{}".format(c2, c1) in tickers: - ticker = invert(tickers["{}/{}".format(c2, c1)]) + ticker = invert(augment_ticker(tickers["{}/{}".format(c2, c1)])) else: ticker = None return ticker