txlyre 2 年 前
コミット
fb8d2d831a
1 ファイル変更11 行追加11 行削除
  1. 11 11
      byafn.py

+ 11 - 11
byafn.py

@@ -413,8 +413,8 @@ async def query(hash, uid=None, ttl=0, filter=None):
       hash=hash,
       ttl=ttl
     ),
-    fn=lambda answer: answer.kind == Message.QUERY_HIT and sha256(answer.data) == hash,
-    filter=filter
+    message_filter=lambda answer: answer.kind == Message.QUERY_HIT and sha256(answer.data) == hash,
+    peer_filter=filter
   )
 
   if not answer:
@@ -427,7 +427,7 @@ async def query(hash, uid=None, ttl=0, filter=None):
 
   return answer.data
 
-async def broadcast(message, fn=None, filter=None):
+async def broadcast(message, message_filter=None, peer_filter=None):
   if message.ttl >= MAX_TTL:
     return
 
@@ -437,7 +437,7 @@ async def broadcast(message, fn=None, filter=None):
     if not peer.is_open:
       continue
 
-    if filter and not filter(peer):
+    if peer_filter and not peer_filter(peer):
       continue
 
     try:
@@ -447,7 +447,7 @@ async def broadcast(message, fn=None, filter=None):
         timeout=BROADCAST_TIMEOUT
       )
 
-      if fn and fn(answer):
+      if message_filter and message_filter(answer):
         return answer
     except:
       continue
@@ -555,7 +555,7 @@ async def serve(peer):
 
   await asyncio.sleep(RATELIMIT)
 
-  asyncio.get_event_loop().create_task(
+  asyncio.create_task(
     tick(peer)
   )
 
@@ -651,7 +651,7 @@ async def dial(address):
 
     return
 
-  asyncio.get_event_loop().create_task(
+  asyncio.create_task(
     accept(reader, writer, address)
   )
 
@@ -674,7 +674,7 @@ async def watcher():
         peers.remove(peer)
 
         if peer.address:
-          asyncio.get_event_loop().create_task(
+          asyncio.create_task(
             dial(peer.address)
           )
 
@@ -732,7 +732,7 @@ async def accept_admin(reader, writer):
 
       await logger.info(f'Requested shutdown in {delay}sec.')
 
-      asyncio.get_event_loop().create_task(
+      asyncio.create_task(
         shutdown(delay)
       )
     else:
@@ -778,14 +778,14 @@ async def main():
   if not await aiofiles.os.path.isdir(config['StoragePath']):
     await aiofiles.os.mkdir(config['StoragePath'])
 
-  asyncio.get_event_loop().create_task(
+  asyncio.create_task(
     watcher()
   )
 
   for address in config['Peers']:
     await dial(address)
 
-  asyncio.get_event_loop().create_task(
+  asyncio.create_task(
     listen_admin()
   )