Skip to content

Commit 60a7bdc

Browse files
coinyoncoinyon
committed
Make linter happy
1 parent c160c0a commit 60a7bdc

File tree

3 files changed

+10
-32
lines changed

3 files changed

+10
-32
lines changed

‎rotkehlchen/tests/exchanges/test_bitcoinde.py

+1-12
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,11 @@
1-
import warnings as test_warnings
21
from unittest.mock import patch
32

4-
import pytest
5-
6-
from rotkehlchen.assets.asset import Asset
73
from rotkehlchen.constants.assets import A_BTC, A_ETH
8-
from rotkehlchen.errors import DeserializationError, UnknownAsset, UnprocessableTradePair
94
from rotkehlchen.exchanges.bitcoinde import Bitcoinde
10-
from rotkehlchen.exchanges.data_structures import Trade
115
from rotkehlchen.fval import FVal
12-
from rotkehlchen.tests.utils.history import TEST_END_TS
136
from rotkehlchen.tests.utils.mock import MockResponse
14-
from rotkehlchen.typing import AssetMovementCategory
15-
from rotkehlchen.utils.misc import ts_now
167

17-
BITCOINDE_BALANCES_RESPONSE = """
18-
{"data":{"balances":{"btc":{"total_amount":"0.5","available_amount":"0.5","reserved_amount":"0"},"bch":{"total_amount":"0.00000000000000000000","available_amount":"0","reserved_amount":"0"},"btg":{"total_amount":"0.00000000000000000000","available_amount":"0","reserved_amount":"0"},"eth":{"total_amount":"32.0","available_amount":"32.0","reserved_amount":"0"},"bsv":{"total_amount":"0.00000000000000000000","available_amount":"0","reserved_amount":"0"},"ltc":{"total_amount":"0.00000000000000000000","available_amount":"0","reserved_amount":"0"}},"encrypted_information":{"uid":"X","bic_short":"Y","bic_full":"Z"}},"errors":[],"credits":23}
19-
"""
8+
BITCOINDE_BALANCES_RESPONSE = """{"data":{"balances":{"btc":{"total_amount":"0.5","available_amount":"0.5","reserved_amount":"0"},"bch":{"total_amount":"0.00000000000000000000","available_amount":"0","reserved_amount":"0"},"btg":{"total_amount":"0.00000000000000000000","available_amount":"0","reserved_amount":"0"},"eth":{"total_amount":"32.0","available_amount":"32.0","reserved_amount":"0"},"bsv":{"total_amount":"0.00000000000000000000","available_amount":"0","reserved_amount":"0"},"ltc":{"total_amount":"0.00000000000000000000","available_amount":"0","reserved_amount":"0"}},"encrypted_information":{"uid":"X","bic_short":"Y","bic_full":"Z"}},"errors":[],"credits":23}""" # noqa: E501
209

2110

2211
def test_name():

‎rotkehlchen/tests/exchanges/test_iconomi.py

+8-20
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,20 @@
1-
import warnings as test_warnings
21
from unittest.mock import patch
32

4-
import pytest
5-
63
from rotkehlchen.assets.asset import Asset
7-
from rotkehlchen.constants.assets import A_BTC, A_ETH, A_EUR
8-
from rotkehlchen.errors import DeserializationError, UnknownAsset, UnprocessableTradePair
9-
from rotkehlchen.exchanges.data_structures import Trade
4+
from rotkehlchen.constants.assets import A_ETH, A_EUR
105
from rotkehlchen.exchanges.iconomi import Iconomi
116
from rotkehlchen.fval import FVal
12-
from rotkehlchen.tests.utils.history import TEST_END_TS
137
from rotkehlchen.tests.utils.mock import MockResponse
14-
from rotkehlchen.typing import AssetMovementCategory, Location, Timestamp, TradeType
15-
from rotkehlchen.utils.misc import ts_now
8+
from rotkehlchen.typing import Location, TradeType
9+
10+
ICONOMI_BALANCES_RESPONSE = """{"currency":"USD","daaList":[{"name":"CARUS-AR","ticker":"CAR","balance":"100.0","value":"1000.0"},{"name":"Strategy 2","ticker":"SCND","balance":"80.00000000","value":"0"}],"assetList":[{"name":"Aragon","ticker":"ANT","balance":"1000","value":"200.0"},{"name":"Ethereum","ticker":"ETH","balance":"32","value":"10000.031241234"},{"name":"Augur","ticker":"REP","balance":"0.5314532451","value":"0.8349030710000"}]}""" # noqa: E501
11+
12+
13+
ICONOMI_TRADES_RESPONSE = """{"transactions":[{"transactionId":"8362abff-12fd-4f6e-a152-590295d89bd2","timestamp":1539713117,"status":"COMPLETED","exchangeRate":16.89955950,"paymentMethod":"WALLET","type":"sell_asset","kind":"trade","source_ticker":"REP","source_amount":1000.23,"target_ticker":"EUR","target_amount":1505.63000000,"fee_ticker":"EUR","fee_amount":0E-8},{"transactionId":"e8c2c522-e43a-4cd9-b73b-812903bc85ca","timestamp":1539713118,"status":"COMPLETED","exchangeRate":16.66495657,"paymentMethod":"WALLET","type":"buy_asset","kind":"trade","source_ticker":"EUR","source_amount":999.90000000,"target_ticker":"REP","target_amount":1234,"fee_ticker":"EUR","fee_amount":0E-8},{"transactionId":"eb3c23fb-8910-428a-ad06-e6e2acf8c3a1","timestamp":1539713119,"status":"COMPLETED","address":"X","type":"deposit","kind":"sepa","amount_ticker":"EUR","amount":1000.00000000,"fee_ticker":"EUR","fee_amount":0E-8}]}""" # noqa: E501
1614

