replace aioredis with redis

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.7
+FROM python:3.8
 
 WORKDIR /app
 COPY requirements.txt .
@@ -7,4 +7,4 @@ RUN pip install -r requirements.txt
 COPY . .
 
 EXPOSE 1337
-CMD ["hypercorn", "--access-logfile", "-", "--workers", "1", "--bind", "0.0.0.0:1337", "asgi:app"]
+CMD ["hypercorn", "--access-logfile", "-", "--workers", "1", "--bind", "0.0.0.0:1337", "asgi:app"]

asgi.py

@@ -2,5 +2,5 @@
 # Copyright (c) 2020, The Monero Project.
 # Copyright (c) 2020, dsc@xmr.pm
 
-from wowlet_backend_backend.factory import create_app
+from wowlet_backend.factory import create_app
 app = create_app()

data/nodes.json

@@ -15,11 +15,25 @@
         "zao3w6isidntdbnyee5ufs7fyzmv7wzchpw32i3uo5eldjwmo4bxg2qd.onion:34568"
       ],
       "clearnet": [
-          "spippolatori.it:34568",
-          "node2.monerodevs.org:34568",
-          "node3.monerodevs.org:34568",
-          "node.wowne.ro:34568",
-          "node.suchwow.xyz:34568"
+        "global.wownodes.com:34568",
+        "super.fast.node.xmr.pm:34568",
+        "node.wownero.club:34568",
+        "node.suchwow.xyz:34568",
+        "eu-west-1.wow.xmr.pm:34568",
+        "eu-west-2.wow.xmr.pm:34568",
+        "eu-west-3.wow.xmr.pm:34568",
+        "eu-west-4.wow.xmr.pm:34568",
+        "eu-west-5.wow.xmr.pm:34568",
+        "eu-west-6.wow.xmr.pm:34568",
+        "na-west-1.wow.xmr.pm:34568",
+        "much.wow.such.money:34568",
+        "very.wow.such.money:34568",
+        "169.119.33.174:34568",
+        "wow.bot.tips:34568",
+        "idontwanttogototoronto.wow.fail:34568",
+        "nyc.muchwow.lol:34568",
+        "amsterdam.muchwow.lol:34568",
+        "singapore.muchwow.lol:34568"
       ]
     },
     "stagenet": {

docker-compose.yml

@@ -4,7 +4,6 @@ services:
   redis:
     container_name: redis
     image: "redis:alpine"
-    command: redis-server
     environment:
       - REDIS_REPLICATION_MODE=master
   tor-node:
@@ -12,14 +11,16 @@ services:
     restart: always
   feather-ws:
     container_name: feather-ws
+    depends_on:
+      - redis
     build:
       context: .
       dockerfile: Dockerfile
     environment:
       - WOWLET_DEBUG=false
       - WOWLET_PORT=1337
-      - WOWLET_REDIS_ADDRESS=redis://redis
-      - WOWLET_TOR_SOCKS_PROXY=socks5://tor-node:9050
+      - WOWLET_REDIS_HOST=redis
+      - WOWLET_TOR_SOCKS_PROXY=tor-node:9050
       - WOWLET_COIN_NAME=monero
       - WOWLET_COIN_SYMBOL=xmr
       - WOWLET_COIN_MODE=mainnet

requirements.txt

@@ -1,5 +1,5 @@
 quart
-aioredis>=2.0.0
+redis>=4.2.0rc1
 aiohttp
 aiofiles
 quart_session

wowlet_backend/factory.py

@@ -10,7 +10,7 @@ from datetime import datetime
 from asyncio_multisubscriber_queue import MultisubscriberQueue
 from quart import Quart
 from quart_session import Session
-import aioredis
+from redis import asyncio as aioredis
 
 from wowlet_backend.utils import print_banner
 import settings

wowlet_backend/tasks/rates_crypto.py

@@ -2,7 +2,7 @@
 # Copyright (c) 2020, The Monero Project.
 # Copyright (c) 2020, dsc@xmr.pm
 
-import json, asyncio
+import json
 from typing import List, Union
 
 import settings
@@ -12,7 +12,7 @@ from wowlet_backend.factory import cache
 
 
 class CryptoRatesTask(WowletTask):
-    def __init__(self, interval: int = 600):
+    def __init__(self, interval: int = 360):
         super(CryptoRatesTask, self).__init__(interval)
 
         self._cache_key = "crypto_rates"
@@ -90,5 +90,4 @@ class CryptoRatesTask(WowletTask):
                 pass
 
             rates.append(obj)
-            await asyncio.sleep(10)
         return rates