carpawell/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#1681] morph/netmap: Refactor reading the boolean configurations

Browse source 
`readBoolConfig` method is going to be reused for reading other
configuration values. All boolean settings are `false` by default, so it
makes sense to return default value on missing key directly from
`readBoolConfig`.

Handle `ErrConfigNotFound` case in `readBoolConfig` method. Change
`HomomorphicHashDisabled` method to call `readBoolConfig` directly.

Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
Leonard Lyubich 2022-09-19 19:03:54 +04:00 committed by fyrchik
parent f64ae55806
commit e0194dbde5
1 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
pkg/morph/client/netmap/config.go
View file

@ -116,18 +116,7 @@ func (c *Client) EigenTrustAlpha() (float64, error) {
//
// Returns (false, nil) if config key is not found in the contract.
func (c *Client) HomomorphicHashDisabled() (bool, error) {
const defaultValue = false
hashingDisabled, err := c.readBoolConfig(homomorphicHashingDisabledKey)
if err != nil {
if errors.Is(err, ErrConfigNotFound) {
return defaultValue, nil
}
return false, fmt.Errorf("(%T) could not get homomorphic hash state: %w", c, err)
}
return hashingDisabled, nil
return c.readBoolConfig(homomorphicHashingDisabledKey)
}
// InnerRingCandidateFee returns global configuration value of fee paid by
@ -172,10 +161,16 @@ func (c *Client) readStringConfig(key string) (string, error) {
return v.(string), nil
}
// reads boolean value by the given key from the NeoFS network configuration
// stored in the Sidechain. Returns false if key is not presented.
func (c *Client) readBoolConfig(key string) (bool, error) {
v, err := c.config([]byte(key), BoolAssert)
if err != nil {
return false, err
if errors.Is(err, ErrConfigNotFound) {
return false, nil
}
return false, fmt.Errorf("read boolean configuration value %s from the Sidechain: %w", key, err)
}
// BoolAssert is guaranteed to return bool if the error is nil.