Merge PR #211: UX-fixes

cmd/flags.go

@@ -133,7 +133,7 @@ func timeoutFlag(cmd *cobra.Command) *cobra.Command {
 }
 
 func forceFlag(cmd *cobra.Command) *cobra.Command {
-	cmd.Flags().BoolP(flagForce, "f", false, "option to force initialization of lite client from configured chain")
+	cmd.Flags().BoolP(flagForce, "f", false, "option to force non-standard behavior such as initialization of lite client from configured chain or generation of new path")
 	if err := viper.BindPFlag(flagForce, cmd.Flags().Lookup(flagForce)); err != nil {
 		panic(err)
 	}

cmd/paths.go

@@ -80,7 +80,7 @@ func pathsGenCmd() *cobra.Command {
 
 			unordered, err := cmd.Flags().GetBool(flagOrder)
 			if err != nil {
-				return nil
+				return err
 			}
 
 			if unordered {
@@ -91,6 +91,24 @@ func pathsGenCmd() *cobra.Command {
 				path.Dst.Order = "ORDERED"
 			}
 
+			force, err := cmd.Flags().GetBool(flagForce)
+			if err != nil {
+				return err
+			}
+
+			if force {
+				path.Dst.ClientID = relayer.RandLowerCaseLetterString(10)
+				path.Src.ClientID = relayer.RandLowerCaseLetterString(10)
+				path.Src.ConnectionID = relayer.RandLowerCaseLetterString(10)
+				path.Dst.ConnectionID = relayer.RandLowerCaseLetterString(10)
+				path.Src.ChannelID = relayer.RandLowerCaseLetterString(10)
+				path.Dst.ChannelID = relayer.RandLowerCaseLetterString(10)
+				if err = config.Paths.AddForce(args[4], path); err != nil {
+					return err
+				}
+				return overWriteConfig(cmd, config)
+			}
+
 			srcClients, err := c[src].QueryClients(1, 1000)
 			if err != nil {
 				return err
@@ -265,7 +283,7 @@ func pathsGenCmd() *cobra.Command {
 			}
 		},
 	}
-	return orderFlag(cmd)
+	return forceFlag(orderFlag(cmd))
 }
 
 func pathsDeleteCmd() *cobra.Command {
@@ -601,9 +619,11 @@ func userInputPathAdd(src, dst, name string) (*Config, error) {
 			Strategy: relayer.NewNaiveStrategy(),
 			Src: &relayer.PathEnd{
 				ChainID: src,
+				Order:   "ORDERED",
 			},
 			Dst: &relayer.PathEnd{
 				ChainID: dst,
+				Order:   "ORDERED",
 			},
 		}
 	)

dev-env

@@ -2,7 +2,7 @@
 
 RELAYER_DIR="$GOPATH/src/github.com/iqlusioninc/relayer"
 RELAYER_CONF="$HOME/.relayer"
-GAIA_CONF="$RELAYER_DIR/data"
+GAIA_CONF="$(pwd)/data"
 
 # Ensure user understands what will be deleted
 if ([[ -d $RELAYER_CONF ]] || [[ -d $GAIA_CONF ]]) && [[ ! "$1" == "skip" ]]; then
@@ -15,8 +15,7 @@ fi
 
 cd $RELAYER_DIR
 rm -rf $RELAYER_CONF &> /dev/null
-bash scripts/three-chainz "local" "skip"
-bash scripts/config-three "skip"
+./scripts/two-chainz "local" "skip"
+./scripts/config-relayer "skip"
 sleep 2
 rly tx link demo -o 3s
-rly tx link demo2 -o 3s -d

relayer/client-tx.go

@@ -18,6 +18,7 @@ func (src *Chain) CreateClients(dst *Chain) (err error) {
 	} else if srcCs == nil {
 		dstH, err := dst.UpdateLiteWithHeader()
 		if err != nil {
+			// fmt.Println("Herere")
 			return err
 		}
 		if src.debug {

relayer/path.go

@@ -57,6 +57,18 @@ func (p Paths) Add(name string, path *Path) error {
 	return nil
 }
 
+// AddForce ignores existing paths and overwrites an existing path with that name
+func (p Paths) AddForce(name string, path *Path) error {
+	if err := path.Validate(); err != nil {
+		return err
+	}
+	if _, found := p[name]; found {
+		fmt.Printf("overwriting path %s with new path...\n", name)
+	}
+	p[name] = path
+	return nil
+}
+
 // MustYAML returns the yaml string representation of the Path
 func (p *Path) MustYAML() string {
 	out, err := yaml.Marshal(p)