From be64e00b3dfd41ef79dbaee8fd8295de8e7ce757 Mon Sep 17 00:00:00 2001
From: Jonathan Zernik <yzernik@gmail.com>
Date: Sun, 26 Sep 2021 10:57:04 -0700
Subject: [PATCH] Rename remote subscription attribute of peer class (#1422)

---
 squeaknode/network/connection.py                 |  2 +-
 squeaknode/network/peer.py                       | 16 ++++++++--------
 .../node/update_subscribed_secret_key_worker.py  |  2 +-
 .../node/update_subscribed_squeak_worker.py      |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/squeaknode/network/connection.py b/squeaknode/network/connection.py
index 98cc749c..d48c8f0e 100644
--- a/squeaknode/network/connection.py
+++ b/squeaknode/network/connection.py
@@ -245,7 +245,7 @@ class Connection(object):
 
     def handle_subscribe(self, msg):
         self._send_reply_invs(msg.locator)
-        self.peer.set_subscription(msg)
+        self.peer.set_remote_subscription(msg)
 
     def _send_reply_invs(self, locator):
         for interest in locator.vInterested:
diff --git a/squeaknode/network/peer.py b/squeaknode/network/peer.py
index 8bf8106c..009335bd 100644
--- a/squeaknode/network/peer.py
+++ b/squeaknode/network/peer.py
@@ -81,7 +81,7 @@ class Peer(object):
         self._num_msgs_sent = 0
         self._num_bytes_sent = 0
 
-        self._subscription = None
+        self._remote_subscription = None
 
         self.msg_receiver = MessageReceiver(
             self._peer_socket,
@@ -105,8 +105,8 @@ class Peer(object):
         return self._remote_address
 
     @property
-    def subscription(self):
-        return self._subscription
+    def remote_subscription(self):
+        return self._remote_subscription
 
     @property
     def local_caddress(self):
@@ -266,13 +266,13 @@ class Peer(object):
     def set_disconnected(self):
         self._connect_time = None
 
-    def set_subscription(self, subscription):
-        self._subscription = subscription
+    def set_remote_subscription(self, subscription):
+        self._remote_subscription = subscription
 
-    def is_subscribed(self, squeak: CSqueak):
-        if self.subscription is None:
+    def is_remote_subscribed(self, squeak: CSqueak):
+        if self.remote_subscription is None:
             return False
-        locator = self.subscription.locator
+        locator = self.remote_subscription.locator
         for interest in locator.vInterested:
             if squeak_matches_interest(squeak, interest):
                 return True
diff --git a/squeaknode/node/update_subscribed_secret_key_worker.py b/squeaknode/node/update_subscribed_secret_key_worker.py
index 6aecd2d3..b6af2cdb 100644
--- a/squeaknode/node/update_subscribed_secret_key_worker.py
+++ b/squeaknode/node/update_subscribed_secret_key_worker.py
@@ -75,7 +75,7 @@ class UpdateSubscribedSecretKeysWorker:
             get_hash(squeak).hex(),
         ))
         for peer in self.network_manager.get_connected_peers():
-            if peer.is_subscribed(squeak):
+            if peer.is_remote_subscribed(squeak):
                 logger.debug("Forwarding to peer: {}".format(
                     peer,
                 ))
diff --git a/squeaknode/node/update_subscribed_squeak_worker.py b/squeaknode/node/update_subscribed_squeak_worker.py
index 83435516..127060ee 100644
--- a/squeaknode/node/update_subscribed_squeak_worker.py
+++ b/squeaknode/node/update_subscribed_squeak_worker.py
@@ -75,7 +75,7 @@ class UpdateSubscribedSqueaksWorker:
             get_hash(squeak).hex(),
         ))
         for peer in self.network_manager.get_connected_peers():
-            if peer.is_subscribed(squeak):
+            if peer.is_remote_subscribed(squeak):
                 logger.debug("Forwarding to peer: {}".format(
                     peer,
                 ))