realloc/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Releases Packages Activity

[#746] morph/client: Distinguish between neo-go errors and NeoFS logic

Browse source 
Implement `error` interface on new `neofsError` type which is a wrapper over
NeoFS-specific error. Wrap all `Client` errors except neo-go client API ones
into `neofsError`. Wrapped errors are going to be used for multi-endpoint
loop control.

Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
Leonard Lyubich 2021-08-31 13:16:25 +03:00 • committed by Alex Vanin
parent 85bd2a1cdf
commit 3b7e884e74
2 changed files with 38 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -196,12 +196,12 @@ func (c *Client) GetNotaryDeposit() (res int64, err error) {
}
if len(items) != 1 {
return 0, fmt.Errorf("%v: %w", notaryBalanceErrMsg, errUnexpectedItems)
return 0, wrapNeoFSError(fmt.Errorf("%v: %w", notaryBalanceErrMsg, errUnexpectedItems))
}
bigIntDeposit, err := items[0].TryInteger()
if err != nil {
return 0, fmt.Errorf("%v: %w", notaryBalanceErrMsg, err)
return 0, wrapNeoFSError(fmt.Errorf("%v: %w", notaryBalanceErrMsg, err))
}
return bigIntDeposit.Int64(), nil
@ -307,12 +307,12 @@ func (c *Client) notaryInvoke(committee bool, contract util.Uint160, method stri
// check invocation state
if test.State != HaltState {
return &notHaltStateError{state: test.State, exception: test.FaultException}
return wrapNeoFSError(&notHaltStateError{state: test.State, exception: test.FaultException})
}
// if test invocation failed, then return error
if len(test.Script) == 0 {
return errEmptyInvocationScript
return wrapNeoFSError(errEmptyInvocationScript)
}
// after test invocation we build main multisig transaction
@ -394,7 +394,8 @@ func (c *Client) notaryCosigners(ir []*keys.PublicKey, committee bool) ([]transa
multisigScript, err := sc.CreateMultiSigRedeemScript(m, ir)
if err != nil {
return nil, fmt.Errorf("can't create ir multisig redeem script: %w", err)
// wrap error as NeoFS-specific since the call is not related to any client
return nil, wrapNeoFSError(fmt.Errorf("can't create ir multisig redeem script: %w", err))
}
s = append(s, transaction.Signer{
@ -480,7 +481,8 @@ func (c *Client) notaryMultisigAccount(ir []*keys.PublicKey, committee bool) (*w
err := multisigAccount.ConvertMultisig(m, ir)
if err != nil {
return nil, fmt.Errorf("can't make inner ring multisig wallet: %w", err)
// wrap error as NeoFS-specific since the call is not related to any client
return nil, wrapNeoFSError(fmt.Errorf("can't make inner ring multisig wallet: %w", err))
}
return multisigAccount, nil