Merge branch 'feat/objectify-ccxt' into ccxt-objectify-pr1

This commit is contained in:
enenn
2018-03-26 19:31:15 +02:00
committed by GitHub
19 changed files with 224 additions and 182 deletions

View File

@@ -128,32 +128,31 @@ def ticker_sell_down():
@pytest.fixture
def health():
return MagicMock(return_value=[{
'Currency': 'BTC',
'IsActive': True,
'LastChecked': '2017-11-13T20:15:00.00',
'Notice': None
}, {
'Currency': 'ETH',
'IsActive': True,
'LastChecked': '2017-11-13T20:15:00.00',
'Notice': None
}, {
'Currency': 'TRST',
'IsActive': True,
'LastChecked': '2017-11-13T20:15:00.00',
'Notice': None
}, {
'Currency': 'SWT',
'IsActive': True,
'LastChecked': '2017-11-13T20:15:00.00',
'Notice': None
}, {
'Currency': 'BCC',
'IsActive': False,
'LastChecked': '2017-11-13T20:15:00.00',
'Notice': None
}])
return MagicMock(return_value={
"ETH/BTC": {
'base': 'ETH',
'active': True,
'LastChecked': '2017-11-13T20:15:00.00',
'Notice': None
},
"TRST/BTC": {
'base': 'TRST',
'active': True,
'LastChecked': '2017-11-13T20:15:00.00',
'Notice': None
},
"SWT/BTC": {
'base': 'SWT',
'active': True,
'LastChecked': '2017-11-13T20:15:00.00',
'Notice': None
},
"BCC/BTC": {
'base': 'BCC',
'active': False,
'LastChecked': '2017-11-13T20:15:00.00',
'Notice': None
}})
@pytest.fixture
@@ -336,4 +335,3 @@ def result():
# that inserts a trade of some type and open-status
# return the open-order-id
# See tests in rpc/main that could use this