fix: cleanup related types

bdraco · bdraco · commit 717b5dcf9c14 · 2023-12-18T18:29:56.000-10:00
diff --git a/src/zeroconf/_handlers/query_handler.pxd b/src/zeroconf/_handlers/query_handler.pxd
@@ -106,6 +106,7 @@ cdef class QueryHandler:
 
     @cython.locals(
         first_packet=DNSIncoming,
+        ucast_source=bint,
         out_queue=MulticastOutgoingQueue,
         out_delay_queue=MulticastOutgoingQueue
     )
diff --git a/src/zeroconf/_handlers/record_manager.pxd b/src/zeroconf/_handlers/record_manager.pxd
@@ -22,22 +22,21 @@ cdef class RecordManager:
     cdef public DNSCache cache
     cdef public cython.set listeners
 
-    cpdef async_updates(self, object now, object records)
+    cpdef void async_updates(self, object now, object records)
 
-    cpdef async_updates_complete(self, object notify)
+    cpdef void async_updates_complete(self, bint notify)
 
     @cython.locals(
         cache=DNSCache,
         record=DNSRecord,
         answers=cython.list,
         maybe_entry=DNSRecord,
-        now_double=double
     )
-    cpdef async_updates_from_response(self, DNSIncoming msg)
+    cpdef void async_updates_from_response(self, DNSIncoming msg)
 
-    cpdef async_add_listener(self, RecordUpdateListener listener, object question)
+    cpdef void async_add_listener(self, RecordUpdateListener listener, object question)
 
-    cpdef async_remove_listener(self, RecordUpdateListener listener)
+    cpdef void async_remove_listener(self, RecordUpdateListener listener)
 
     @cython.locals(question=DNSQuestion, record=DNSRecord)
-    cdef _async_update_matching_records(self, RecordUpdateListener listener, cython.list questions)
+    cdef void _async_update_matching_records(self, RecordUpdateListener listener, cython.list questions)
diff --git a/src/zeroconf/_handlers/record_manager.py b/src/zeroconf/_handlers/record_manager.py
@@ -84,7 +84,6 @@ def async_updates_from_response(self, msg: DNSIncoming) -> None:
         other_adds: List[DNSRecord] = []
         removes: Set[DNSRecord] = set()
         now = msg.now
-        now_double = now
         unique_types: Set[Tuple[str, int, int]] = set()
         cache = self.cache
         answers = msg.answers()
@@ -113,7 +112,7 @@ def async_updates_from_response(self, msg: DNSIncoming) -> None:
                 record = cast(_UniqueRecordsType, record)
 
             maybe_entry = cache.async_get_unique(record)
-            if not record.is_expired(now_double):
+            if not record.is_expired(now):
                 if maybe_entry is not None:
                     maybe_entry.reset_ttl(record)
                 else:
@@ -129,7 +128,7 @@ def async_updates_from_response(self, msg: DNSIncoming) -> None:
                 removes.add(record)
 
         if unique_types:
-            cache.async_mark_unique_records_older_than_1s_to_expire(unique_types, answers, now_double)
+            cache.async_mark_unique_records_older_than_1s_to_expire(unique_types, answers, now)
 
         if updates:
             self.async_updates(now, updates)
diff --git a/src/zeroconf/_protocol/incoming.pxd b/src/zeroconf/_protocol/incoming.pxd
@@ -56,7 +56,7 @@ cdef class DNSIncoming:
     cdef cython.uint _num_authorities
     cdef cython.uint _num_additionals
     cdef public bint valid
-    cdef public object now
+    cdef public double now
     cdef public object scope_id
     cdef public object source
     cdef bint _has_qu_question

Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,7 @@ cdef class QueryHandler:`
`106`	`106`
`107`	`107`	`@cython.locals(`
`108`	`108`	`first_packet=DNSIncoming,`
	`109`	`+ ucast_source=bint,`
`109`	`110`	`out_queue=MulticastOutgoingQueue,`
`110`	`111`	`out_delay_queue=MulticastOutgoingQueue`
`111`	`112`	`)`