[#312] netmap: Support multiple addresses in NodeInfo

In latest NeoFS API changes `NodeInfo` message carries list of network
addresses. There is a need

Add `SetAddresses` / `IterateAddresses` / `NumberOfAddresses` methods to
provide the access to node's address group. Mark `Address` / `SetAddress`
methods as deprecated.

Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>

pkg/netmap/node_info.go

@@ -332,15 +332,52 @@ func (i *NodeInfo) SetPublicKey(key []byte) {
 }
 
 // Address returns network endpoint address of the node.
-func (i *NodeInfo) Address() string {
-	return (*netmap.NodeInfo)(i).
-		GetAddress()
+//
+// Deprecated: use IterateAddresses method.
+func (i *NodeInfo) Address() (addr string) {
+	i.IterateAddresses(func(s string) bool {
+		addr = s
+		return true
+	})
+
+	return
 }
 
 // SetAddress sets network endpoint address of the node.
+//
+// Deprecated: use SetAddresses method.
 func (i *NodeInfo) SetAddress(addr string) {
+	i.SetAddresses(addr)
+}
+
+// NumberOfAddresses returns number of network addresses of the node.
+func (i *NodeInfo) NumberOfAddresses() int {
+	return (*netmap.NodeInfo)(i).
+		NumberOfAddresses()
+}
+
+// IterateAddresses iterates over network addresses of the node.
+// Breaks iteration on f's true return.
+//
+// Handler should not be nil.
+func (i *NodeInfo) IterateAddresses(f func(string) bool) {
 	(*netmap.NodeInfo)(i).
-		SetAddress(addr)
+		IterateAddresses(f)
+}
+
+// IterateAllAddresses is a helper function to unconditionally
+// iterate over all node addresses.
+func IterateAllAddresses(i *NodeInfo, f func(string)) {
+	i.IterateAddresses(func(addr string) bool {
+		f(addr)
+		return false
+	})
+}
+
+// SetAddresses sets list of network addresses of the node.
+func (i *NodeInfo) SetAddresses(v ...string) {
+	(*netmap.NodeInfo)(i).
+		SetAddresses(v...)
 }
 
 // Attributes returns list of the node attributes.

pkg/netmap/node_info_test.go

@@ -124,13 +124,21 @@ func TestNodeInfo_PublicKey(t *testing.T) {
 	require.Equal(t, key, i.PublicKey())
 }
 
-func TestNodeInfo_Address(t *testing.T) {
+func TestNodeInfo_IterateAddresses(t *testing.T) {
 	i := new(NodeInfo)
-	a := "127.0.0.1:8080"
 
-	i.SetAddress(a)
+	as := []string{"127.0.0.1:8080", "127.0.0.1:8081"}
 
-	require.Equal(t, a, i.Address())
+	i.SetAddresses(as...)
+
+	as2 := make([]string, 0, i.NumberOfAddresses())
+
+	IterateAllAddresses(i, func(addr string) {
+		as2 = append(as2, addr)
+	})
+
+	require.Equal(t, as, as2)
+	require.EqualValues(t, len(as), i.NumberOfAddresses())
 }
 
 func TestNodeInfo_State(t *testing.T) {
@@ -178,7 +186,7 @@ func TestNodeAttributeEncoding(t *testing.T) {
 func TestNodeInfoEncoding(t *testing.T) {
 	i := NewNodeInfo()
 	i.SetPublicKey([]byte{1, 2, 3})
-	i.SetAddress("192.168.0.1")
+	i.SetAddresses("192.168.0.1", "192.168.0.2")
 	i.SetState(NodeStateOnline)
 	i.SetAttributes(testNodeAttribute())
 
@@ -227,7 +235,8 @@ func TestNewNodeInfo(t *testing.T) {
 
 		// check initial values
 		require.Nil(t, ni.PublicKey())
-		require.Empty(t, ni.Address())
+
+		require.Zero(t, ni.NumberOfAddresses())
 		require.Nil(t, ni.Attributes())
 		require.Zero(t, ni.State())
 
@@ -235,7 +244,7 @@ func TestNewNodeInfo(t *testing.T) {
 		niV2 := ni.ToV2()
 
 		require.Nil(t, niV2.GetPublicKey())
-		require.Empty(t, niV2.GetAddress())
+		require.Zero(t, niV2.NumberOfAddresses())
 		require.Nil(t, niV2.GetAttributes())
 		require.EqualValues(t, netmap.UnspecifiedState, niV2.GetState())
 	})

pkg/netmap/test/generate.go

@@ -84,7 +84,7 @@ func NodeAttribute() *netmap.NodeAttribute {
 func NodeInfo() *netmap.NodeInfo {
 	x := netmap.NewNodeInfo()
 
-	x.SetAddress("address")
+	x.SetAddresses("address 1", "address 2")
 	x.SetPublicKey([]byte("public key"))
 	x.SetState(netmap.NodeStateOnline)
 	x.SetAttributes(NodeAttribute(), NodeAttribute())