From ab297dcae972eb1879c7f4c92d6036d62d5efcba Mon Sep 17 00:00:00 2001
From: Quinten Stokkink <goqs@hotmail.com>
Date: Thu, 11 Apr 2024 13:31:24 +0200
Subject: [PATCH 1/2] Use new get_task functionality in tests

---
 pyipv8                                         |  2 +-
 .../download_manager/test_download_manager.py  |  4 +---
 .../test_unit/core/tunnel/test_community.py    | 18 +++++-------------
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/pyipv8 b/pyipv8
index e1f2e32b1f..3169dbdc9a 160000
--- a/pyipv8
+++ b/pyipv8
@@ -1 +1 @@
-Subproject commit e1f2e32b1f2943f027b3e7abd3f033122b59c2bb
+Subproject commit 3169dbdc9adee35a487b12b52108f31ff6e828d0
diff --git a/src/tribler/test_unit/core/libtorrent/download_manager/test_download_manager.py b/src/tribler/test_unit/core/libtorrent/download_manager/test_download_manager.py
index 13ab9c5a44..1442018cb1 100644
--- a/src/tribler/test_unit/core/libtorrent/download_manager/test_download_manager.py
+++ b/src/tribler/test_unit/core/libtorrent/download_manager/test_download_manager.py
@@ -363,9 +363,7 @@ async def test_download_manager_start(self) -> None:
         self.manager.start()
         await sleep(0)
 
-        for task in self.manager.get_tasks():
-            if task.get_name() == "start":
-                await task
+        await self.manager.get_task("start")
 
         self.assertTrue(self.manager.all_checkpoints_are_loaded)
 
diff --git a/src/tribler/test_unit/core/tunnel/test_community.py b/src/tribler/test_unit/core/tunnel/test_community.py
index bcb11973a5..cb3aa520dd 100644
--- a/src/tribler/test_unit/core/tunnel/test_community.py
+++ b/src/tribler/test_unit/core/tunnel/test_community.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from asyncio import TimeoutError as AsyncTimeoutError
-from asyncio import sleep, wait_for
+from asyncio import gather, sleep, wait_for
 from collections import defaultdict
 from io import BytesIO
 from typing import TYPE_CHECKING
@@ -198,9 +198,7 @@ async def test_monitor_downloads_stop_ip(self) -> None:
         self.overlay(0).download_states[b'a'] = 3
 
         self.overlay(0).monitor_downloads([])
-        for task in self.overlay(0).get_tasks():
-            if task.get_name().startswith("TriblerTunnelCommunity:remove_circuit"):
-                await task
+        await gather(*self.overlay(0).get_anonymous_tasks("remove_circuit"))
 
         self.assertNotIn(0, self.overlay(0).circuits)
 
@@ -250,9 +248,7 @@ async def test_monitor_downloads_intro(self) -> None:
         self.overlay(0).download_states[b'a'] = 3
 
         self.overlay(0).monitor_downloads([])
-        for task in self.overlay(0).get_tasks():
-            if task.get_name().startswith("TriblerTunnelCommunity:remove_circuit"):
-                await task
+        await gather(*self.overlay(0).get_anonymous_tasks("remove_circuit"))
 
         self.assertNotIn(0, self.overlay(0).circuits)
 
@@ -271,9 +267,7 @@ async def test_monitor_downloads_stop_all(self) -> None:
         self.overlay(0).download_states[b"a"] = 3
 
         self.overlay(0).monitor_downloads([])
-        for task in self.overlay(0).get_tasks():
-            if task.get_name().startswith("TriblerTunnelCommunity:remove_circuit"):
-                await task
+        await gather(*self.overlay(0).get_anonymous_tasks("remove_circuit"))
 
         self.assertNotIn(0, self.overlay(0).circuits)
 
@@ -372,9 +366,7 @@ async def test_perform_http_request_not_allowed(self) -> None:
         await self.introduce_nodes()
         self.overlay(0).create_circuit(1, exit_flags=[PEER_FLAG_EXIT_HTTP])
         await sleep(0)
-        for task in self.overlay(1).get_tasks():
-            if task.get_name().startswith("TriblerTunnelCommunity:on_packet_from_circuit"):
-                await task
+        await gather(*self.overlay(1).get_anonymous_tasks("on_packet_from_circuit"))
 
         with patch.dict(tribler.core.tunnel.community.__dict__, {"open_connection": open_connection}),\
                 self.assertRaises(AsyncTimeoutError):

From 2bc1c2e9c1d60aeddfaf30f1bb5b52de4a59bfeb Mon Sep 17 00:00:00 2001
From: Quinten Stokkink <goqs@hotmail.com>
Date: Thu, 11 Apr 2024 15:06:43 +0200
Subject: [PATCH 2/2] Updated Python versions for unit tests

---
 .github/workflows/unittests.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml
index d95dabe5b4..a55ab50a7e 100644
--- a/.github/workflows/unittests.yml
+++ b/.github/workflows/unittests.yml
@@ -9,7 +9,7 @@ jobs:
           submodules: 'true'
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.7'
+          python-version: '3.8'
           cache: 'pip'
       - run: python -m pip install -r requirements.txt
       - name: Run unit tests
@@ -50,7 +50,7 @@ jobs:
           submodules: 'true'
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.12'
+          python-version: '3.8'
           cache: 'pip'
       - run: python -m pip install -r requirements.txt
       - name: Run unit tests