TrueCloudLab
/
frostfs-node
19
1
Fork 21
Code Issues 86 Pull Requests 7 Actions Releases Activity

[#1959] neofs-adm: Add tests for more commands 

Also, fix `restore-containers`, but it is hard to test it now.

Signed-off-by: Evgenii Stratonikov <evgeniy@morphbits.ru>
remotes/fyrchik/fix-error-counter
Evgenii Stratonikov 2022-10-24 15:49:13 +03:00 committed by fyrchik
parent 7c3ac7150d
commit 6c9423cfb0
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/neofs-adm/internal/modules/morph/container.go
View File

@ -114,6 +114,7 @@ func restoreContainers(cmd *cobra.Command, _ []string) error {
if err != nil {
return err
}
defer wCtx.close()
nnsCs, err := wCtx.Client.GetContractStateByID(1)
if err != nil {
@ -179,7 +180,7 @@ func restoreContainers(cmd *cobra.Command, _ []string) error {
panic(bw.Err)
}
if err := wCtx.sendCommitteeTx(bw.Bytes(), true); err != nil {
if err := wCtx.sendConsensusTx(bw.Bytes()); err != nil {
return err
}
}

11
cmd/neofs-adm/internal/modules/morph/initialize_test.go
View File

@ -8,6 +8,7 @@ import (
"testing"
"github.com/nspcc-dev/neo-go/pkg/config"
"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
"github.com/nspcc-dev/neo-go/pkg/vm"
"github.com/nspcc-dev/neo-go/pkg/wallet"
"github.com/nspcc-dev/neofs-node/pkg/innerring"
@ -57,6 +58,16 @@ func testInitialize(t *testing.T, committeeSize int) {
t.Run("set-config", func(t *testing.T) {
require.NoError(t, setConfigCmd(setConfig, []string{"MaintenanceModeAllowed=true"}))
})
t.Run("set-policy", func(t *testing.T) {
require.NoError(t, setPolicyCmd(setPolicy, []string{"ExecFeeFactor=1"}))
})
t.Run("remove-node", func(t *testing.T) {
pk, err := keys.NewPrivateKey()
require.NoError(t, err)
pub := hex.EncodeToString(pk.PublicKey().Bytes())
require.NoError(t, removeNodesCmd(removeNodes, []string{pub}))
})
}
func generateTestData(t *testing.T, dir string, size int) {

3
cmd/neofs-adm/internal/modules/morph/remove_node.go
View File

@ -31,6 +31,7 @@ func removeNodesCmd(cmd *cobra.Command, args []string) error {
if err != nil {
return fmt.Errorf("can't initialize context: %w", err)
}
defer wCtx.close()
cs, err := wCtx.Client.GetContractStateByID(1)
if err != nil {
@ -52,7 +53,7 @@ func removeNodesCmd(cmd *cobra.Command, args []string) error {
return err
}
if err := wCtx.sendCommitteeTx(bw.Bytes(), true); err != nil {
if err := wCtx.sendConsensusTx(bw.Bytes()); err != nil {
return err
}