GlcoinCore/squeaknode
1
0
Fork 0
mirror of https://github.com/yzernik/squeaknode.git synced 2026-08-13 12:33:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename controller methods to use pubkey (#1876)

Browse source 
* Rename get profile by public key method

* Rename get entries by public key method

* Rename download squeaks by public key method

* Rename subscribe entries by public key method
This commit is contained in:
Jonathan Zernik 2021-12-20 17:12:54 -08:00 • committed by GitHub
parent 3860ec3b11
commit 162bb247e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

18
squeaknode/admin/squeak_admin_server_handler.py
View file

@ -197,11 +197,10 @@ class SqueakAdminServerHandler(object):
def handle_get_squeak_profile_by_pubkey(self, request):
public_key_hex = request.pubkey
# address = request.address
logger.info(
"Handle get squeak profile with public key: {}".format(public_key_hex))
public_key = SqueakPublicKey.from_bytes(bytes.fromhex(public_key_hex))
squeak_profile = self.squeak_controller.get_squeak_profile_by_address(
squeak_profile = self.squeak_controller.get_squeak_profile_by_public_key(
public_key,
)
squeak_profile_msg = optional_squeak_profile_to_message(squeak_profile)
@ -350,7 +349,6 @@ class SqueakAdminServerHandler(object):
def handle_get_squeak_display_entries_for_pubkey(self, request):
public_key_hex = request.pubkey
# address = request.address
limit = request.limit
last_entry = message_to_squeak_entry(request.last_entry) if request.HasField(
"last_entry") else None
@ -364,14 +362,14 @@ class SqueakAdminServerHandler(object):
))
public_key = SqueakPublicKey.from_bytes(bytes.fromhex(public_key_hex))
squeak_entries = (
self.squeak_controller.get_squeak_entries_for_address(
self.squeak_controller.get_squeak_entries_for_public_key(
public_key,
limit,
last_entry,
)
)
logger.info(
"Got number of squeak entries for address: {}".format(
"Got number of squeak entries for pubkey: {}".format(
len(squeak_entries)
)
)
@ -664,11 +662,10 @@ class SqueakAdminServerHandler(object):
def handle_download_pubkey_squeaks(self, request):
public_key_hex = request.pubkey
# squeak_address = request.address
logger.info(
"Handle download address squeaks for public key: {}".format(public_key_hex))
"Handle download squeaks for public key: {}".format(public_key_hex))
public_key = SqueakPublicKey.from_bytes(bytes.fromhex(public_key_hex))
download_result = self.squeak_controller.download_address_squeaks(
download_result = self.squeak_controller.download_public_key_squeaks(
public_key,
)
logger.info("Download result: {}".format(download_result))
@ -971,11 +968,10 @@ class SqueakAdminServerHandler(object):
def handle_subscribe_pubkey_squeak_displays(self, request, stopped):
public_key_hex = request.pubkey
# squeak_address = request.address
logger.info(
"Handle subscribe address squeak displays for public key: {}".format(public_key_hex))
"Handle subscribe squeak displays for public key: {}".format(public_key_hex))
public_key = SqueakPublicKey.from_bytes(bytes.fromhex(public_key_hex))
squeak_display_stream = self.squeak_controller.subscribe_squeak_address_entries(
squeak_display_stream = self.squeak_controller.subscribe_squeak_public_key_entries(
public_key,
stopped,
)

10
squeaknode/node/squeak_controller.py
View file

@ -294,7 +294,7 @@ class SqueakController:
def get_squeak_profile(self, profile_id: int) -> Optional[SqueakProfile]:
return self.squeak_db.get_profile(profile_id)
def get_squeak_profile_by_address(self, public_key: SqueakPublicKey) -> Optional[SqueakProfile]:
def get_squeak_profile_by_public_key(self, public_key: SqueakPublicKey) -> Optional[SqueakProfile]:
return self.squeak_db.get_profile_by_public_key(public_key)
def get_squeak_profile_by_name(self, name: str) -> Optional[SqueakProfile]:
@ -476,7 +476,7 @@ class SqueakController:
last_entry,
)
def get_squeak_entries_for_address(
def get_squeak_entries_for_public_key(
self,
public_key: SqueakPublicKey,
limit: int,
@ -723,8 +723,8 @@ class SqueakController:
)
return self.active_download_manager.download_interest(10, interest)
def download_address_squeaks(self, public_key: SqueakPublicKey) -> DownloadResult:
logger.info("Downloading address squeaks for public key: {}".format(
def download_public_key_squeaks(self, public_key: SqueakPublicKey) -> DownloadResult:
logger.info("Downloading squeaks for public key: {}".format(
public_key,
))
interest = CInterested(
@ -804,7 +804,7 @@ class SqueakController:
reply_hash = get_hash(item)
yield self.get_squeak_entry(reply_hash)
def subscribe_squeak_address_entries(self, public_key: SqueakPublicKey, stopped: threading.Event):
def subscribe_squeak_public_key_entries(self, public_key: SqueakPublicKey, stopped: threading.Event):
for item in self.new_squeak_listener.yield_items(stopped):
if public_key == item.GetPubKey():
squeak_hash = get_hash(item)