feat: refactor runtime struct

cmd/convert/helpers.go

@@ -14,62 +14,27 @@ func newConvertRuntime() (*ConvertRuntime, error) {
 	cr := &utils.ConvertRuntime{}
 	var err error
 
-	utils.LogConvert.Debug().Msg("validating input wallet")
+	utils.LogConvert.Debug().Msg("getting input wallet paths")
 	var inputW utils.W
 	err = viper.UnmarshalKey("input", &inputW)
 	if err != nil {
 		return nil, err
 	}
 
-	err = inputW.Validate()
-	if err != nil {
-		return nil, err
-	}
-
-	utils.LogConvert.Debug().Msg("validating output field")
+	utils.LogConvert.Debug().Msg("getting output wallet paths")
 	var outputW utils.W
 	err = viper.UnmarshalKey("output", &outputW)
 	if err != nil {
 		return nil, err
 	}
 
-	err = outputW.Validate()
-	if err != nil {
-		return nil, err
-	}
-
-	cr.ctx = context.Background()
-	cr.dWalletsPath = dWalletConfig.Path
-	cr.ndWalletsPath = ndWalletConfig.Path
-	utils.LogCombine.Debug().Msgf("getting input passwords form file %s", dWalletConfig.Passphrases)
-	cr.passphrasesIn, err = utils.GetAccountsPasswords(dWalletConfig.Passphrases)
-	if err != nil {
-		return nil, err
-	}
-	utils.LogCombine.Debug().Msgf("getting output passwords form file %s", ndWalletConfig.Passphrases)
-	cr.passphrasesOut, err = utils.GetAccountsPasswords(ndWalletConfig.Passphrases)
-	if err != nil {
-		return nil, err
-	}
-	cr.accountDatas = make(map[string]AccountExtends)
-	utils.LogCombine.Debug().Msgf("loading stores form %s", cr.dWalletsPath)
-	cr.stores, err = utils.LoadStores(cr.ctx, cr.dWalletsPath, cr.passphrasesIn)
-	if err != nil {
-		return nil, err
-	}
-
-	cr.peers = dWalletConfig.Peers
+	cr.InputW = inputW
+	cr.OutputW = outputW
+	cr.Ctx = context.Background()
 
 	return cr, nil
 }
 
-func (cr *utils.ConvertRuntime) validate() error {
-	if cr.dWalletsPath == cr.ndWalletsPath {
-		return utils.ErrorSameDirs
-	}
-	return nil
-}
-
 func (cr *CombineRuntime) createWalletAndStore() error {
 	var err error
 	utils.LogCombine.Debug().Msgf("creating store %s", cr.ndWalletsPath)

config.yaml

@@ -2,13 +2,15 @@ input:
   type: distributed
   path: DISTRIBUTED_WALLETS
   passphrases: ./passphrases.txt
-  threshold: 2
-  peers:
-    10: old1:9091
-    20: old2:9091
-    30: old3:9091
+  opts:
+    threshold: 2
+    peers:
+      10: old1:9091
+      20: old2:9091
+      30: old3:9091
 output:
   type: nd
   path: ND_WALLETS
   passphrases: ./passphrases.txt
 log-level: debug
+

utils/config.go

@@ -2,6 +2,7 @@ package utils
 
 import (
 	"bytes"
+	"context"
 	"os"
 
 	"github.com/pkg/errors"
@@ -20,6 +21,60 @@ type DWalletConfig struct {
 	WalletName  string
 }
 
+type W struct {
+	Path        string
+	Type        string
+	Passphrases string
+}
+
+type ConvertRuntime struct {
+	Ctx     context.Context
+	InputW  W
+	OutputW W
+}
+
+func (W *W) wValidate() error {
+	if W.Path == "" {
+		return ErrorPathField
+	}
+
+	if W.Type == "" {
+		return ErrorEmptyType
+	}
+
+	if len(W.Passphrases) == 0 {
+		return ErrorPassphraseEmpty
+	}
+
+	return nil
+
+}
+
+func (CR *ConvertRuntime) Validate() error {
+	LogConvert.Debug().Msg("validating input wallet")
+	CR.InputW.wValidate()
+	if CR.InputW.Passphrases == "" {
+		return ErrorInputPassphrasesIsEmpty
+	}
+
+	LogConvert.Debug().Msg("validating output wallet")
+	CR.OutputW.wValidate()
+	if CR.OutputW.Passphrases == "" {
+		return ErrorOutputPassphrasesIsEmpty
+	}
+
+	LogConvert.Debug().Msg("validating types for both wallets")
+	if CR.InputW.Type != CR.OutputW.Type {
+		return ErrorSameWalletType
+	}
+
+	LogConvert.Debug().Msg("validating dirs for both wallets")
+	if CR.OutputW.Path != CR.OutputW.Path {
+		return ErrorSameDirs
+	}
+
+	return nil
+}
 func GetAccountsPasswords(path string) ([][]byte, error) {
 
 	content, err := os.ReadFile(path)