fix core.ConfigI to allow to update the "order" and "version" fields

Signed-off-by: Masanori Yoshida <[email protected]>

config/core.go

@@ -19,31 +19,37 @@ func initCoreConfig(c *Config) {
 	core.SetCoreConfig(config)
 }
 
-func (c CoreConfig) UpdateConfigID(pathName string, chainID string, configID core.ConfigIDType, id string) error {
+func (c CoreConfig) UpdatePathConfig(pathName string, chainID string, kv map[core.PathConfigKey]string) error {
 	configPath, err := c.config.Paths.Get(pathName)
 	if err != nil {
 		return err
 	}
+
 	var pathEnd *core.PathEnd
 	if chainID == configPath.Src.ChainID {
 		pathEnd = configPath.Src
-	}
-	if chainID == configPath.Dst.ChainID {
+	} else if chainID == configPath.Dst.ChainID {
 		pathEnd = configPath.Dst
-	}
-	if pathEnd == nil {
+	} else {
 		return fmt.Errorf("pathEnd is nil")
 	}
-	switch configID {
-	case core.ConfigIDClient:
-		pathEnd.ClientID = id
-	case core.ConfigIDConnection:
-		pathEnd.ConnectionID = id
-	case core.ConfigIDChannel:
-		pathEnd.ChannelID = id
-	}
-	if err := c.config.OverWriteConfig(); err != nil {
-		return err
+
+	for k, v := range kv {
+		switch k {
+		case core.PathConfigClientID:
+			pathEnd.ClientID = v
+		case core.PathConfigConnectionID:
+			pathEnd.ConnectionID = v
+		case core.PathConfigChannelID:
+			pathEnd.ChannelID = v
+		case core.PathConfigOrder:
+			pathEnd.Order = v
+		case core.PathConfigVersion:
+			pathEnd.Version = v
+		default:
+			panic(fmt.Sprintf("unexpected path config key: %s", k))
+		}
 	}
-	return nil
+
+	return c.config.OverWriteConfig()
 }

core/config.go

@@ -13,16 +13,18 @@ import (
 
 var config ConfigI
 
-type ConfigIDType string
+type PathConfigKey string
 
 const (
-	ConfigIDClient     ConfigIDType = "client"
-	ConfigIDConnection ConfigIDType = "connection"
-	ConfigIDChannel    ConfigIDType = "channel"
+	PathConfigClientID     PathConfigKey = "client-id"
+	PathConfigConnectionID PathConfigKey = "connection-id"
+	PathConfigChannelID    PathConfigKey = "channel-id"
+	PathConfigOrder        PathConfigKey = "order"
+	PathConfigVersion      PathConfigKey = "version"
 )
 
 type ConfigI interface {
-	UpdateConfigID(pathName string, chainID string, configID ConfigIDType, id string) error
+	UpdatePathConfig(pathName string, chainID string, kv map[PathConfigKey]string) error
 }
 
 func SetCoreConfig(c ConfigI) {
@@ -156,23 +158,21 @@ func SyncChainConfigFromEvents(pathName string, msgIDs []MsgID, chain *ProvableC
 		}
 
 		for _, event := range msgRes.Events() {
-			var id string
-			var configID ConfigIDType
+			kv := make(map[PathConfigKey]string)
+
 			switch event := event.(type) {
 			case *EventGenerateClientIdentifier:
-				configID = ConfigIDClient
-				id = event.ID
+				kv[PathConfigClientID] = event.ID
 			case *EventGenerateConnectionIdentifier:
-				configID = ConfigIDConnection
-				id = event.ID
+				kv[PathConfigConnectionID] = event.ID
 			case *EventGenerateChannelIdentifier:
-				configID = ConfigIDChannel
-				id = event.ID
+				kv[PathConfigChannelID] = event.ID
+			default:
+				continue
 			}
-			if id != "" {
-				if err := config.UpdateConfigID(pathName, chain.ChainID(), configID, id); err != nil {
-					return err
-				}
+
+			if err := config.UpdatePathConfig(pathName, chain.ChainID(), kv); err != nil {
+				return err
 			}
 		}
 	}