diff --git a/squeaknode/admin/squeak_admin_server_handler.py b/squeaknode/admin/squeak_admin_server_handler.py index 2d7e55e8..eaf594b0 100644 --- a/squeaknode/admin/squeak_admin_server_handler.py +++ b/squeaknode/admin/squeak_admin_server_handler.py @@ -12,7 +12,7 @@ from squeaknode.admin.util import squeak_peer_to_message from squeaknode.admin.util import squeak_profile_to_message from squeaknode.core.squeak_controller import SqueakController from squeaknode.lightning.lnd_lightning_client import LNDLightningClient -from squeaknode.sync.squeak_sync_status import SqueakSyncController +from squeaknode.sync.squeak_sync_controller import SqueakSyncController logger = logging.getLogger(__name__) diff --git a/squeaknode/main.py b/squeaknode/main.py index f59b4991..4f9a3294 100644 --- a/squeaknode/main.py +++ b/squeaknode/main.py @@ -22,11 +22,11 @@ from squeaknode.node.received_payments_subscription_client import ( ) from squeaknode.node.squeak_memory_whitelist import SqueakMemoryWhitelist from squeaknode.node.squeak_node import SqueakNode +from squeaknode.node.squeak_peer_sync_worker import SqueakPeerSyncWorker from squeaknode.node.squeak_rate_limiter import SqueakRateLimiter from squeaknode.server.squeak_server_handler import SqueakServerHandler from squeaknode.server.squeak_server_servicer import SqueakServerServicer -from squeaknode.sync.squeak_peer_sync_worker import SqueakPeerSyncWorker -from squeaknode.sync.squeak_sync_status import SqueakSyncController +from squeaknode.sync.squeak_sync_controller import SqueakSyncController logger = logging.getLogger(__name__) diff --git a/squeaknode/sync/squeak_peer_sync_worker.py b/squeaknode/node/squeak_peer_sync_worker.py similarity index 90% rename from squeaknode/sync/squeak_peer_sync_worker.py rename to squeaknode/node/squeak_peer_sync_worker.py index 650879e8..cddffeba 100644 --- a/squeaknode/sync/squeak_peer_sync_worker.py +++ b/squeaknode/node/squeak_peer_sync_worker.py @@ -1,7 +1,7 @@ import logging import threading -from squeaknode.sync.squeak_sync_status import SqueakSyncController +from squeaknode.sync.squeak_sync_controller import SqueakSyncController logger = logging.getLogger(__name__) diff --git a/squeaknode/sync/network_task.py b/squeaknode/sync/network_sync.py similarity index 96% rename from squeaknode/sync/network_task.py rename to squeaknode/sync/network_sync.py index b814c112..08ca2fa7 100644 --- a/squeaknode/sync/network_task.py +++ b/squeaknode/sync/network_sync.py @@ -3,7 +3,7 @@ import threading from abc import ABC from abc import abstractmethod -from squeaknode.sync.peer_task import PeerSyncTask +from squeaknode.sync.peer_sync_controller import PeerSyncController logger = logging.getLogger(__name__) @@ -39,7 +39,7 @@ class NetworkSync(ABC): # TODO: sleep for timeout and then call self._stop() def _sync_peer(self, peer): - with PeerSyncTask( + with PeerSyncController( self.squeak_controller, peer, self.stopped, diff --git a/squeaknode/sync/peer_task.py b/squeaknode/sync/peer_sync_controller.py similarity index 87% rename from squeaknode/sync/peer_task.py rename to squeaknode/sync/peer_sync_controller.py index 45c1652f..bd2acc52 100644 --- a/squeaknode/sync/peer_task.py +++ b/squeaknode/sync/peer_sync_controller.py @@ -7,7 +7,7 @@ from squeaknode.sync.util import parse_buy_offer logger = logging.getLogger(__name__) -class PeerSyncTask: +class PeerSyncController: def __init__( self, @@ -24,24 +24,11 @@ class PeerSyncTask: ) self.stopped = stopped - # @contextmanager - # def open_peer_sync_task(self): - # with PeerConnection(self.peer).open_connection() as peer_connection: - # self.peer_connection = peer_connection - # yield self - # self.peer_connection = None - @contextmanager def open_connection(self): with self.peer_client.open_stub(): yield self - # @property - # def peer_client(self): - # if self.peer_connection is None: - # return None - # return self.peer_connection.peer_client - def download( self, min_block, @@ -180,10 +167,6 @@ class PeerSyncTask: squeak = self.peer_client.get_squeak(squeak_hash) self._save_squeak(squeak) - # def _get_followed_addresses(self): - # followed_profiles = self.squeak_db.get_following_profiles() - # return [profile.address for profile in followed_profiles] - def _download_offer(self, squeak_hash: bytes): self.get_offer(squeak_hash) @@ -199,13 +182,5 @@ class PeerSyncTask: def _upload_squeak(self, squeak): self.peer_client.post_squeak(squeak) - # def _get_sharing_addresses(self): - # sharing_profiles = self.squeak_db.get_sharing_profiles() - # return [profile.address for profile in sharing_profiles] - def _download_offer_msg(self, squeak_hash: bytes): return self.peer_client.buy_squeak(squeak_hash) - - # def _save_offer(self, offer): - # logger.info("Saving offer: {}".format(offer)) - # self.squeak_db.insert_offer(offer) diff --git a/squeaknode/sync/squeak_sync_status.py b/squeaknode/sync/squeak_sync_controller.py similarity index 73% rename from squeaknode/sync/squeak_sync_status.py rename to squeaknode/sync/squeak_sync_controller.py index 75892865..22e00aa1 100644 --- a/squeaknode/sync/squeak_sync_status.py +++ b/squeaknode/sync/squeak_sync_controller.py @@ -1,14 +1,15 @@ import logging -from squeaknode.sync.network_task import SingleSqueakDownloadSync -from squeaknode.sync.network_task import SingleSqueakUploadSync -from squeaknode.sync.network_task import TimelineDownloadSync -from squeaknode.sync.network_task import TimelineUploadSync +from squeaknode.sync.network_sync import SingleSqueakDownloadSync +from squeaknode.sync.network_sync import SingleSqueakUploadSync +from squeaknode.sync.network_sync import TimelineDownloadSync +from squeaknode.sync.network_sync import TimelineUploadSync logger = logging.getLogger(__name__) class SqueakSyncController: + def __init__(self, squeak_controller, sync_block_range): self.squeak_controller = squeak_controller self.sync_block_range = sync_block_range @@ -24,12 +25,6 @@ class SqueakSyncController: return min_block = block_height - block_range max_block = block_height - # dowload_timeline_task = DownloadTimelineSync( - # self.squeak_controller, - # min_block, - # max_block, - # ) - # dowload_timeline_task.sync() TimelineDownloadSync( self.squeak_controller, min_block, @@ -47,12 +42,6 @@ class SqueakSyncController: return min_block = block_height - block_range max_block = block_height - # dowload_timeline_task = DownloadTimelineSync( - # self.squeak_controller, - # min_block, - # max_block, - # ) - # dowload_timeline_task.sync() TimelineUploadSync( self.squeak_controller, min_block,