From 6df56657d3169038c597e9c2d3fde022ec2d98fc Mon Sep 17 00:00:00 2001 From: itsdeka Date: Fri, 25 Jun 2021 12:20:37 +0200 Subject: [PATCH] -) updated CHANGELOG -) updated example get_authenticated_data.py -) updated string formatter margin_info.py and margin_info_base.py --- CHANGELOG | 1 + bfxapi/examples/rest/get_authenticated_data.py | 13 +++++++------ bfxapi/models/margin_info.py | 3 ++- bfxapi/models/margin_info_base.py | 3 ++- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 64f29fd..836ffc8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,6 @@ 1.1.16 -) Implemented Margin Info (rest) +-) Implemented claim position (rest) 1.1.15 -) Added 'ids' parameter to get_order_history() diff --git a/bfxapi/examples/rest/get_authenticated_data.py b/bfxapi/examples/rest/get_authenticated_data.py index f065bfa..9cf2adc 100644 --- a/bfxapi/examples/rest/get_authenticated_data.py +++ b/bfxapi/examples/rest/get_authenticated_data.py @@ -80,12 +80,13 @@ async def log_funding_credits_history(): [ print (c) for c in credit ] async def log_margin_info(): - m1 = await bfx.rest.get_margin_info('tBTCUSD') - print (m1) - m2 = await bfx.rest.get_margin_info('sym_all') - print (m2) - m3 = await bfx.rest.get_margin_info('base') - print (m3) + margin_info = await bfx.rest.get_margin_info('tBTCUSD') + print(margin_info) + sym_all = await bfx.rest.get_margin_info('sym_all') # list of Margin Info + for margin_info in sym_all: + print(margin_info) + base = await bfx.rest.get_margin_info('base') + print(base) async def run(): await log_wallets() diff --git a/bfxapi/models/margin_info.py b/bfxapi/models/margin_info.py index 514be41..ab376d7 100644 --- a/bfxapi/models/margin_info.py +++ b/bfxapi/models/margin_info.py @@ -43,4 +43,5 @@ class MarginInfo: return MarginInfo(symbol, tradable_balance, gross_balance, buy, sell) def __str__(self): - return "Margin Info {}".format(self.symbol) + return "Margin Info {} buy={} sell={} tradable_balance={} gross_balance={}" \ + "".format(self.symbol, self.buy, self.sell, self. tradable_balance, self. gross_balance) diff --git a/bfxapi/models/margin_info_base.py b/bfxapi/models/margin_info_base.py index 200bc52..806fc5f 100644 --- a/bfxapi/models/margin_info_base.py +++ b/bfxapi/models/margin_info_base.py @@ -44,4 +44,5 @@ class MarginInfoBase: return MarginInfoBase(user_pl, user_swaps, margin_balance, margin_net, margin_min) def __str__(self): - return "Margin Info Base" + return "Margin Info Base user_pl={} user_swaps={} margin_balance={} margin_net={} margin_min={}" \ + "".format(self.user_pl, self.user_swaps, self.margin_balance, self.margin_net, self.margin_min)