Skip to content

Commit c8144e5

Browse files
committed
Use the new ignore_duplicates in register_tasks
1 parent 1078335 commit c8144e5

File tree

1 file changed

+3
-19
lines changed

1 file changed

+3
-19
lines changed

trinity/sync/common/headers.py

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -662,13 +662,7 @@ async def _fetch_segment(
662662
return tuple()
663663
else:
664664
# stitch headers together in order, ignoring duplicates
665-
try:
666-
self._stitcher.register_tasks(headers)
667-
except DuplicateTasks as exc:
668-
non_duplicate_headers = tuple(h for h in headers if h not in exc.duplicates)
669-
if len(non_duplicate_headers):
670-
self._stitcher.register_tasks(non_duplicate_headers)
671-
665+
self._stitcher.register_tasks(headers, ignore_duplicates=True)
672666
return headers
673667

674668
async def _request_headers(
@@ -816,21 +810,11 @@ async def _full_skeleton_sync(self, skeleton_syncer: SkeletonSyncer[TChainPeer])
816810
# the first header of this segment was already registered: no problem, carry on
817811
pass
818812

819-
try:
820-
self._stitcher.register_tasks(first_segment)
821-
except DuplicateTasks as exc:
822-
non_duplicate_headers = tuple(h for h in first_segment if h not in exc.duplicates)
823-
if len(non_duplicate_headers):
824-
self._stitcher.register_tasks(non_duplicate_headers)
813+
self._stitcher.register_tasks(first_segment, ignore_duplicates=True)
825814

826815
previous_segment = first_segment
827816
async for segment in self.wait_iter(skeleton_generator):
828-
try:
829-
self._stitcher.register_tasks(segment)
830-
except DuplicateTasks as exc:
831-
non_duplicate_headers = tuple(h for h in segment if h not in exc.duplicates)
832-
if len(non_duplicate_headers):
833-
self._stitcher.register_tasks(non_duplicate_headers)
817+
self._stitcher.register_tasks(segment, ignore_duplicates=True)
834818

835819
gap_length = segment[0].block_number - previous_segment[-1].block_number - 1
836820
if gap_length > MAX_HEADERS_FETCH:

0 commit comments

Comments
 (0)