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

[#941] morph/notary: Delete useless "low till" check

Browse source 
Signed-off-by: Pavel Karpy <carpawell@nspcc.ru>
This commit is contained in:
Pavel Karpy 2021-10-22 17:42:28 +03:00 committed by Alex Vanin
parent 78aab096fb
commit 8956f015fc
1 changed files with 1 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
pkg/morph/client/notary.go
View file

@ -197,17 +197,9 @@ func (c *Client) DepositNotary(amount fixedn.Fixed8, delta uint32) (res util.Uin
nil, nil,
) )
if err != nil { if err != nil {
if !tillShouldNotBeLessError(err) {
return util.Uint256{}, fmt.Errorf("can't make notary deposit: %w", err) return util.Uint256{}, fmt.Errorf("can't make notary deposit: %w", err)
} }
c.logger.Debug("notary deposit invoke failed due to low `till` value",
zap.Int64("amount", int64(amount)),
zap.Uint32("till", bc+delta))
return util.Uint256{}, nil
}
c.logger.Debug("notary deposit invoke", c.logger.Debug("notary deposit invoke",
zap.Int64("amount", int64(amount)), zap.Int64("amount", int64(amount)),
zap.Int64("expire_at", till), zap.Int64("expire_at", till),
@ -753,19 +745,6 @@ func alreadyOnChainError(err error) bool {
return strings.Contains(err.Error(), alreadyOnChainErrorMessage) return strings.Contains(err.Error(), alreadyOnChainErrorMessage)
} }
// Neo RPC node can return "`till` shouldn't be less then the
// previous value <>" message. This error is expected and ignored.
// This happens because previous `till` value could be bigger
// than the current one due to significant epoch duration decrease.
// Theoretically, balance should not run out so fast and such
// errors are ignored(at least for now; there is #910 issue
// for it).
func tillShouldNotBeLessError(err error) bool {
const tillTooLowErrorMessage = "less then the previous value"
return strings.Contains(err.Error(), tillTooLowErrorMessage)
}
// CalculateNotaryDepositAmount calculates notary deposit amount // CalculateNotaryDepositAmount calculates notary deposit amount
// using the rule: // using the rule:
// IF notaryBalance < gasBalance * gasMul { // IF notaryBalance < gasBalance * gasMul {