17-
ICONOMI_BALANCES_RESPONSE = """
18-
{"currency":"USD","daaList":[{"name":"CARUS-AR","ticker":"CAR","balance":"100.0","value":"1000.0"},{"name":"Strategy 2","ticker":"SCND","balance":"80.00000000","value":"0"}],"assetList":[{"name":"Aragon","ticker":"ANT","balance":"1000","value":"200.0"},{"name":"Ethereum","ticker":"ETH","balance":"32","value":"10000.031241234"},{"name":"Augur","ticker":"REP","balance":"0.5314532451","value":"0.8349030710000"}]}
19-
"""
2015

21-
ICONOMI_TRADES_RESPONSE = """
22-
{"transactions":[{"transactionId":"8362abff-12fd-4f6e-a152-590295d89bd2","timestamp":1539713117,"status":"COMPLETED","exchangeRate":16.89955950,"paymentMethod":"WALLET","type":"sell_asset","kind":"trade","source_ticker":"REP","source_amount":1000.23,"target_ticker":"EUR","target_amount":1505.63000000,"fee_ticker":"EUR","fee_amount":0E-8},{"transactionId":"e8c2c522-e43a-4cd9-b73b-812903bc85ca","timestamp":1539713118,"status":"COMPLETED","exchangeRate":16.66495657,"paymentMethod":"WALLET","type":"buy_asset","kind":"trade","source_ticker":"EUR","source_amount":999.90000000,"target_ticker":"REP","target_amount":1234,"fee_ticker":"EUR","fee_amount":0E-8},{"transactionId":"eb3c23fb-8910-428a-ad06-e6e2acf8c3a1","timestamp":1539713119,"status":"COMPLETED","address":"X","type":"deposit","kind":"sepa","amount_ticker":"EUR","amount":1000.00000000,"fee_ticker":"EUR","fee_amount":0E-8}]}
23-
"""
16+
ICONOMI_TRADES_EMPTY_RESPONSE = """{"transactions":[]}"""
2417

25-
ICONOMI_TRADES_EMPTY_RESPONSE = """
26-
{"transactions":[]}
27-
"""
2818

2919
def test_name():
3020
exchange = Iconomi('a', b'a', object(), object())
@@ -37,7 +27,6 @@ def test_iconomi_query_balances_unknown_asset(function_scope_iconomi):
3727
iconomi = function_scope_iconomi
3828

3929
def mock_unknown_asset_return(url, **kwargs): # pylint: disable=unused-argument
40-
print("lol", url)
4130
return MockResponse(200, ICONOMI_BALANCES_RESPONSE)
4231

4332
with patch.object(iconomi.session, 'get', side_effect=mock_unknown_asset_return):
@@ -60,7 +49,6 @@ def test_query_trade_history(function_scope_iconomi):
6049
iconomi = function_scope_iconomi
6150

6251
def mock_api_return(url, **kwargs): # pylint: disable=unused-argument
63-
print("lol", url, kwargs)
6452
if 'pageNumber=0' in url:
6553
return MockResponse(200, ICONOMI_TRADES_RESPONSE)
6654
else:

‎rotkehlchen/tests/utils/exchanges.py

+1
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,7 @@
235235
"isBestMatch": true
236236
}]"""
237237

238+
238239
def assert_binance_balances_result(balances: Dict[str, Any]) -> None:
239240
assert balances['BTC']['amount'] == '4723846.89208129'
240241
assert balances['BTC']['usd_value'] is not None

0 commit comments

Comments
 (0)