Merge pull request #6410 from drew2a/refactoring/merge_ipv8

Merge ipv8 module and component

experiment/popularity_community/initial_filling.py

@@ -12,7 +12,7 @@
 
 from ipv8.peerdiscovery.discovery import RandomWalk
 from ipv8_service import IPv8
-from tribler_core.components.ipv8 import Ipv8Component
+from tribler_core.components.ipv8.ipv8_component import Ipv8Component
 from tribler_core.components.libtorrent import LibtorrentComponent
 from tribler_core.components.masterkey.masterkey_component import MasterKeyComponent
 from tribler_core.components.metadata_store.metadata_store_component import MetadataStoreComponent

experiment/tunnel_community/hidden_peer_discovery.py

@@ -5,7 +5,7 @@
 from pathlib import Path
 
 from ipv8.taskmanager import TaskManager
-from tribler_core.components.ipv8 import Ipv8Component
+from tribler_core.components.ipv8.ipv8_component import Ipv8Component
 from tribler_core.components.masterkey.masterkey_component import MasterKeyComponent
 from tribler_core.components.restapi import RESTComponent
 from tribler_core.components.tunnels import TunnelsComponent

experiment/tunnel_community/speed_test_exit.py

@@ -5,7 +5,7 @@
 from ipv8.messaging.anonymization.tunnel import EXIT_NODE, ORIGINATOR
 from ipv8.messaging.anonymization.utils import run_speed_test
 from ipv8.taskmanager import TaskManager
-from tribler_core.components.ipv8 import Ipv8Component
+from tribler_core.components.ipv8.ipv8_component import Ipv8Component
 from tribler_core.components.masterkey.masterkey_component import MasterKeyComponent
 from tribler_core.components.restapi import RESTComponent
 from tribler_core.components.tunnels import TunnelsComponent

src/seedbox/disseminator.py

@@ -29,7 +29,7 @@
 
 from tribler_core.components.gigachannel.gigachannel_component import GigaChannelComponent
 from tribler_core.components.gigachannel_manager.gigachannel_manager_component import GigachannelManagerComponent
-from tribler_core.components.ipv8 import Ipv8Component
+from tribler_core.components.ipv8.ipv8_component import Ipv8Component
 from tribler_core.components.libtorrent import LibtorrentComponent
 from tribler_core.components.masterkey.masterkey_component import MasterKeyComponent
 from tribler_core.components.metadata_store.db.orm_bindings.channel_node import NEW

src/tribler-core/tribler_core/components/bandwidth_accounting/bandwidth_accounting_component.py

@@ -5,7 +5,7 @@
     BandwidthAccountingTestnetCommunity,
 )
 from tribler_core.components.bandwidth_accounting.db.database import BandwidthDatabase
-from tribler_core.components.ipv8 import Ipv8Component
+from tribler_core.components.ipv8.ipv8_component import Ipv8Component
 from tribler_core.components.restapi import RestfulComponent
 from tribler_core.components.upgrade import UpgradeComponent
 

src/tribler-core/tribler_core/components/bandwidth_accounting/tests/test_bandwidth_accounting_component.py

@@ -1,10 +1,8 @@
-from unittest.mock import patch
-
 import pytest
 
 from tribler_core.components.bandwidth_accounting.bandwidth_accounting_component import BandwidthAccountingComponent
 from tribler_core.components.base import Session
-from tribler_core.components.ipv8 import Ipv8Component
+from tribler_core.components.ipv8.ipv8_component import Ipv8Component
 from tribler_core.components.masterkey.masterkey_component import MasterKeyComponent
 from tribler_core.components.restapi import RESTComponent
 

src/tribler-core/tribler_core/components/gigachannel/gigachannel_component.py

@@ -6,7 +6,7 @@
     GigaChannelTestnetCommunity,
 )
 from tribler_core.components.gigachannel.community.sync_strategy import RemovePeers
-from tribler_core.components.ipv8 import INFINITE, Ipv8Component
+from tribler_core.components.ipv8.ipv8_component import INFINITE, Ipv8Component
 from tribler_core.components.metadata_store.metadata_store_component import MetadataStoreComponent
 from tribler_core.components.reporter import ReporterComponent
 from tribler_core.components.restapi import RestfulComponent

src/tribler-core/tribler_core/components/gigachannel/tests/test_gigachannel_component.py

