s.makhov/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Pull requests Activity

[#1461] cli: Add context to GetCurrentEpoch helper

Browse source 
Signed-off-by: Pavel Karpy <carpawell@nspcc.ru>
This commit is contained in:
Pavel Karpy 2022-06-17 10:36:23 +03:00 • committed by fyrchik
parent 51afcc1182
commit b1e54dec9f
3 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cmd/neofs-cli/internal/client/sdk.go
View file

@ -7,7 +7,6 @@ import (
"crypto/rand"
"errors"
"fmt"
"time"
"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common"
"github.com/nspcc-dev/neofs-node/pkg/network"
@ -60,7 +59,7 @@ func GetSDKClient(key *ecdsa.PrivateKey, addr network.Address) (*client.Client,
}
// GetCurrentEpoch returns current epoch.
func GetCurrentEpoch(endpoint string) (uint64, error) {
func GetCurrentEpoch(ctx context.Context, endpoint string) (uint64, error) {
var addr network.Address
if err := addr.FromString(endpoint); err != nil {
@ -77,9 +76,6 @@ func GetCurrentEpoch(endpoint string) (uint64, error) {
return 0, err
}
ctx, cancel := context.WithTimeout(context.Background(), time.Second*30)
defer cancel()
ni, err := c.NetworkInfo(ctx, client.PrmNetworkInfo{})
if err != nil {
return 0, err