From 284edede4d1836053ab11940229c87b3fb3ecac3 Mon Sep 17 00:00:00 2001
From: Michael FIG <mfig@agoric.com>
Date: Mon, 15 Feb 2021 10:53:57 -0600
Subject: [PATCH] fix: don't fail if add-paths are compatible with existing
 config (#428)

* fix: don't fail if add-paths compatibly updates

* chore: fix long line lengths
---
 cmd/config.go | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 67 insertions(+), 1 deletion(-)

diff --git a/cmd/config.go b/cmd/config.go
index 8d71e1c3237..f95c5120ee8 100644
--- a/cmd/config.go
+++ b/cmd/config.go
@@ -371,9 +371,75 @@ func (c *Config) AddChain(chain *relayer.Chain) (err error) {
 	return nil
 }
 
+func checkPathConflict(pathID, fieldName, oldP, newP string) (err error) {
+	if oldP != "" && oldP != newP {
+		return fmt.Errorf(
+			"path with ID %s and conflicting %s (%s) already exists",
+			pathID, fieldName, oldP,
+		)
+	}
+	return nil
+}
+
+func checkPathEndConflict(pathID, direction string, oldPe, newPe *relayer.PathEnd) (err error) {
+	if err = checkPathConflict(
+		pathID, direction+" chain ID",
+		oldPe.ChainID, newPe.ChainID); err != nil {
+		return err
+	}
+	if err = checkPathConflict(
+		pathID, direction+" client ID",
+		oldPe.ClientID, newPe.ClientID); err != nil {
+		return err
+	}
+	if err = checkPathConflict(
+		pathID, direction+" connection ID",
+		oldPe.ConnectionID, newPe.ConnectionID); err != nil {
+		return err
+	}
+	if err = checkPathConflict(
+		pathID, direction+" port ID",
+		oldPe.PortID, newPe.PortID); err != nil {
+		return err
+	}
+	if err = checkPathConflict(
+		pathID, direction+" order",
+		strings.ToLower(oldPe.Order), strings.ToLower(newPe.Order)); err != nil {
+		return err
+	}
+	if err = checkPathConflict(
+		pathID, direction+" version",
+		oldPe.Version, newPe.Version); err != nil {
+		return err
+	}
+	if err = checkPathConflict(
+		pathID, direction+" channel ID",
+		oldPe.ChannelID, newPe.ChannelID); err != nil {
+		return err
+	}
+	return nil
+}
+
 // AddPath adds an additional path to the config
 func (c *Config) AddPath(name string, path *relayer.Path) (err error) {
-	return c.Paths.Add(name, path)
+	// Check if the path does not yet exist.
+	oldPath, err := c.Paths.Get(name)
+	if err != nil {
+		return c.Paths.Add(name, path)
+	}
+	// Now check if the update would cause any conflicts.
+	if err = checkPathEndConflict(name, "source", oldPath.Src, path.Src); err != nil {
+		return err
+	}
+	if err = checkPathEndConflict(name, "destination", oldPath.Dst, path.Dst); err != nil {
+		return err
+	}
+	if err = checkPathConflict(name, "strategy type", oldPath.Strategy.Type, path.Strategy.Type); err != nil {
+		return err
+	}
+	// Update the existing path.
+	*oldPath = *path
+	return nil
 }
 
 // DeleteChain removes a chain from the config