@@ -1,14 +1,11 @@
-from unittest.mock import patch
-
 import pytest
 
 from tribler_core.components.base import Session
 from tribler_core.components.gigachannel.gigachannel_component import GigaChannelComponent
-from tribler_core.components.ipv8 import Ipv8Component
+from tribler_core.components.ipv8.ipv8_component import Ipv8Component
 from tribler_core.components.masterkey.masterkey_component import MasterKeyComponent
 from tribler_core.components.metadata_store.metadata_store_component import MetadataStoreComponent
 from tribler_core.components.restapi import RESTComponent
-from tribler_core.restapi.rest_manager import RESTManager
 
 
 # pylint: disable=protected-access

src/tribler-core/tribler_core/components/ipv8.py → src/tribler-core/tribler_core/components/ipv8/ipv8_component.py

@@ -19,6 +19,8 @@
 INFINITE = -1
 
 
+# pylint: disable=import-outside-toplevel
+
 class Ipv8Component(RestfulComponent):
     ipv8: IPv8
     peer: Peer
@@ -69,7 +71,7 @@ async def run(self):
                 ipv8.endpoint.enable_community_statistics(overlay.get_prefix(), True)
 
         if config.ipv8.walk_scaling_enabled and not config.gui_test_mode:
-            from tribler_core.modules.ipv8_health_monitor import IPv8Monitor
+            from tribler_core.components.ipv8.ipv8_health_monitor import IPv8Monitor
             IPv8Monitor(ipv8,
                         config.ipv8.walk_interval,
                         config.ipv8.walk_scaling_upper_limit).start(self._task_manager)

src/tribler-core/tribler_core/components/ipv8/tests/test_ipv8_component.py

@@ -0,0 +1,49 @@
+import pytest
+
+from tribler_core.components.base import Session
+from tribler_core.components.ipv8.ipv8_component import Ipv8Component
+from tribler_core.components.masterkey.masterkey_component import MasterKeyComponent
+from tribler_core.components.restapi import RESTComponent
+
+pytestmark = pytest.mark.asyncio
+
+
+# pylint: disable=protected-access
+async def test_ipv8_component(tribler_config):
+    tribler_config.ipv8.enabled = True
+    session = Session(tribler_config, [MasterKeyComponent(), RESTComponent(), Ipv8Component()])
+    with session:
+        await session.start()
+
+        comp = Ipv8Component.instance()
+        assert comp.started_event.is_set() and not comp.failed
+        assert comp.ipv8
+        assert comp.peer
+        assert not comp.dht_discovery_community
+        assert comp._task_manager
+        assert not comp._peer_discovery_community
+
+        await session.shutdown()
+
+
+async def test_ipv8_component_dht_disabled(tribler_config):
+    tribler_config.ipv8.enabled = True
+    tribler_config.dht.enabled = True
+    session = Session(tribler_config, [MasterKeyComponent(), RESTComponent(), Ipv8Component()])
+    with session:
+        await session.start()
+
+        comp = Ipv8Component.instance()
+        assert comp.dht_discovery_community
+
+
+async def test_ipv8_component_discovery_community_enabled(tribler_config):
+    tribler_config.ipv8.enabled = True
+    tribler_config.gui_test_mode = False
+    tribler_config.discovery_community.enabled = True
+    session = Session(tribler_config, [MasterKeyComponent(), RESTComponent(), Ipv8Component()])
+    with session:
+        await session.start()
+
+        comp = Ipv8Component.instance()
+        assert comp._peer_discovery_community

src/tribler-core/tribler_core/modules/tests/test_ipv8_health_manager.py → src/tribler-core/tribler_core/components/ipv8/tests/test_ipv8_health_manager.py

@@ -10,7 +10,7 @@
 
 from ipv8.taskmanager import TaskManager
 
-from tribler_core.modules.ipv8_health_monitor import IPv8Monitor
+from tribler_core.components.ipv8.ipv8_health_monitor import IPv8Monitor
 
 
 DEFAULT_WALK_INTERVAL = 0.5

src/tribler-core/tribler_core/components/payout.py

@@ -1,7 +1,7 @@
 from tribler_common.simpledefs import NTFY
 from tribler_core.components.bandwidth_accounting.bandwidth_accounting_component import BandwidthAccountingComponent
 from tribler_core.components.base import Component
-from tribler_core.components.ipv8 import Ipv8Component
+from tribler_core.components.ipv8.ipv8_component import Ipv8Component
 from tribler_core.components.reporter import ReporterComponent
 from tribler_core.modules.payout.payout_manager import PayoutManager
 

