potyarkin/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Pull requests Activity

[#950] cli: Refactor usage of NeoFS API client

Browse source 
The client needs of the CLI application are limited and change not often.
Interface changes of the client library should not affect the operation of
various application packages, if they do not change their requirements for
the provided functionality. To localize the use of the base client and
facilitate further support, an auxiliary package is implemented that will
only be used by the CLI application.

Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
Leonard Lyubich 2021-10-28 17:48:46 +03:00 • committed by LeL
parent a3414b36dd
commit bbc2b873ab
9 changed files with 1098 additions and 403 deletions
Download patch file Download diff file Expand all files Collapse all files

32
cmd/neofs-cli/modules/netmap.go
View file

@ -1,13 +1,13 @@
package cmd
import (
"context"
"encoding/hex"
"time"
"github.com/mr-tron/base58"
"github.com/nspcc-dev/neo-go/pkg/config/netmode"
"github.com/nspcc-dev/neofs-api-go/pkg/netmap"
internalclient "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/client"
"github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap/wrapper"
"github.com/nspcc-dev/neofs-node/pkg/services/control"
"github.com/spf13/cobra"
@ -61,15 +61,15 @@ var getEpochCmd = &cobra.Command{
Short: "Get current epoch number",
Long: "Get current epoch number",
Run: func(cmd *cobra.Command, args []string) {
key, err := getKey()
exitOnErr(cmd, err)
var prm internalclient.NetworkInfoPrm
cli, err := getSDKClient(key)
exitOnErr(cmd, err)
prepareAPIClient(cmd, &prm)
netInfo, err := cli.NetworkInfo(context.Background(), globalCallOptions()...)
res, err := internalclient.NetworkInfo(prm)
exitOnErr(cmd, errf("rpc error: %w", err))
netInfo := res.NetworkInfo()
cmd.Println(netInfo.CurrentEpoch())
},
}
@ -79,16 +79,14 @@ var localNodeInfoCmd = &cobra.Command{
Short: "Get local node info",
Long: `Get local node info`,
Run: func(cmd *cobra.Command, args []string) {
key, err := getKey()
exitOnErr(cmd, err)
var prm internalclient.NodeInfoPrm
cli, err := getSDKClient(key)
exitOnErr(cmd, err)
prepareAPIClient(cmd, &prm)
nodeInfo, err := cli.EndpointInfo(context.Background(), globalCallOptions()...)
res, err := internalclient.NodeInfo(prm)
exitOnErr(cmd, errf("rpc error: %w", err))
prettyPrintNodeInfo(cmd, nodeInfo.NodeInfo(), nodeInfoJSON)
prettyPrintNodeInfo(cmd, res.NodeInfo(), nodeInfoJSON)
},
}
@ -153,15 +151,15 @@ var netInfoCmd = &cobra.Command{
Short: "Get information about NeoFS network",
Long: "Get information about NeoFS network",
Run: func(cmd *cobra.Command, args []string) {
key, err := getKey()
exitOnErr(cmd, err)
var prm internalclient.NetworkInfoPrm
cli, err := getSDKClient(key)
exitOnErr(cmd, err)
prepareAPIClient(cmd, &prm)
netInfo, err := cli.NetworkInfo(context.Background(), globalCallOptions()...)
res, err := internalclient.NetworkInfo(prm)
exitOnErr(cmd, errf("rpc error: %w", err))
netInfo := res.NetworkInfo()
cmd.Printf("Epoch: %d\n", netInfo.CurrentEpoch())
magic := netInfo.MagicNumber()