status-im
/
status-go
mirror of https://github.com/status-im/status-go.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: code climate warnings

This commit is contained in:
Richard Ramos 2022-02-27 11:23:07 -04:00
parent 1e29948a3d
commit d21b89ccc6
1 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
api/geth_backend.go
View File

@ -271,20 +271,7 @@ func (b *GethStatusBackend) ensureAppDBOpened(account multiaccounts.Account, pas
return nil return nil
} }
// StartNodeWithKey instead of loading addresses from database this method derives address from key func (b *GethStatusBackend) setupLogSettings() error {
// and uses it in application.
// TODO: we should use a proper struct with optional values instead of duplicating the regular functions
// with small variants for keycard, this created too many bugs
func (b *GethStatusBackend) startNodeWithKey(acc multiaccounts.Account, password string, keyHex string) error {
err := b.ensureAppDBOpened(acc, password)
if err != nil {
return err
}
if b.loadNodeConfig(nil) != nil {
return err
}
logSettings := logutils.LogSettings{ logSettings := logutils.LogSettings{
Enabled: b.config.LogEnabled, Enabled: b.config.LogEnabled,
MobileSystem: b.config.LogMobileSystem, MobileSystem: b.config.LogMobileSystem,
@ -297,6 +284,28 @@ func (b *GethStatusBackend) startNodeWithKey(acc multiaccounts.Account, password
if err := logutils.OverrideRootLogWithConfig(logSettings, false); err != nil { if err := logutils.OverrideRootLogWithConfig(logSettings, false); err != nil {
return err return err
} }
return nil
}
// StartNodeWithKey instead of loading addresses from database this method derives address from key
// and uses it in application.
// TODO: we should use a proper struct with optional values instead of duplicating the regular functions
// with small variants for keycard, this created too many bugs
func (b *GethStatusBackend) startNodeWithKey(acc multiaccounts.Account, password string, keyHex string) error {
err := b.ensureAppDBOpened(acc, password)
if err != nil {
return err
}
err = b.loadNodeConfig(nil)
if err != nil {
return err
}
err = b.setupLogSettings()
if err != nil {
return err
}
b.account = &acc b.account = &acc
accountsDB, err := accounts.NewDB(b.appDB) accountsDB, err := accounts.NewDB(b.appDB)
@ -372,18 +381,11 @@ func (b *GethStatusBackend) startNodeWithAccount(acc multiaccounts.Account, pass
return err return err
} }
logSettings := logutils.LogSettings{ err = b.setupLogSettings()
Enabled: b.config.LogEnabled, if err != nil {
MobileSystem: b.config.LogMobileSystem,
Level: b.config.LogLevel,
File: b.config.LogFile,
MaxSize: b.config.LogMaxSize,
MaxBackups: b.config.LogMaxBackups,
CompressRotated: b.config.LogCompressRotated,
}
if err := logutils.OverrideRootLogWithConfig(logSettings, false); err != nil {
return err return err
} }
b.account = &acc b.account = &acc
accountsDB, err := accounts.NewDB(b.appDB) accountsDB, err := accounts.NewDB(b.appDB)
if err != nil { if err != nil {