diff --git a/vipbtc/public.py b/vipbtc/public.py index 4284b8b..1e7cab4 100644 --- a/vipbtc/public.py +++ b/vipbtc/public.py @@ -22,14 +22,18 @@ def getTicker(pair="btc_idr", session=None): pair : trading pair session : vipbtc.Session object """ + pair_counter, pair_base = pair.split('_') response = get_data(pair, 'ticker', requests_session=session) ticker = {} - for s in ('high', 'low', 'vol_idr', 'last', 'buy', 'sell', 'server_time'): - ticker[s] = int(response['ticker'].get(s)) - vol_base = "vol_" + pair[:3] - vol_counter = "vol_" + pair[-3:] + for s in ('high', 'low', 'last', 'buy', 'sell', 'server_time'): + tick = response['ticker'].get(s) + ticker[s] = float(tick) if pair_base == 'btc' and s != 'server_time' else int(tick) + + vol_base = "vol_" + pair_base + vol_counter = "vol_" + pair_counter + for s in (vol_base, vol_counter): ticker[s] = float(response['ticker'].get(s)) diff --git a/vipbtc/trade.py b/vipbtc/trade.py index a3ee75b..e04e9dc 100644 --- a/vipbtc/trade.py +++ b/vipbtc/trade.py @@ -52,14 +52,16 @@ def transHistory(self): return self.__post('transHistory', {}) def trade(self, pair, ttype, amount, price): + pair_counter, pair_base = pair.split('_') + params = { "pair" : pair, "type" : ttype, "price" : price} if ttype == 'buy': - params[pair[-3:]] = amount + params[pair_base] = amount elif ttype == 'sell': - params[pair[:3]] = amount + params[pair_counter] = amount return self.__post('trade', params) def tradeHistory(self, pair, **kwargs):