From 2781522495dbf2f23f62c75998edad5043460b24 Mon Sep 17 00:00:00 2001 From: Lorenz Herzberger Date: Mon, 30 Sep 2024 15:02:13 +0200 Subject: [PATCH] add: short description to GetValidatorAddress() cases Signed-off-by: Lorenz Herzberger --- config/config.go | 4 ++++ lib/config.go | 6 +++++- lib/tx.go | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/config/config.go b/config/config.go index 0f39067..123a235 100644 --- a/config/config.go +++ b/config/config.go @@ -82,11 +82,14 @@ func (config *Config) SetPlanetmintConfig(planetmintconfig interface{}) { } func (config *Config) GetValidatorAddress() string { + // Case: testing if os.Getenv(ValAddr) != "" { return os.Getenv(ValAddr) } libConfig := lib.GetConfig() + + // Case: No Trust Wallet connected if libConfig.GetSerialPort() == "" { defaultRecord, err := libConfig.GetDefaultValidatorRecord() if err != nil { @@ -102,6 +105,7 @@ func (config *Config) GetValidatorAddress() string { return addr.String() } + // Case: Trust Wallet connected connector, err := trustwallet.NewTrustWalletConnector(libConfig.GetSerialPort()) if err != nil { logger.GetLogger(logger.ERROR).Error("msg", err.Error()) diff --git a/lib/config.go b/lib/config.go index 20470be..2a5fa30 100644 --- a/lib/config.go +++ b/lib/config.go @@ -132,8 +132,12 @@ func (config *Config) GetSerialPort() string { return config.serialPort } +func (config *Config) getLibKeyring() (keyring.Keyring, error) { + return keyring.New("lib", keyring.BackendTest, config.rootDir, os.Stdin, config.encodingConfig.Marshaler, []keyring.Option{}...) +} + func (config *Config) GetDefaultValidatorRecord() (*keyring.Record, error) { - keyring, err := keyring.New("lib", keyring.BackendTest, config.rootDir, os.Stdin, config.encodingConfig.Marshaler, []keyring.Option{}...) + keyring, err := config.getLibKeyring() if err != nil { return nil, err } diff --git a/lib/tx.go b/lib/tx.go index 32d2574..daa31b0 100644 --- a/lib/tx.go +++ b/lib/tx.go @@ -96,7 +96,7 @@ func getClientContext(fromAddress sdk.AccAddress) (clientCtx client.Context, err codec := encodingConfig.Marshaler keyringOptions := []keyring.Option{} - keyring, err := keyring.New("lib", keyring.BackendTest, rootDir, input, codec, keyringOptions...) + keyring, err := GetConfig().getLibKeyring() if err != nil { return }