Merge masterkey module and component

experiment/popularity_community/initial_filling.py

@@ -14,7 +14,7 @@
 from ipv8_service import IPv8
 from tribler_core.components.ipv8 import Ipv8Component
 from tribler_core.components.libtorrent import LibtorrentComponent
-from tribler_core.components.masterkey import MasterKeyComponent
+from tribler_core.components.masterkey.masterkey_component import MasterKeyComponent
 from tribler_core.components.metadata_store.metadata_store_component import MetadataStoreComponent
 from tribler_core.components.popularity import PopularityComponent
 from tribler_core.components.restapi import RESTComponent

experiment/tunnel_community/hidden_peer_discovery.py

@@ -6,7 +6,7 @@
 
 from ipv8.taskmanager import TaskManager
 from tribler_core.components.ipv8 import Ipv8Component
-from tribler_core.components.masterkey import MasterKeyComponent
+from tribler_core.components.masterkey.masterkey_component import MasterKeyComponent
 from tribler_core.components.restapi import RESTComponent
 from tribler_core.components.tunnels import TunnelsComponent
 from tribler_core.config.tribler_config import TriblerConfig

experiment/tunnel_community/speed_test_exit.py

@@ -6,7 +6,7 @@
 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.masterkey import MasterKeyComponent
+from tribler_core.components.masterkey.masterkey_component import MasterKeyComponent
 from tribler_core.components.restapi import RESTComponent
 from tribler_core.components.tunnels import TunnelsComponent
 from tribler_core.config.tribler_config import TriblerConfig

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

@@ -5,7 +5,7 @@
 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.masterkey import MasterKeyComponent
+from tribler_core.components.masterkey.masterkey_component import MasterKeyComponent
 from tribler_core.components.restapi import RESTComponent
 from tribler_core.restapi.rest_manager import RESTManager
 

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

@@ -5,7 +5,7 @@
 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.masterkey import MasterKeyComponent
+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

src/tribler-core/tribler_core/components/gigachannel_manager/tests/test_gigachannel_manager_component.py

@@ -5,7 +5,7 @@
 from tribler_core.components.base import Session
 from tribler_core.components.gigachannel_manager.gigachannel_manager_component import GigachannelManagerComponent
 from tribler_core.components.libtorrent import LibtorrentComponent
-from tribler_core.components.masterkey import MasterKeyComponent
+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.components.socks_configurator import SocksServersComponent

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

@@ -12,10 +12,8 @@
 from ipv8.peerdiscovery.community import DiscoveryCommunity, PeriodicSimilarity
 from ipv8.peerdiscovery.discovery import RandomWalk
 from ipv8.taskmanager import TaskManager
-
 from ipv8_service import IPv8
-
-from tribler_core.components.masterkey import MasterKeyComponent
+from tribler_core.components.masterkey.masterkey_component import MasterKeyComponent
 from tribler_core.components.restapi import RestfulComponent
 
 INFINITE = -1

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

@@ -1,6 +1,6 @@
 from tribler_common.simpledefs import STATE_CHECKPOINTS_LOADED, STATE_LOAD_CHECKPOINTS, STATE_START_LIBTORRENT
 
-from tribler_core.components.masterkey import MasterKeyComponent
+from tribler_core.components.masterkey.masterkey_component import MasterKeyComponent
 from tribler_core.components.restapi import RestfulComponent
 from tribler_core.components.socks_configurator import SocksServersComponent
 from tribler_core.components.upgrade import UpgradeComponent

src/tribler-core/tribler_core/components/masterkey.py → src/tribler-core/tribler_core/components/masterkey/masterkey_component.py

@@ -1,4 +1,4 @@
-import tribler_core.utilities.permid as permid_module
+import tribler_core.components.masterkey.permid as permid_module
 from ipv8.keyvault.private.libnaclkey import LibNaCLSK
 from tribler_core.components.base import Component
 

src/tribler-core/tribler_core/components/masterkey/tests/test_masterkey_component.py

@@ -0,0 +1,16 @@
+import pytest
+
+from tribler_core.components.base import Session
+from tribler_core.components.masterkey.masterkey_component import MasterKeyComponent
+
+
+@pytest.mark.asyncio
+async def test_masterkey_component(tribler_config):
+    session = Session(tribler_config, [MasterKeyComponent()])
+    with session:
+        comp = MasterKeyComponent.instance()
+        await session.start()
+
+        assert comp.keypair
+
+        await session.shutdown()

src/tribler-core/tribler_core/components/metadata_store/metadata_store_component.py

@@ -1,6 +1,6 @@
 from tribler_common.simpledefs import NTFY, STATEDIR_DB_DIR
 
-from tribler_core.components.masterkey import MasterKeyComponent
+from tribler_core.components.masterkey.masterkey_component import MasterKeyComponent
 from tribler_core.components.metadata_store.db.store import MetadataStore
 from tribler_core.components.metadata_store.utils import generate_test_channels
 from tribler_core.components.restapi import RestfulComponent

src/tribler-core/tribler_core/components/metadata_store/tests/test_metadata_store_component.py

@@ -3,7 +3,7 @@
 import pytest
 
 from tribler_core.components.base import Session
-from tribler_core.components.masterkey import MasterKeyComponent
+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

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

@@ -1,6 +1,6 @@
 from tribler_common.sentry_reporter.sentry_reporter import SentryReporter
 from tribler_core.components.base import Component
