Merge branch 'release/0.4.0' into feat/solana-support

renproject · Apr 20, 2021 · e164908 · e164908
2 parents 4d98cf7 + 4de37e8
commit e164908
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/watcher/watcher.go b/watcher/watcher.go
@@ -87,10 +87,12 @@ func (fetcher EthBurnLogFetcher) FetchBurnLogs(ctx context.Context, from uint64,
 				}
 
 				// Send the burn transaction to the resolver.
-				resultChan <- BurnLogResult{Result: result}
 				select {
 				case <-ctx.Done():
+					resultChan <- BurnLogResult{Error: ctx.Err()}
 					return
+				default:
+					resultChan <- BurnLogResult{Result: result}
 				}
 			}
 		}()