Skip to content

chore: partially revert add get_percentage_remaining_ttl helper to DNSRecord #1344

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bdraco merged 2 commits into from
Dec 15, 2023
Merged

chore: partially revert add get_percentage_remaining_ttl helper to DNSRecord #1344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e73ba2
Revert "chore: add get_percentage_remaining_ttl helper to DNSRecord (…
bdraco Dec 15, 2023
13eab22
chore: keep the faster test
bdraco Dec 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/zeroconf/_dns.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@ cdef class DNSRecord(DNSEntry):

cpdef get_remaining_ttl(self, double now)

cpdef unsigned int get_percentage_remaining_ttl(self, double now)

cpdef double get_expiration_time(self, cython.uint percent)

cpdef bint is_expired(self, double now)
Expand Down
5 changes: 0 additions & 5 deletions src/zeroconf/_dns.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,11 +193,6 @@ def get_expiration_time(self, percent: _int) -> float:
by a certain percentage."""
return self.created + (percent * self.ttl * 10)

def get_percentage_remaining_ttl(self, now: _float) -> _int:
"""Returns the percentage remaining of the ttl between 0-100."""
remain = (self.created + (_EXPIRE_FULL_TIME_MS * self.ttl) - now) / self.ttl / 10
return 0 if remain <= 0 else round(remain)

# TODO: Switch to just int here
def get_remaining_ttl(self, now: _float) -> Union[int, float]:
"""Returns the remaining TTL in seconds."""
Expand Down
8 changes: 0 additions & 8 deletions tests/test_dns.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,20 +97,12 @@ def test_dns_record_reset_ttl(self):

assert record.created != record2.created
assert record.get_remaining_ttl(now) != record2.get_remaining_ttl(now)
assert record.get_percentage_remaining_ttl(now) != record2.get_percentage_remaining_ttl(now)
assert record2.get_percentage_remaining_ttl(later) == 100
assert record2.get_percentage_remaining_ttl(later + (const._DNS_HOST_TTL * 1000 / 2)) == 50

record.reset_ttl(record2)

assert record.ttl == record2.ttl
assert record.created == record2.created
assert record.get_remaining_ttl(now) == record2.get_remaining_ttl(now)
assert record.get_percentage_remaining_ttl(now) == record2.get_percentage_remaining_ttl(now)
assert record.get_percentage_remaining_ttl(later) == 100
assert record2.get_percentage_remaining_ttl(later) == 100
assert record.get_percentage_remaining_ttl(later + (const._DNS_HOST_TTL * 1000 / 2)) == 50
assert record2.get_percentage_remaining_ttl(later + (const._DNS_HOST_TTL * 1000 / 2)) == 50

def test_service_info_dunder(self):
type_ = "_test-srvc-type._tcp.local."
Expand Down