resolve rebase conflicts
This commit is contained in:
parent
ad8a9c3003
commit
b6eb3db397
1 changed files with 2 additions and 2 deletions
|
@ -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
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue