From 02e232362b0b44eedbaf9cd674a56ac05fa77776 Mon Sep 17 00:00:00 2001 From: Jacob Plaster Date: Mon, 19 Nov 2018 16:50:40 +0000 Subject: [PATCH] Change examples to use new Client module --- bfxapi/examples/candel_order.py | 18 +++++++++--------- bfxapi/examples/connect.py | 10 +++++----- bfxapi/examples/send_order.py | 14 +++++++------- bfxapi/examples/subscribe_trades_candles.py | 18 +++++++++--------- bfxapi/examples/update_order.py | 18 +++++++++--------- bfxapi/examples/wallet_balance.py | 12 ++++++------ 6 files changed, 45 insertions(+), 45 deletions(-) diff --git a/bfxapi/examples/candel_order.py b/bfxapi/examples/candel_order.py index 12d773d..b13b3af 100644 --- a/bfxapi/examples/candel_order.py +++ b/bfxapi/examples/candel_order.py @@ -2,37 +2,37 @@ import os import sys sys.path.append('../') -from bfxapi.websockets.LiveWebsocket import LiveBfxWebsocket +from bfxapi import Client API_KEY=os.getenv("BFX_KEY") API_SECRET=os.getenv("BFX_SECRET") -ws = LiveBfxWebsocket( +bfx = Client( API_KEY=API_KEY, API_SECRET=API_SECRET, logLevel='INFO' ) -@ws.on('order_closed') +@bfx.ws.on('order_closed') def order_cancelled(order, trade): print ("Order cancelled.") print (order) print (trade) -@ws.on('order_confirmed') +@bfx.ws.on('order_confirmed') async def trade_completed(order, trade): print ("Order confirmed.") print (order) print (trade) - await ws.cancel_order(order.id) + await bfx.ws.cancel_order(order.id) -@ws.on('error') +@bfx.ws.on('error') def log_error(msg): print ("Error: {}".format(msg)) -@ws.once('authenticated') +@bfx.ws.once('authenticated') async def submit_order(auth_message): # create an inital order a really low price so it stays open - await ws.submit_order('tBTCUSD', 10, 1, 'EXCHANGE LIMIT') + await bfx.ws.submit_order('tBTCUSD', 10, 1, 'EXCHANGE LIMIT') -ws.run() +bfx.ws.run() diff --git a/bfxapi/examples/connect.py b/bfxapi/examples/connect.py index fdbfe9a..7250742 100644 --- a/bfxapi/examples/connect.py +++ b/bfxapi/examples/connect.py @@ -2,18 +2,18 @@ import os import sys sys.path.append('../') -from bfxapi.websockets.LiveWebsocket import LiveBfxWebsocket +from bfxapi import Client -ws = LiveBfxWebsocket( +bfx = Client( logLevel='INFO' ) -@ws.on('error') +@bfx.ws.on('error') def log_error(msg): print ("Error: {}".format(msg)) -@ws.on('all') +@bfx.ws.on('all') async def log_output(output): print ("WS: {}".format(output)) -ws.run() +bfx.ws.run() diff --git a/bfxapi/examples/send_order.py b/bfxapi/examples/send_order.py index 7f6f86e..228c259 100644 --- a/bfxapi/examples/send_order.py +++ b/bfxapi/examples/send_order.py @@ -2,30 +2,30 @@ import os import sys sys.path.append('../') -from bfxapi.websockets.LiveWebsocket import LiveBfxWebsocket +from bfxapi import Client API_KEY=os.getenv("BFX_KEY") API_SECRET=os.getenv("BFX_SECRET") -ws = LiveBfxWebsocket( +bfx = Client( API_KEY=API_KEY, API_SECRET=API_SECRET, logLevel='INFO' ) -@ws.on('order_confirmed') +@bfx.ws.on('order_confirmed') def trade_completed(order, trade): print ("Order confirmed.") print (order) print (trade) -@ws.on('error') +@bfx.ws.on('error') def log_error(msg): print ("Error: {}".format(msg)) -@ws.on('authenticated') +@bfx.ws.on('authenticated') async def submit_order(auth_message): - await ws.submit_order('tBTCUSD', 0, 0.01, 'EXCHANGE MARKET') + await bfx.ws.submit_order('tBTCUSD', 0, 0.01, 'EXCHANGE MARKET') # If you dont want to use a decorator # ws.on('authenticated', submit_order) @@ -35,4 +35,4 @@ async def submit_order(auth_message): # await ws.submit_order('tBTCUSD', 0, 0.01, # 'EXCHANGE MARKET', onComplete=trade_complete) -ws.run() +bfx.ws.run() diff --git a/bfxapi/examples/subscribe_trades_candles.py b/bfxapi/examples/subscribe_trades_candles.py index d97b9e0..f6ea223 100644 --- a/bfxapi/examples/subscribe_trades_candles.py +++ b/bfxapi/examples/subscribe_trades_candles.py @@ -2,27 +2,27 @@ import os import sys sys.path.append('../') -from bfxapi.websockets.LiveWebsocket import LiveBfxWebsocket +from bfxapi import Client -ws = LiveBfxWebsocket( +bfx = Client( logLevel='INFO' ) -@ws.on('error') +@bfx.ws.on('error') def log_error(err): print ("Error: {}".format(err)) -@ws.on('new_candle') +@bfx.ws.on('new_candle') def log_candle(candle): print ("New candle: {}".format(candle)) -@ws.on('new_trade') +@bfx.ws.on('new_trade') def log_trade(trade): print ("New trade: {}".format(trade)) def start(): - ws.subscribe('candles', 'tBTCUSD', timeframe='1m') - ws.subscribe('trades', 'tBTCUSD') + bfx.ws.subscribe('candles', 'tBTCUSD', timeframe='1m') + bfx.ws.subscribe('trades', 'tBTCUSD') -ws.on('connected', start) -ws.run() +bfx.ws.on('connected', start) +bfx.ws.run() diff --git a/bfxapi/examples/update_order.py b/bfxapi/examples/update_order.py index d2d0de7..3887dc2 100644 --- a/bfxapi/examples/update_order.py +++ b/bfxapi/examples/update_order.py @@ -2,37 +2,37 @@ import os import sys sys.path.append('../') -from bfxapi.websockets.LiveWebsocket import LiveBfxWebsocket +from bfxapi import Client API_KEY=os.getenv("BFX_KEY") API_SECRET=os.getenv("BFX_SECRET") -ws = LiveBfxWebsocket( +bfx = Client( API_KEY=API_KEY, API_SECRET=API_SECRET, logLevel='INFO' ) -@ws.on('order_update') +@bfx.ws.on('order_update') def order_updated(order, trade): print ("Order updated.") print (order) print (trade) -@ws.once('order_confirmed') +@bfx.ws.once('order_confirmed') async def trade_completed(order, trade): print ("Order confirmed.") print (order) print (trade) - await ws.update_order(order.id, price=100, amount=0.01) + await bfx.ws.update_order(order.id, price=100, amount=0.01) -@ws.on('error') +@bfx.ws.on('error') def log_error(msg): print ("Error: {}".format(msg)) -@ws.once('authenticated') +@bfx.ws.once('authenticated') async def submit_order(auth_message): # create an inital order a really low price so it stays open - await ws.submit_order('tBTCUSD', 10, 1, 'EXCHANGE LIMIT') + await bfx.ws.submit_order('tBTCUSD', 10, 1, 'EXCHANGE LIMIT') -ws.run() +bfx.ws.run() diff --git a/bfxapi/examples/wallet_balance.py b/bfxapi/examples/wallet_balance.py index d5ced1e..9978af0 100644 --- a/bfxapi/examples/wallet_balance.py +++ b/bfxapi/examples/wallet_balance.py @@ -2,27 +2,27 @@ import os import sys sys.path.append('../') -from bfxapi.websockets.LiveWebsocket import LiveBfxWebsocket +from bfxapi import Client API_KEY=os.getenv("BFX_KEY") API_SECRET=os.getenv("BFX_SECRET") -ws = LiveBfxWebsocket( +bfx = Client( API_KEY=API_KEY, API_SECRET=API_SECRET, logLevel='INFO' ) -@ws.on('wallet_snapshot') +@bfx.ws.on('wallet_snapshot') def log_snapshot(data): print ("Opening balance: {}".format(data)) -@ws.on('wallet_update') +@bfx.ws.on('wallet_update') def log_update(data): print ("Balance updates: {}".format(data)) -ws.on('error') +@bfx.ws.on('error') def log_error(msg): print ("Error: {}".format(msg)) -ws.run() +bfx.ws.run()