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

[#658] morph/neofs: Add TryNotary() option

Browse source 
Signed-off-by: Alex Vanin <alexey@nspcc.ru>
This commit is contained in:
Alex Vanin 2021-07-01 20:00:47 +03:00 committed by Alex Vanin
parent c0093b2b79
commit c90f054f35
2 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/innerring/innerring.go
View file

@ -423,7 +423,7 @@ func New(ctx context.Context, log *zap.Logger, cfg *viper.Viper) (*Server, error
} }
neofsClient, err := neofsWrapper.NewFromMorph(server.mainnetClient, server.contracts.neofs, neofsClient, err := neofsWrapper.NewFromMorph(server.mainnetClient, server.contracts.neofs,
server.feeConfig.MainChainFee()) server.feeConfig.MainChainFee(), neofsWrapper.TryNotary())
if err != nil { if err != nil {
return nil, err return nil, err
} }

28
pkg/morph/client/neofs/wrapper/client.go
View file

@ -16,9 +16,33 @@ import (
// Working ClientWrapper must be created via NewFromMorph. // Working ClientWrapper must be created via NewFromMorph.
type ClientWrapper neofscontract.Client type ClientWrapper neofscontract.Client
// Option allows to set an optional
// parameter of ClientWrapper.
type Option func(*opts)
type opts []client.StaticClientOption
func defaultOpts() *opts {
return new(opts)
}
// TryNotary returns option to enable
// notary invocation tries.
func TryNotary() Option {
return func(o *opts) {
*o = append(*o, client.TryNotary())
}
}
// NewFromMorph wraps client to work with NeoFS contract. // NewFromMorph wraps client to work with NeoFS contract.
func NewFromMorph(cli *client.Client, contract util.Uint160, fee fixedn.Fixed8) (*ClientWrapper, error) { func NewFromMorph(cli *client.Client, contract util.Uint160, fee fixedn.Fixed8, opts ...Option) (*ClientWrapper, error) {
sc, err := client.NewStatic(cli, contract, fee, client.TryNotary()) o := defaultOpts()
for i := range opts {
opts[i](o)
}
sc, err := client.NewStatic(cli, contract, fee, ([]client.StaticClientOption)(*o)...)
if err != nil { if err != nil {
return nil, fmt.Errorf("could not create client of NeoFS contract: %w", err) return nil, fmt.Errorf("could not create client of NeoFS contract: %w", err)
} }