From 90be92d53f1cd1d86d7120e176b0b8e7cf2691d4 Mon Sep 17 00:00:00 2001
From: Mark Rushakoff <mark.rushakoff@gmail.com>
Date: Wed, 23 Mar 2022 10:50:46 -0400
Subject: [PATCH] Fix data race during rly paths list

There was one error that was being concurrently assigned during several
goroutines, so use distinct error values with narrow scoping instead.
---
 relayer/path.go | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/relayer/path.go b/relayer/path.go
index 06c0aeb76..3ebdffaed 100644
--- a/relayer/path.go
+++ b/relayer/path.go
@@ -170,7 +170,6 @@ type PathWithStatus struct {
 // the current status of the path
 func (p *Path) QueryPathStatus(ctx context.Context, src, dst *Chain) *PathWithStatus {
 	var (
-		err              error
 		eg               errgroup.Group
 		srch, dsth       int64
 		srcCs, dstCs     *clienttypes.QueryClientStateResponse
@@ -179,46 +178,52 @@ func (p *Path) QueryPathStatus(ctx context.Context, src, dst *Chain) *PathWithSt
 		out = &PathWithStatus{Path: p, Status: PathStatus{false, false, false}}
 	)
 	eg.Go(func() error {
+		var err error
 		srch, err = src.ChainProvider.QueryLatestHeight(ctx)
 		return err
 	})
 	eg.Go(func() error {
+		var err error
 		dsth, err = dst.ChainProvider.QueryLatestHeight(ctx)
 		return err
 	})
-	if err = eg.Wait(); err != nil {
+	if err := eg.Wait(); err != nil {
 		return out
 	}
 	out.Status.Chains = true
-	if err = src.SetPath(p.Src); err != nil {
+	if err := src.SetPath(p.Src); err != nil {
 		return out
 	}
-	if err = dst.SetPath(p.Dst); err != nil {
+	if err := dst.SetPath(p.Dst); err != nil {
 		return out
 	}
 
 	eg.Go(func() error {
+		var err error
 		srcCs, err = src.ChainProvider.QueryClientStateResponse(srch, src.ClientID())
 		return err
 	})
 	eg.Go(func() error {
+		var err error
 		dstCs, err = dst.ChainProvider.QueryClientStateResponse(dsth, dst.ClientID())
 		return err
 	})
-	if err = eg.Wait(); err != nil || srcCs == nil || dstCs == nil {
+	if err := eg.Wait(); err != nil || srcCs == nil || dstCs == nil {
 		return out
 	}
 	out.Status.Clients = true
 
 	eg.Go(func() error {
+		var err error
 		srcConn, err = src.ChainProvider.QueryConnection(srch, src.ConnectionID())
 		return err
 	})
 	eg.Go(func() error {
+		var err error
 		dstConn, err = dst.ChainProvider.QueryConnection(dsth, dst.ConnectionID())
 		return err
 	})
-	if err = eg.Wait(); err != nil || srcConn.Connection.State != conntypes.OPEN ||
+	if err := eg.Wait(); err != nil || srcConn.Connection.State != conntypes.OPEN ||
 		dstConn.Connection.State != conntypes.OPEN {
 		return out
 	}