From b6eb3db3975ca65842a2a684e31a80fe0a1a54dc Mon Sep 17 00:00:00 2001
From: Niko Storni <niko@lbry.io>
Date: Thu, 12 Jul 2018 08:28:20 -0400
Subject: [PATCH] resolve rebase conflicts

---
 ytsync.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ytsync.go b/ytsync.go
index a554288..7791dd1 100644
--- a/ytsync.go
+++ b/ytsync.go
@@ -75,7 +75,7 @@ type Sync struct {
 // IsInterrupted can be queried to discover if the sync process was interrupted manually
 func (s *Sync) IsInterrupted() bool {
 	select {
-	case <-s.stop.Ch():
+	case <-s.grp.Ch():
 		return true
 	default:
 		return false
@@ -284,7 +284,7 @@ func (s *Sync) startWorker(workerNum int) {
 							log.Println("waiting for a block and refilling addresses before retrying")
 							err = s.walletSetup()
 							if err != nil {
-								s.stop.Stop()
+								s.grp.Stop()
 								util.SendErrorToSlack("Failed to setup the wallet for a refill: %v", err)
 								break
 							}