src/tribler-core/tribler_core/components/popularity.py

@@ -1,7 +1,7 @@
 from ipv8.peerdiscovery.network import Network
 from tribler_core.components.base import Component
 from tribler_core.components.gigachannel.community.sync_strategy import RemovePeers
-from tribler_core.components.ipv8 import INFINITE, Ipv8Component
+from tribler_core.components.ipv8.ipv8_component import INFINITE, Ipv8Component
 from tribler_core.components.metadata_store.metadata_store_component import MetadataStoreComponent
 from tribler_core.components.reporter import ReporterComponent
 from tribler_core.components.torrent_checker import TorrentCheckerComponent

src/tribler-core/tribler_core/components/tests/test_tribler_components.py

@@ -2,7 +2,7 @@
 
 from tribler_core.components.bandwidth_accounting.bandwidth_accounting_component import BandwidthAccountingComponent
 from tribler_core.components.base import Session, SessionError
-from tribler_core.components.ipv8 import Ipv8Component
+from tribler_core.components.ipv8.ipv8_component import Ipv8Component
 from tribler_core.components.libtorrent import LibtorrentComponent
 from tribler_core.components.masterkey.masterkey_component import MasterKeyComponent
 from tribler_core.components.metadata_store.metadata_store_component import MetadataStoreComponent
@@ -47,46 +47,6 @@ def test_session_context_manager(loop, tribler_config):
         Session.current()
 
 
-async def test_ipv8_component(tribler_config):
-    tribler_config.ipv8.enabled = True
-    session = Session(tribler_config, [MasterKeyComponent(), RESTComponent(), Ipv8Component()])
-    with session:
-        await session.start()
-
-        comp = Ipv8Component.instance()
-        assert comp.started_event.is_set() and not comp.failed
-        assert comp.ipv8
-        assert comp.peer
-        assert not comp.dht_discovery_community
-        assert comp._task_manager
-        assert not comp._peer_discovery_community
-
-        await session.shutdown()
-
-
-async def test_ipv8_component_dht_disabled(tribler_config):
-    tribler_config.ipv8.enabled = True
-    tribler_config.dht.enabled = True
-    session = Session(tribler_config, [MasterKeyComponent(), RESTComponent(), Ipv8Component()])
-    with session:
-        await session.start()
-
-        comp = Ipv8Component.instance()
-        assert comp.dht_discovery_community
-
-
-async def test_ipv8_component_discovery_community_enabled(tribler_config):
-    tribler_config.ipv8.enabled = True
-    tribler_config.gui_test_mode = False
-    tribler_config.discovery_community.enabled = True
-    session = Session(tribler_config, [MasterKeyComponent(), RESTComponent(), Ipv8Component()])
-    with session:
-        await session.start()
-
-        comp = Ipv8Component.instance()
-        assert comp._peer_discovery_community
-
-
 async def test_libtorrent_component(tribler_config):
     tribler_config.libtorrent.enabled = True
     tribler_config.chant.enabled = True

src/tribler-core/tribler_core/components/tunnels.py

@@ -2,7 +2,7 @@
 from ipv8.messaging.anonymization.community import TunnelSettings
 
 from tribler_core.components.bandwidth_accounting.bandwidth_accounting_component import BandwidthAccountingComponent
-from tribler_core.components.ipv8 import INFINITE, Ipv8Component
+from tribler_core.components.ipv8.ipv8_component import INFINITE, Ipv8Component
 from tribler_core.components.libtorrent import LibtorrentComponent
 from tribler_core.components.restapi import RestfulComponent
 from tribler_core.components.socks_configurator import SocksServersComponent

src/tribler-core/tribler_core/start_core.py

@@ -17,7 +17,7 @@
 from tribler_core.components.base import Component, Session
 from tribler_core.components.gigachannel.gigachannel_component import GigaChannelComponent
 from tribler_core.components.gigachannel_manager.gigachannel_manager_component import GigachannelManagerComponent
-from tribler_core.components.ipv8 import Ipv8Component
+from tribler_core.components.ipv8.ipv8_component import Ipv8Component
 from tribler_core.components.libtorrent import LibtorrentComponent
 from tribler_core.components.masterkey.masterkey_component import MasterKeyComponent
 from tribler_core.components.metadata_store.metadata_store_component import MetadataStoreComponent