From 49959c4166d92cd46df04d352c7928f92fbf1aa9 Mon Sep 17 00:00:00 2001
From: Evgenii Stratonikov <e.stratonikov@yadro.com>
Date: Fri, 22 Nov 2024 10:45:47 +0300
Subject: [PATCH] [#1522] adm/helper: Unexport GetFrostfsIDAdmin()
It is used in `helper` package only, besides unit-tests.
Move unit-tests to the same package, where they belong.
Signed-off-by: Evgenii Stratonikov <e.stratonikov@yadro.com>
---
.../morph/frostfsid/frostfsid_util_test.go | 47 ----------------
.../internal/modules/morph/helper/contract.go | 2 +-
.../modules/morph/helper/frostfsid.go | 2 +-
.../modules/morph/helper/frostfsid_test.go | 53 +++++++++++++++++++
4 files changed, 55 insertions(+), 49 deletions(-)
create mode 100644 cmd/frostfs-adm/internal/modules/morph/helper/frostfsid_test.go
diff --git a/cmd/frostfs-adm/internal/modules/morph/frostfsid/frostfsid_util_test.go b/cmd/frostfs-adm/internal/modules/morph/frostfsid/frostfsid_util_test.go
index cce859d2fd..1d0bc84411 100644
--- a/cmd/frostfs-adm/internal/modules/morph/frostfsid/frostfsid_util_test.go
+++ b/cmd/frostfs-adm/internal/modules/morph/frostfsid/frostfsid_util_test.go
@@ -1,59 +1,12 @@
package frostfsid
import (
- "encoding/hex"
"testing"
- "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/modules/morph/helper"
"git.frostfs.info/TrueCloudLab/frostfs-node/internal/ape"
- "github.com/nspcc-dev/neo-go/pkg/crypto/keys"
- "github.com/nspcc-dev/neo-go/pkg/encoding/address"
- "github.com/spf13/viper"
"github.com/stretchr/testify/require"
)
-func TestFrostfsIDConfig(t *testing.T) {
- pks := make([]*keys.PrivateKey, 4)
- for i := range pks {
- pk, err := keys.NewPrivateKey()
- require.NoError(t, err)
- pks[i] = pk
- }
-
- fmts := []string{
- pks[0].GetScriptHash().StringLE(),
- address.Uint160ToString(pks[1].GetScriptHash()),
- hex.EncodeToString(pks[2].PublicKey().UncompressedBytes()),
- hex.EncodeToString(pks[3].PublicKey().Bytes()),
- }
-
- for i := range fmts {
- v := viper.New()
- v.Set("frostfsid.admin", fmts[i])
-
- actual, found, err := helper.GetFrostfsIDAdmin(v)
- require.NoError(t, err)
- require.True(t, found)
- require.Equal(t, pks[i].GetScriptHash(), actual)
- }
-
- t.Run("bad key", func(t *testing.T) {
- v := viper.New()
- v.Set("frostfsid.admin", "abc")
-
- _, found, err := helper.GetFrostfsIDAdmin(v)
- require.Error(t, err)
- require.True(t, found)
- })
- t.Run("missing key", func(t *testing.T) {
- v := viper.New()
-
- _, found, err := helper.GetFrostfsIDAdmin(v)
- require.NoError(t, err)
- require.False(t, found)
- })
-}
-
func TestNamespaceRegexp(t *testing.T) {
for _, tc := range []struct {
name string
diff --git a/cmd/frostfs-adm/internal/modules/morph/helper/contract.go b/cmd/frostfs-adm/internal/modules/morph/helper/contract.go
index eea3b040e6..64d1c63931 100644
--- a/cmd/frostfs-adm/internal/modules/morph/helper/contract.go
+++ b/cmd/frostfs-adm/internal/modules/morph/helper/contract.go
@@ -82,7 +82,7 @@ func GetContractDeployData(c *InitializeContext, ctrName string, keysParam []any
h, found, err = getFrostfsIDAdminFromContract(c.ReadOnlyInvoker)
}
if method != constants.UpdateMethodName || err == nil && !found {
- h, found, err = GetFrostfsIDAdmin(viper.GetViper())
+ h, found, err = getFrostfsIDAdmin(viper.GetViper())
}
if err != nil {
return nil, err
diff --git a/cmd/frostfs-adm/internal/modules/morph/helper/frostfsid.go b/cmd/frostfs-adm/internal/modules/morph/helper/frostfsid.go
index f29042b828..fce2dfb741 100644
--- a/cmd/frostfs-adm/internal/modules/morph/helper/frostfsid.go
+++ b/cmd/frostfs-adm/internal/modules/morph/helper/frostfsid.go
@@ -11,7 +11,7 @@ import (
const frostfsIDAdminConfigKey = "frostfsid.admin"
-func GetFrostfsIDAdmin(v *viper.Viper) (util.Uint160, bool, error) {
+func getFrostfsIDAdmin(v *viper.Viper) (util.Uint160, bool, error) {
admin := v.GetString(frostfsIDAdminConfigKey)
if admin == "" {
return util.Uint160{}, false, nil
diff --git a/cmd/frostfs-adm/internal/modules/morph/helper/frostfsid_test.go b/cmd/frostfs-adm/internal/modules/morph/helper/frostfsid_test.go
new file mode 100644
index 0000000000..38991e9629
--- /dev/null
+++ b/cmd/frostfs-adm/internal/modules/morph/helper/frostfsid_test.go
@@ -0,0 +1,53 @@
+package helper
+
+import (
+ "encoding/hex"
+ "testing"
+
+ "github.com/nspcc-dev/neo-go/pkg/crypto/keys"
+ "github.com/nspcc-dev/neo-go/pkg/encoding/address"
+ "github.com/spf13/viper"
+ "github.com/stretchr/testify/require"
+)
+
+func TestFrostfsIDConfig(t *testing.T) {
+ pks := make([]*keys.PrivateKey, 4)
+ for i := range pks {
+ pk, err := keys.NewPrivateKey()
+ require.NoError(t, err)
+ pks[i] = pk
+ }
+
+ fmts := []string{
+ pks[0].GetScriptHash().StringLE(),
+ address.Uint160ToString(pks[1].GetScriptHash()),
+ hex.EncodeToString(pks[2].PublicKey().UncompressedBytes()),
+ hex.EncodeToString(pks[3].PublicKey().Bytes()),
+ }
+
+ for i := range fmts {
+ v := viper.New()
+ v.Set("frostfsid.admin", fmts[i])
+
+ actual, found, err := getFrostfsIDAdmin(v)
+ require.NoError(t, err)
+ require.True(t, found)
+ require.Equal(t, pks[i].GetScriptHash(), actual)
+ }
+
+ t.Run("bad key", func(t *testing.T) {
+ v := viper.New()
+ v.Set("frostfsid.admin", "abc")
+
+ _, found, err := getFrostfsIDAdmin(v)
+ require.Error(t, err)
+ require.True(t, found)
+ })
+ t.Run("missing key", func(t *testing.T) {
+ v := viper.New()
+
+ _, found, err := getFrostfsIDAdmin(v)
+ require.NoError(t, err)
+ require.False(t, found)
+ })
+}