XF/pluto
XF
/
pluto
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix Agora tests

This commit is contained in:
Mark Veidemanis 2022-02-15 21:30:16 +00:00
parent 2740c1d9f9
commit 6e660d7544
Signed by: m
GPG Key ID: 5ACFCEED46C0904F
4 changed files with 767 additions and 755 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
handler/agora.py
View File

@ -30,7 +30,9 @@ def handle_exceptions(func):
if "message" in rtrn:
if not rtrn["success"] and rtrn["message"] == "API ERROR":
if "error_code" in rtrn["response"]["error"]:
log.error("API error: {code}", code=rtrn["response"]["error"]["error_code"])
code = rtrn["response"]["error"]["error_code"]
if not code == 136:
log.error("API error: {code}", code=code)
return False
else:
log.error("API error: {code}", code=rtrn["response"]["error"])
@ -643,7 +645,7 @@ class Agora(object):
ad = self.agora.ad_create(**form)
return ad
def create_distribution_list(self):
def create_distribution_list(self, filter_asset=None):
"""
Create a list for distribution of ads.
:return: generator of asset, countrycode, currency, provider
@ -655,16 +657,18 @@ class Agora(object):
for asset in loads(settings.Agora.AssetList):
# Iterate pairs of currency and country like EUR, GB
for currency, countrycode in loads(settings.Agora.DistList):
if filter_asset:
if asset == filter_asset:
yield (asset, countrycode, currency, provider)
def dist_countries(self):
def dist_countries(self, filter_asset=None):
"""
Distribute our advert into all countries and providers listed in the config.
Exits on errors.
:return: False or dict with response
:rtype: bool or dict
"""
dist_list = list(self.create_distribution_list())
dist_list = list(self.create_distribution_list(filter_asset))
our_ads = self.enum_ads()
# Let's get rid of the ad IDs and make it a tuple like dist_list
our_ads = [(x[0], x[2], x[3], x[4]) for x in our_ads]

13
handler/commands.py
View File

@ -95,11 +95,22 @@ class IRCCommands(object):
class dist(object):
name = "dist"
authed = True
helptext = "Distribute all our chosen currency and country ad pairs."
helptext = "Distribute all our chosen currency and country ad pairs. Usage: dist [<XMR/BTC>]"
@staticmethod
def run(cmd, spl, length, authed, msg, agora, revolut, tx, notify):
# Distribute out our ad to all countries in the config
if length == 2:
asset = spl[1]
if asset not in loads(settings.Agora.AssetList):
msg(f"Not a valid asset: {spl[1]}")
return
for x in agora.dist_countries(filter_asset=asset):
if x["success"]:
msg(f"{x['response']['data']['message']}: {x['response']['data']['ad_id']}")
else:
msg(dumps(x["response"]))
elif length == 1:
for x in agora.dist_countries():
if x["success"]:
msg(f"{x['response']['data']['message']}: {x['response']['data']['ad_id']}")

1480
handler/tests/common.py
View File

File diff suppressed because it is too large Load Diff

3
handler/tests/test_agora.py
View File

@ -161,7 +161,6 @@ class TestAgora(TestCase):
to_append = [ad_id, username, temp_price, provider, asset, currency]
if to_append not in expected_return:
expected_return.append(to_append)
# print("expecting", to_append)
self.assertCountEqual(enum_ads_return, expected_return)
self.assertNotEqual(enum_ads_return[0][0], enum_ads_return[1][0])
@ -187,7 +186,7 @@ class TestAgora(TestCase):
price_xmr = cg_prices["monero"]["usd"]
for ad in deepcopy(enum_ads_return):
price = float(ad[2])
margin = round(price / price_xmr, 4)
margin = round(price / price_xmr, 2)
ad.append(margin)
expected_return.append(ad)