From 13f2e68fe095bd87a81d3b7034abd716ba7caa7c Mon Sep 17 00:00:00 2001 From: ermyas Date: Fri, 4 Feb 2022 10:20:05 +1100 Subject: [PATCH] Align FinalisedEventWatcher with changes in PR#90 (#92) * Align FinalisedEventWatcher with changes in PR#90 --- .../internal/msgobserver/eth/observer/event_watcher.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/services/relayer/internal/msgobserver/eth/observer/event_watcher.go b/services/relayer/internal/msgobserver/eth/observer/event_watcher.go index dece0953..f7585c13 100644 --- a/services/relayer/internal/msgobserver/eth/observer/event_watcher.go +++ b/services/relayer/internal/msgobserver/eth/observer/event_watcher.go @@ -30,7 +30,7 @@ import ( // EventWatcher listens to blockchain events type EventWatcher interface { - Watch() + Watch() error } type EventWatcherConfig struct { @@ -111,7 +111,7 @@ type SFCCrossCallFinalisedEventWatcher struct { // Watch subscribes and starts listening to 'CrossCall' events from a given Simple Function Call contract. // Once an events receives sufficient block confirmations, it is passed to an event handler for processing. -func (l *SFCCrossCallFinalisedEventWatcher) Watch() { +func (l *SFCCrossCallFinalisedEventWatcher) Watch() error { l.nextBlockToProcess = l.Start headers := make(chan *types.Header) @@ -122,14 +122,13 @@ func (l *SFCCrossCallFinalisedEventWatcher) Watch() { for { select { case err := <-sub.Err(): - // TODO: communicate this to the calling context - logging.Error("error in log subscription %v", err) + return fmt.Errorf("error in log subscription %v", err) case latestHead := <-headers: // TODO: communicate err to the calling context l.processFinalisedEvents(latestHead) case <-l.end: logging.Info("Stop watching %v.", l.SfcContract) - return + return nil } } }