Skip to content

Commit

Permalink
Updating Test Files
Browse files Browse the repository at this point in the history 
Updating to catch up with API's current state ad number of blockchains supported.
  • Loading branch information
@KeithSSmith
KeithSSmith committed Mar 9, 2019
1 parent f335fa9 commit 43421d7
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 32 deletions.
12 changes: 8 additions & 4 deletions switcheo/test_authenticated_client.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,17 @@ class TestAuthenticatedClient(unittest.TestCase):

def test_deposit(self):
deposited_dict = {'result': 'ok'}
self.assertDictEqual(ac.deposit(asset="SWTH", amount=0.000001, private_key=kp), deposited_dict)
self.assertDictEqual(ac.deposit(asset="GAS", amount=0.000001, private_key=kp), deposited_dict)
deposit_dict = ac.deposit(asset="SWTH", amount=0.000001, private_key=kp)
deposit_dict.pop('transaction_hash')
self.assertDictEqual(deposit_dict, deposited_dict)
deposit_dict = ac.deposit(asset="GAS", amount=0.000001, private_key=kp)
deposit_dict.pop('transaction_hash')
self.assertDictEqual(deposit_dict, deposited_dict)

def test_withdrawal(self):
swth_withdrawn_dict = {
'event_type': 'withdrawal',
'amount': -100,
'amount': '-100',
'asset_id': 'ab38352559b8b203bde5fddfa0b07d8b2525e132',
'blockchain': 'neo',
'reason_code': 9,
Expand All @@ -37,7 +41,7 @@ def test_withdrawal(self):

gas_withdrawn_dict = {
'event_type': 'withdrawal',
'amount': -100,
'amount': '-100',
'asset_id': '602c79718b16e442de58778e148d0b1084e3b2dffd5de6b7b16cee7969282de7',
'blockchain': 'neo',
'reason_code': 9,
Expand Down
48 changes: 25 additions & 23 deletions switcheo/test_public_client.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@


pc = PublicClient(blockchain='neo')
pc_eth = PublicClient(blockchain='eth', contract_version='V1')


class TestPublicClient(unittest.TestCase):
Expand Down Expand Up @@ -42,8 +43,8 @@ def test_get_last_price(self):
last_price_dict = {
'SWTH': ['GAS', 'NEO'],
'GAS': ['NEO'],
'NEO': ['SWTH'],
'RHTC': ['NEO'],
'NRVEP': ['NEO'],
'JRC': ['ETH'],
'SWC': ['ETH']
}
Expand Down Expand Up @@ -72,7 +73,7 @@ def test_get_offers(self):
offered_set_list.add(key)
self.assertTrue(offered_set_list.issubset(offers_set_list))

offered_list = pc.get_offers(pair="GAS_NEO")
offered_list = pc_eth.get_offers(pair="JRC_ETH")
self.assertTrue(set(offered_list[0].keys()).issubset(offers_set_list))
offered_set_list = set()
for offer in offered_list:
Expand All @@ -94,29 +95,30 @@ def test_get_trades(self):
pc.get_trades(pair="SWTH_NEO", limit=1000000)

def test_get_pairs(self):
all_pairs = ['GAS_NEO', 'SWTH_NEO', 'ACAT_NEO', 'APH_NEO', 'AVA_NEO', 'COUP_NEO', 'CPX_NEO', 'EFX_NEO',
'LRN_NEO', 'MCT_NEO', 'NKN_NEO', 'NRVE_NEO', 'OBT_NEO', 'PKC_NEO', 'QLC_NEO', 'RHT_NEO',
'SDS_NEO', 'SOUL_NEO', 'TKY_NEO', 'TNC_NEO', 'TOLL_NEO', 'ZPT_NEO',
'SWTH_GAS', 'ACAT_GAS', 'APH_GAS', 'AVA_GAS', 'COUP_GAS', 'CPX_GAS', 'EFX_GAS', 'LRN_GAS',
'MCT_GAS', 'NKN_GAS', 'NRVE_GAS', 'OBT_GAS', 'PKC_GAS', 'QLC_GAS', 'RHT_GAS', 'SDS_GAS',
'SOUL_GAS', 'TKY_GAS', 'TNC_GAS', 'TOLL_GAS', 'ZPT_GAS',
'ACAT_SWTH', 'APH_SWTH', 'AVA_SWTH', 'COUP_SWTH', 'CPX_SWTH', 'EFX_SWTH', 'LRN_SWTH', 'MCT_SWTH',
'NKN_SWTH', 'NRVE_SWTH', 'OBT_SWTH', 'PKC_SWTH', 'QLC_SWTH', 'RHT_SWTH', 'SDS_SWTH', 'SOUL_SWTH',
'TKY_SWTH', 'TNC_SWTH', 'TOLL_SWTH', 'ZPT_SWTH']
switcheo_pairs = ['ACAT_SWTH', 'APH_SWTH', 'AVA_SWTH', 'COUP_SWTH', 'CPX_SWTH', 'EFX_SWTH', 'LRN_SWTH',
'MCT_SWTH', 'NKN_SWTH', 'NRVE_SWTH', 'OBT_SWTH', 'PKC_SWTH', 'QLC_SWTH', 'RHT_SWTH',
'SDS_SWTH', 'SOUL_SWTH', 'TKY_SWTH', 'TNC_SWTH', 'TOLL_SWTH', 'ZPT_SWTH']
all_pairs = ['GAS_NEO', 'SWTH_NEO', 'ACAT_NEO', 'APH_NEO', 'AVA_NEO', 'COUP_NEO', 'CPX_NEO']
neo_pairs = ['GAS_NEO', 'SWTH_NEO', 'ACAT_NEO', 'APH_NEO', 'ASA_NEO', 'AVA_NEO', 'COUP_NEO', 'CPX_NEO',
'DBC_NEO', 'EFX_NEO', 'FTWX_NEO', 'GALA_NEO', 'GUARD_NEO', 'LRN_NEO', 'LX_NEO', 'MCT_NEO',
'NKNO_NEO', 'NOS_NEO', 'NRVE_NEO', 'OBT_NEO', 'ONT_NEO', 'PHX_NEO', 'PKC_NEO', 'PROQ_NEO',
'QLC_NEO', 'RCPT_NEO', 'RHT_NEO', 'RPX_NEO', 'SDS_NEO', 'SENNO_NEO', 'SOUL_NEO', 'TKY_NEO',
'TMN_NEO', 'TNC_NEO', 'TOLL_NEO', 'ZPT_NEO', 'BOLTC_NEO', 'MCTP_NEO', 'NRVEP_NEO', 'RHTC_NEO']
self.assertTrue(set(pc.get_pairs()).issuperset(set(all_pairs)))
self.assertTrue(set(pc.get_pairs(base="SWTH")).issuperset(set(switcheo_pairs)))
self.assertTrue(set(pc.get_pairs(base="NEO")).issuperset(set(neo_pairs)))

def test_get_contracts(self):
contracts_dict = {
'NEO': {
'V1': '0ec5712e0f7c63e4b0fea31029a28cea5e9d551f',
'V1_5': 'c41d8b0c30252ce7e8b6d95e9ce13fdd68d2a5a8',
'V2': 'a195c1549e7da61b8da315765a790ac7e7633b82'},
'V2': 'a195c1549e7da61b8da315765a790ac7e7633b82',
'V3': 'ae8a22a3dd8d976291071867204ff20be50d92e5'
},
'ETH': {
'V1': '0x607af5164d95bd293dbe2b994c7d8aef6bec03bf'}}
'V1': '0x607af5164d95bd293dbe2b994c7d8aef6bec03bf'
},
'QTUM': {
'V1': '0x2b25406b0000c3661e9c88890690fd4b5c7b4234'
}
}
self.assertDictEqual(pc.get_contracts(), contracts_dict)

def test_get_orders(self):
Expand Down Expand Up @@ -193,11 +195,11 @@ def test_get_balance(self):
self.assertTrue(all_balance_dict_set.issubset(balance_dict_set))

sum_balance_dict = {'confirmed': {
'GAS': str(float(int(float(first_balance_dict['confirmed']['GAS'])) + int(
float(second_balance_dict['confirmed']['GAS'])))),
'NEO': str(float(int(float(first_balance_dict['confirmed']['NEO'])) + int(
float(second_balance_dict['confirmed']['NEO'])))),
'SWTH': str(float(int(float(first_balance_dict['confirmed']['SWTH'])) + int(
float(second_balance_dict['confirmed']['SWTH'])))),
'GAS': str(int(float(first_balance_dict['confirmed']['GAS'])) + int(
float(second_balance_dict['confirmed']['GAS']))),
'NEO': str(int(float(first_balance_dict['confirmed']['NEO'])) + int(
float(second_balance_dict['confirmed']['NEO']))),
'SWTH': str(int(float(first_balance_dict['confirmed']['SWTH'])) + int(
float(second_balance_dict['confirmed']['SWTH']))),
}}
self.assertDictEqual(all_balance_dict['confirmed'], sum_balance_dict['confirmed'])
6 changes: 3 additions & 3 deletions switcheo/test_switcheo_client.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def test_order_history(self):
self.assertTrue(set(all_orders[0].keys()).issubset(set(orders_list)))

def test_balance_current_contract(self):
expected_balance_current_contract_key_set = set(['NEO', 'ETH'])
expected_balance_current_contract_key_set = set(['NEO', 'ETH', 'QTUM'])
expected_balance_current_contract_child_key_set = set(['confirming', 'confirmed', 'locked'])
balance_current_contract = sc.balance_current_contract(testnet_address1)
balance_current_contract_key_set = set(balance_current_contract.keys())
Expand All @@ -53,8 +53,8 @@ def test_balance_current_contract(self):
balance_current_contract_child_key_set.issubset(expected_balance_current_contract_child_key_set))

def test_balance_by_contract(self):
expected_balance_by_contract_key_set = set(['NEO', 'ETH'])
expected_balance_by_contract_child_key_set = set(['V1', 'V1_5', 'V2'])
expected_balance_by_contract_key_set = set(['NEO', 'ETH', 'QTUM'])
expected_balance_by_contract_child_key_set = set(['V1', 'V1_5', 'V2', 'V3'])
expected_balance_by_contract_sub_key_set = set(['confirming', 'confirmed', 'locked'])
balance_by_contract = sc.balance_by_contract(testnet_address1)
balance_by_contract_key_set = set(balance_by_contract.keys())
Expand Down
6 changes: 4 additions & 2 deletions switcheo/test_switcheo_utils.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,10 @@ def test_stringify_message(self):
def test_current_contract_hash(self):
pc = PublicClient()
expected_current_contract_dict = {
'NEO': 'a195c1549e7da61b8da315765a790ac7e7633b82',
'ETH': '0x607af5164d95bd293dbe2b994c7d8aef6bec03bf'}
'NEO': 'ae8a22a3dd8d976291071867204ff20be50d92e5',
'ETH': '0x607af5164d95bd293dbe2b994c7d8aef6bec03bf',
'QTUM': '0x2b25406b0000c3661e9c88890690fd4b5c7b4234'
}
self.assertDictEqual(current_contract_hash(pc.contracts), expected_current_contract_dict)

def test_request_get(self):
Expand Down

0 comments on commit 43421d7

Please sign in to comment.