🔀 Merge branch 'fix/watcher-return' into 'dev'

matthiasgeihs · matthiasgeihs · commit cf9279c99f73 · 2021-02-18T15:18:49.000Z
[client] Ensure that the watcher returns.

See merge request perun/go-perun!397
diff --git a/client/watch.go b/client/watch.go
@@ -77,8 +77,9 @@ func (c *Channel) Watch(h AdjudicatorEventHandler) error {
 		go h.HandleAdjudicatorEvent(e)
 	}
 
-	log.Debugf("Subscription closed: %v", sub.Err())
-	return errors.WithMessage(sub.Err(), "subscription closed")
+	err = sub.Err()
+	log.Debugf("Subscription closed: %v", err)
+	return errors.WithMessage(err, "subscription closed")
 }
 
 // Register registers the channel on the adjudicator.

Original file line number	Diff line number	Diff line change
`@@ -77,8 +77,9 @@ func (c *Channel) Watch(h AdjudicatorEventHandler) error {`
`77`	`77`	`go h.HandleAdjudicatorEvent(e)`
`78`	`78`	`}`
`79`	`79`
`80`		`- log.Debugf("Subscription closed: %v", sub.Err())`
`81`		`- return errors.WithMessage(sub.Err(), "subscription closed")`
	`80`	`+ err = sub.Err()`
	`81`	`+ log.Debugf("Subscription closed: %v", err)`
	`82`	`+ return errors.WithMessage(err, "subscription closed")`
`82`	`83`	`}`
`83`	`84`
`84`	`85`	`// Register registers the channel on the adjudicator.`