From b5db977e62d59312efd9e7d9c74d272b75b34538 Mon Sep 17 00:00:00 2001
From: Pavel Karpy <carpawell@nspcc.ru>
Date: Mon, 22 Nov 2021 21:59:49 +0300
Subject: [PATCH] [#174] subnet: Add `NodeAllowed` method

Signed-off-by: Pavel Karpy <carpawell@nspcc.ru>
---
 subnet/subnet_contract.go | 30 ++++++++++++++++++++++++++----
 tests/subnet_test.go      | 23 +++++++++++++++++++++--
 2 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/subnet/subnet_contract.go b/subnet/subnet_contract.go
index 0f67ee4..c3bb80d 100644
--- a/subnet/subnet_contract.go
+++ b/subnet/subnet_contract.go
@@ -7,7 +7,6 @@ import (
 	"github.com/nspcc-dev/neo-go/pkg/interop/native/management"
 	"github.com/nspcc-dev/neo-go/pkg/interop/runtime"
 	"github.com/nspcc-dev/neo-go/pkg/interop/storage"
-	"github.com/nspcc-dev/neo-go/pkg/interop/util"
 	"github.com/nspcc-dev/neofs-contract/common"
 )
 
@@ -18,6 +17,8 @@ const (
 	ErrInvalidOwner = "invalid owner"
 	// ErrInvalidAdmin is thrown when admin has invalid format.
 	ErrInvalidAdmin = "invalid administrator"
+	// ErrInvalidNode is thrown when node has invalid format.
+	ErrInvalidNode = "invalid node key"
 	// ErrAlreadyExists is thrown when id already exists.
 	ErrAlreadyExists = "subnet id already exists"
 	// ErrSubNotExist is thrown when id doesn't exist.
@@ -214,7 +215,7 @@ func RemoveNodeAdmin(subnetID []byte, adminKey interop.PublicKey) {
 // only.
 func AddNode(subnetID []byte, node interop.PublicKey) {
 	if len(node) != interop.PublicKeyCompressedLen {
-		panic("addNode: " + ErrInvalidAdmin)
+		panic("addNode: " + ErrInvalidNode)
 	}
 
 	ctx := storage.GetContext()
@@ -261,7 +262,7 @@ func AddNode(subnetID []byte, node interop.PublicKey) {
 // only.
 func RemoveNode(subnetID []byte, node interop.PublicKey) {
 	if len(node) != interop.PublicKeyCompressedLen {
-		panic("removeNode: " + ErrInvalidAdmin)
+		panic("removeNode: " + ErrInvalidNode)
 	}
 
 	ctx := storage.GetContext()
@@ -305,6 +306,27 @@ func RemoveNode(subnetID []byte, node interop.PublicKey) {
 	runtime.Notify("NodeRemove", subnetID, node)
 }
 
+// NodeAllowed checks if node is included in the
+// specified subnet or not.
+func NodeAllowed(subnetID []byte, node interop.PublicKey) bool {
+	if len(node) != interop.PublicKeyCompressedLen {
+		panic("nodeAllowed: " + ErrInvalidNode)
+	}
+
+	ctx := storage.GetReadOnlyContext()
+
+	stKey := append([]byte{ownerPrefix}, subnetID...)
+
+	rawOwner := storage.Get(ctx, stKey)
+	if rawOwner == nil {
+		panic("nodeAllowed: " + ErrSubNotExist)
+	}
+
+	stKey[0] = nodePrefix
+
+	return storage.Get(ctx, append(stKey, node...)) != nil
+}
+
 // Version returns version of the contract.
 func Version() int {
 	return common.Version
@@ -316,7 +338,7 @@ func keyInList(ctx storage.Context, searchedKey interop.PublicKey, prefix []byte
 	iter := storage.Find(ctx, prefix, storage.KeysOnly)
 	for iterator.Next(iter) {
 		key := iterator.Value(iter).([]byte)
-		if util.Equals(string(key[prefixLen:]), string(searchedKey)) {
+		if common.BytesEqual(key[prefixLen:], searchedKey) {
 			return true
 		}
 	}
diff --git a/tests/subnet_test.go b/tests/subnet_test.go
index 222b1d5..c1b6535 100644
--- a/tests/subnet_test.go
+++ b/tests/subnet_test.go
@@ -136,7 +136,7 @@ func TestSubnet_AddNode(t *testing.T) {
 	const method = "addNode"
 
 	cOwn := e.WithSigners(owner)
-	cOwn.InvokeFail(t, method+errSeparator+subnet.ErrInvalidAdmin, method, id, nodePub[1:])
+	cOwn.InvokeFail(t, method+errSeparator+subnet.ErrInvalidNode, method, id, nodePub[1:])
 
 	cOwn.Invoke(t, stackitem.Null{}, method, id, nodePub)
 	cOwn.InvokeFail(t, method+errSeparator+"node has already been added", method, id, nodePub)
@@ -158,7 +158,7 @@ func TestSubnet_RemoveNode(t *testing.T) {
 	const method = "removeNode"
 
 	cOwn := e.WithSigners(owner)
-	cOwn.InvokeFail(t, method+errSeparator+subnet.ErrInvalidAdmin, method, id, nodePub[1:])
+	cOwn.InvokeFail(t, method+errSeparator+subnet.ErrInvalidNode, method, id, nodePub[1:])
 	cOwn.InvokeFail(t, method+errSeparator+subnet.ErrNodeNotExist, method, id, nodePub)
 
 	cOwn.Invoke(t, stackitem.Null{}, "addNode", id, nodePub)
@@ -170,6 +170,25 @@ func TestSubnet_RemoveNode(t *testing.T) {
 	cAdm.InvokeFail(t, method+errSeparator+subnet.ErrNodeNotExist, method, id, nodePub)
 }
 
+func TestSubnet_NodeAllowed(t *testing.T) {
+	e := newSubnetInvoker(t)
+
+	id, owner := createSubnet(t, e)
+
+	node := e.NewAccount(t)
+	nodePub, ok := vm.ParseSignatureContract(node.Script())
+	require.True(t, ok)
+
+	const method = "nodeAllowed"
+
+	cOwn := e.WithSigners(owner)
+	cOwn.InvokeFail(t, method+errSeparator+subnet.ErrInvalidNode, method, id, nodePub[1:])
+	cOwn.Invoke(t, stackitem.NewBool(false), method, id, nodePub)
+
+	cOwn.Invoke(t, stackitem.Null{}, "addNode", id, nodePub)
+	cOwn.Invoke(t, stackitem.NewBool(true), method, id, nodePub)
+}
+
 func createSubnet(t *testing.T, e *neotest.ContractInvoker) (id []byte, owner neotest.Signer) {
 	var (
 		ok  bool