fixup! [GH-659] Basic protocol version change handling.

Author: Un1oR

nil/internal/collate/syncer.go

@@ -84,8 +84,18 @@ func (s *Syncer) shardIsEmpty(ctx context.Context) (bool, error) {
 	return block == nil, nil
 }
 
-func (s *Syncer) WaitComplete() {
-	s.waitForSync.Wait()
+func (s *Syncer) WaitComplete(ctx context.Context) error {
+	c := make(chan struct{}, 1)
+	go func() {
+		defer close(c)
+		s.waitForSync.Wait()
+	}()
+	select {
+	case <-ctx.Done():
+		return ctx.Err()
+	case <-c:
+		return nil
+	}
 }
 
 func (s *Syncer) getLocalVersion(ctx context.Context) (*NodeVersion, error) {

nil/services/nilservice/service.go

@@ -314,7 +314,9 @@ func createSyncers(
 	}))
 	res.funcs = append(res.funcs, concurrent.WithSource(func(ctx context.Context) error {
 		for _, syncer := range res.syncers {
-			syncer.WaitComplete()
+			if err := syncer.WaitComplete(ctx); err != nil {
+				return err
+			}
 		}
 		return res.syncers[0].SetHandlers(ctx)
 	}))