-from tribler_core.components.masterkey import MasterKeyComponent
+from tribler_core.components.masterkey.masterkey_component import MasterKeyComponent
 from tribler_core.utilities.unicode import hexlify
 
 

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

@@ -1,12 +1,10 @@
-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, SessionError
 from tribler_core.components.ipv8 import Ipv8Component
 from tribler_core.components.libtorrent import LibtorrentComponent
-from tribler_core.components.masterkey import MasterKeyComponent
+from tribler_core.components.masterkey.masterkey_component import MasterKeyComponent
 from tribler_core.components.metadata_store.metadata_store_component import MetadataStoreComponent
 from tribler_core.components.payout import PayoutComponent
 from tribler_core.components.popularity import PopularityComponent
@@ -19,7 +17,6 @@
 from tribler_core.components.upgrade import UpgradeComponent
 from tribler_core.components.version_check import VersionCheckComponent
 from tribler_core.components.watch_folder import WatchFolderComponent
-from tribler_core.restapi.rest_manager import RESTManager
 
 pytestmark = pytest.mark.asyncio
 
@@ -50,18 +47,6 @@ def test_session_context_manager(loop, tribler_config):
         Session.current()
 
 
-async def test_masterkey_component(tribler_config):
-    session = Session(tribler_config, [MasterKeyComponent()])
-    with session:
-        await session.start()
-
-        comp = MasterKeyComponent.instance()
-        assert comp.started.is_set() and not comp.failed
-        assert comp.keypair
-
-        await session.shutdown()
-
-
 async def test_ipv8_component(tribler_config):
     tribler_config.ipv8.enabled = True
     components = [MasterKeyComponent(), RESTComponent(), Ipv8Component()]

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

@@ -1,6 +1,6 @@
 from tribler_common.simpledefs import STATE_UPGRADING_READABLE
 
-from tribler_core.components.masterkey import MasterKeyComponent
+from tribler_core.components.masterkey.masterkey_component import MasterKeyComponent
 from tribler_core.components.restapi import RestfulComponent
 from tribler_core.upgrade.upgrade import TriblerUpgrader
 

src/tribler-core/tribler_core/config/tribler_config_sections.py

@@ -1,13 +1,14 @@
 from pydantic import BaseSettings, Extra
 
 from tribler_core.components.bandwidth_accounting.settings import BandwidthAccountingSettings
-from tribler_core.modules.libtorrent.settings import DownloadDefaultsSettings, LibtorrentSettings
 from tribler_core.components.gigachannel.community.settings import ChantSettings
+from tribler_core.components.masterkey.settings import BootstrapSettings, DHTSettings, DiscoveryCommunitySettings, \
+    Ipv8Settings, \
+    TrustchainSettings, WatchFolderSettings
+from tribler_core.modules.libtorrent.settings import DownloadDefaultsSettings, LibtorrentSettings
 from tribler_core.modules.popularity.settings import PopularityCommunitySettings
 from tribler_core.modules.remote_query_community.settings import RemoteQueryCommunitySettings
 from tribler_core.modules.resource_monitor.settings import ResourceMonitorSettings
-from tribler_core.modules.settings import BootstrapSettings, DHTSettings, DiscoveryCommunitySettings, Ipv8Settings, \
-    TrustchainSettings, WatchFolderSettings
 from tribler_core.modules.torrent_checker.settings import TorrentCheckerSettings
 from tribler_core.modules.tunnel.community.settings import TunnelCommunitySettings
 from tribler_core.restapi.settings import APISettings

src/tribler-core/tribler_core/modules/tunnel/tests/test_tunnel_settings.py

@@ -1,7 +1,7 @@
 import pytest
 
 from tribler_common.network_utils import NetworkUtils
-from tribler_core.modules.settings import Ipv8Settings
+from tribler_core.components.masterkey.settings import Ipv8Settings
 
 
 @pytest.mark.asyncio

src/tribler-core/tribler_core/start_core.py

@@ -19,7 +19,7 @@
 from tribler_core.components.gigachannel_manager.gigachannel_manager_component import GigachannelManagerComponent
 from tribler_core.components.ipv8 import Ipv8Component
 from tribler_core.components.libtorrent import LibtorrentComponent
-from tribler_core.components.masterkey import MasterKeyComponent
+from tribler_core.components.masterkey.masterkey_component import MasterKeyComponent
 from tribler_core.components.metadata_store.metadata_store_component import MetadataStoreComponent
 from tribler_core.components.payout import PayoutComponent
 from tribler_core.components.popularity import PopularityComponent

src/tribler-core/tribler_core/tests/test_permid.py

@@ -2,7 +2,7 @@
 
 from ipv8.keyvault.private.libnaclkey import LibNaCLSK
 
-from tribler_core.utilities import permid
+from tribler_core.components.masterkey import permid
 
 
 def test_save_load_keypair_pubkey_trustchain(tmpdir):

src/tribler-core/tribler_core/upgrade/tests/test_upgrader.py

@@ -10,7 +10,7 @@
 
 from tribler_common.simpledefs import NTFY
 
-import tribler_core.utilities.permid as permid_module
+import tribler_core.components.masterkey.permid as permid_module
 from tribler_core.components.bandwidth_accounting.db.database import BandwidthDatabase
 from tribler_core.components.metadata_store.db.orm_bindings.channel_metadata import CHANNEL_DIR_NAME_LENGTH
 from tribler_core.components.metadata_store.db.store import CURRENT_DB_VERSION, MetadataStore