@@ -268,18 +268,11 @@ func (s *Syncer) processLoop() {
268268
269269func (s * Syncer ) startSyncWorkers () {
270270 s .wg .Add (2 )
271- go s .daWorker ()
272- go s .pendingWorker ()
271+ go s .daWorkerLoop ()
272+ go s .pendingWorkerLoop ()
273273}
274274
275275func (s * Syncer ) startP2PListeners () error {
276- if s .headerStore == nil {
277- return errors .New ("header store not configured" )
278- }
279- if s .dataStore == nil {
280- return errors .New ("data store not configured" )
281- }
282-
283276 headerNotifier := s .headerStore .Notifier ()
284277 if headerNotifier == nil {
285278 return errors .New ("header notifier not configured" )
@@ -324,22 +317,15 @@ func (s *Syncer) consumeNotifierEvents(sub *syncnotifier.Subscription, expected
324317 logger .Debug ().Str ("received_type" , string (evt .Type )).Msg ("ignoring notifier event with unexpected type" )
325318 continue
326319 }
327- s .handleNotifierEvent (evt )
320+ s .logger .Debug ().Str ("event_type" , string (evt .Type )).Str ("source" , string (evt .Source )).Uint64 ("height" , evt .Height ).Msg ("received store event" )
321+ s .tryFetchFromP2P ()
328322 }
329323 }
330324}
331325
332- func (s * Syncer ) handleNotifierEvent (evt syncnotifier.Event ) {
333- s .logger .Debug ().Str ("event_type" , string (evt .Type )).Str ("source" , string (evt .Source )).Uint64 ("height" , evt .Height ).Msg ("received store event" )
334- s .tryFetchFromP2P ()
335- }
336-
337- func (s * Syncer ) daWorker () {
326+ func (s * Syncer ) daWorkerLoop () {
338327 defer s .wg .Done ()
339- s .daWorkerLoop ()
340- }
341328
342- func (s * Syncer ) daWorkerLoop () {
343329 if ! s .waitForGenesis () {
344330 return
345331 }
@@ -363,12 +349,9 @@ func (s *Syncer) daWorkerLoop() {
363349 }
364350}
365351
366- func (s * Syncer ) pendingWorker () {
352+ func (s * Syncer ) pendingWorkerLoop () {
367353 defer s .wg .Done ()
368- s .pendingWorkerLoop ()
369- }
370354
371- func (s * Syncer ) pendingWorkerLoop () {
372355 if ! s .waitForGenesis () {
373356 return
374357 }
0 commit comments