resolve rebase conflicts

This commit is contained in:
Niko Storni 2018-07-12 08:28:20 -04:00
parent ad8a9c3003
commit b6eb3db397

View file

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