Merge bfxapi.rest.types and bfxapi.websocket.types in bfxapi.tests sub-package.

examples/rest/auth/claim_position.py

@@ -4,7 +4,7 @@ import os
 
 from bfxapi import Client, REST_HOST
 
-from bfxapi.rest.types import Notification, PositionClaim
+from bfxapi.types import Notification, PositionClaim
 
 bfx = Client(
     rest_host=REST_HOST,

examples/rest/auth/get_wallets.py

@@ -2,11 +2,12 @@
 
 import os
 
+from typing import List
+
 from bfxapi import Client, REST_HOST
 
-from bfxapi.rest.types import List, Wallet, Transfer, \
-    DepositAddress, LightningNetworkInvoice, Withdrawal, \
-        Notification
+from bfxapi.types import Wallet, Transfer, DepositAddress, \
+    LightningNetworkInvoice, Withdrawal, Notification
 
 bfx = Client(
     rest_host=REST_HOST,

examples/rest/auth/set_derivative_position_collateral.py

@@ -4,7 +4,7 @@ import os
 
 from bfxapi import Client, REST_HOST
 
-from bfxapi.rest.types import DerivativePositionCollateral, DerivativePositionCollateralLimits
+from bfxapi.types import DerivativePositionCollateral, DerivativePositionCollateralLimits
 
 bfx = Client(
     rest_host=REST_HOST,

examples/rest/auth/submit_funding_offer.py

@@ -3,8 +3,8 @@
 import os
 
 from bfxapi import Client, REST_HOST
+from bfxapi.types import Notification, FundingOffer
 from bfxapi.enums import FundingOfferType, Flag
-from bfxapi.rest.types import Notification, FundingOffer
 
 bfx = Client(
     rest_host=REST_HOST,

examples/rest/auth/submit_order.py

@@ -3,8 +3,8 @@
 import os
 
 from bfxapi import Client, REST_HOST
+from bfxapi.types import Notification, Order
 from bfxapi.enums import OrderType, Flag
-from bfxapi.rest.types import Notification, Order
 
 bfx = Client(
     rest_host=REST_HOST,

examples/rest/auth/toggle_keep_funding.py

@@ -2,9 +2,11 @@
 
 import os
 
+from typing import List
+
 from bfxapi import Client, REST_HOST
 
-from bfxapi.rest.types import List, FundingLoan, Notification
+from bfxapi.types import FundingLoan, Notification
 
 bfx = Client(
     rest_host=REST_HOST,

examples/rest/merchant/submit_invoice.py

@@ -4,7 +4,7 @@ import os
 
 from bfxapi import Client, REST_HOST
 
-from bfxapi.rest.types import InvoiceSubmission
+from bfxapi.types import InvoiceSubmission
 
 bfx = Client(
     rest_host=REST_HOST,

examples/rest/public/book.py

@@ -1,8 +1,10 @@
 # python -c "import examples.rest.public.book"
 
+from typing import List
+
 from bfxapi import Client, PUB_REST_HOST
 
-from bfxapi.rest.types import List, TradingPairBook, TradingPairRawBook, \
+from bfxapi.types import TradingPairBook, TradingPairRawBook, \
     FundingCurrencyBook, FundingCurrencyRawBook
 
 bfx = Client(rest_host=PUB_REST_HOST)

examples/rest/public/pulse_endpoints.py

@@ -2,9 +2,11 @@
 
 import datetime
 
+from typing import List
+
 from bfxapi import Client, PUB_REST_HOST
 
-from bfxapi.rest.types import List, PulseMessage, PulseProfile
+from bfxapi.types import PulseMessage, PulseProfile
 
 bfx = Client(rest_host=PUB_REST_HOST)
 

examples/rest/public/rest_calculation_endpoints.py

@@ -2,7 +2,7 @@
 
 from bfxapi import Client, PUB_REST_HOST
 
-from bfxapi.rest.types import TradingMarketAveragePrice, FundingMarketAveragePrice, FxRate
+from bfxapi.types import TradingMarketAveragePrice, FundingMarketAveragePrice, FxRate
 
 bfx = Client(rest_host=PUB_REST_HOST)
 

examples/rest/public/trades.py

@@ -1,8 +1,10 @@
 # python -c "import examples.rest.public.trades"
 
+from typing import List
+
 from bfxapi import Client, PUB_REST_HOST
+from bfxapi.types import TradingPairTrade,  FundingCurrencyTrade
 from bfxapi.rest.enums import Sort
-from bfxapi.rest.types import List, TradingPairTrade,  FundingCurrencyTrade
 
 bfx = Client(rest_host=PUB_REST_HOST)