Mirroristas/planetmint-go
2
0
Fork 0
mirror of https://github.com/planetmint/planetmint-go.git synced 2025-11-26 15:35:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

add: short description to GetValidatorAddress() cases

Browse Source 
Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com>
This commit is contained in:
Lorenz Herzberger 2024-09-30 15:02:13 +02:00
parent 17541e078f
commit 2781522495
No known key found for this signature in database
GPG Key ID: FA5EE906EB55316A
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/config.go
View File

@ -82,11 +82,14 @@ func (config *Config) SetPlanetmintConfig(planetmintconfig interface{}) {
} }
func (config *Config) GetValidatorAddress() string { func (config *Config) GetValidatorAddress() string {
// Case: testing
if os.Getenv(ValAddr) != "" { if os.Getenv(ValAddr) != "" {
return os.Getenv(ValAddr) return os.Getenv(ValAddr)
} }
libConfig := lib.GetConfig() libConfig := lib.GetConfig()
// Case: No Trust Wallet connected
if libConfig.GetSerialPort() == "" { if libConfig.GetSerialPort() == "" {
defaultRecord, err := libConfig.GetDefaultValidatorRecord() defaultRecord, err := libConfig.GetDefaultValidatorRecord()
if err != nil { if err != nil {
@ -102,6 +105,7 @@ func (config *Config) GetValidatorAddress() string {
return addr.String() return addr.String()
} }
// Case: Trust Wallet connected
connector, err := trustwallet.NewTrustWalletConnector(libConfig.GetSerialPort()) connector, err := trustwallet.NewTrustWalletConnector(libConfig.GetSerialPort())
if err != nil { if err != nil {
logger.GetLogger(logger.ERROR).Error("msg", err.Error()) logger.GetLogger(logger.ERROR).Error("msg", err.Error())

6
lib/config.go
View File

@ -132,8 +132,12 @@ func (config *Config) GetSerialPort() string {
return config.serialPort 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) { 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 { if err != nil {
return nil, err return nil, err
} }

2
lib/tx.go
View File

@ -96,7 +96,7 @@ func getClientContext(fromAddress sdk.AccAddress) (clientCtx client.Context, err
codec := encodingConfig.Marshaler codec := encodingConfig.Marshaler
keyringOptions := []keyring.Option{} keyringOptions := []keyring.Option{}
keyring, err := keyring.New("lib", keyring.BackendTest, rootDir, input, codec, keyringOptions...) keyring, err := GetConfig().getLibKeyring()
if err != nil { if err != nil {
return return
} }