Unit test fixes RIVM-123

contrib/mobile/mobile_test.go

@@ -2,7 +2,7 @@ package mobile
 
 import "testing"
 
-func TestStartYggdrasil(t *testing.T) {
+func TestStartMesh(t *testing.T) {
 	mesh := &Mesh{}
 	if err := mesh.StartAutoconfigure(); err != nil {
 		t.Fatalf("Failed to start RiV-mesh: %s", err)

go.mod

@@ -2,7 +2,7 @@ module github.com/RiV-chain/RiV-mesh
 
 go 1.21
 
-replace github.com/Arceliar/ironwood => github.com/RiV-chain/ironwood v0.0.0-20231216211443-db9dc5254586
+replace github.com/Arceliar/ironwood => github.com/RiV-chain/ironwood v0.0.0-20231219110050-df94b9d2fe86
 
 replace github.com/mikispag/dns-over-tls-forwarder => github.com/RiV-chain/dns-over-tls-forwarder v0.0.0-20230828114909-c2cd9f8d79d3
 

go.sum

@@ -4,8 +4,8 @@ github.com/Arceliar/phony v0.0.0-20220903101357-530938a4b13d h1:UK9fsWbWqwIQkMCz
 github.com/Arceliar/phony v0.0.0-20220903101357-530938a4b13d/go.mod h1:BCnxhRf47C/dy/e/D2pmB8NkB3dQVIrkD98b220rx5Q=
 github.com/RiV-chain/dns-over-tls-forwarder v0.0.0-20230828114909-c2cd9f8d79d3 h1:gz71d+oEAMXYUYw54JKT4A6CxniQx6B9J0G5CYJeLok=
 github.com/RiV-chain/dns-over-tls-forwarder v0.0.0-20230828114909-c2cd9f8d79d3/go.mod h1:V2Irj3BjF2tLZ3xXp6TMQCu0I+eJWQPEktbLMHQN8XA=
-github.com/RiV-chain/ironwood v0.0.0-20231216211443-db9dc5254586 h1:S1pxiQdxYtPu7uh5vJFKpri+ubGI4ApxEw6/475rGBo=
-github.com/RiV-chain/ironwood v0.0.0-20231216211443-db9dc5254586/go.mod h1:O9iIMM9iVSXUIKNcrjossDuuXLwoGNuLSDXqjtTBHJk=
+github.com/RiV-chain/ironwood v0.0.0-20231219110050-df94b9d2fe86 h1:Esep6Wiu2I/XE/8yMuwy1n0t5nV3+wsA1EifbR0xDCU=
+github.com/RiV-chain/ironwood v0.0.0-20231219110050-df94b9d2fe86/go.mod h1:O9iIMM9iVSXUIKNcrjossDuuXLwoGNuLSDXqjtTBHJk=
 github.com/bits-and-blooms/bitset v1.3.1/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA=
 github.com/bits-and-blooms/bitset v1.5.0 h1:NpE8frKRLGHIcEzkR+gZhiioW1+WbYV6fKwD6ZIpQT8=
 github.com/bits-and-blooms/bitset v1.5.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA=

src/core/api.go

@@ -10,6 +10,7 @@ import (
 	"net"
 	"net/url"
 
+	"github.com/Arceliar/ironwood/network"
 	"github.com/Arceliar/ironwood/types"
 	"github.com/Arceliar/phony"
 )
@@ -93,43 +94,39 @@ func (c *Core) GetSelf() SelfInfo {
 }
 
 func (c *Core) GetPeers() []PeerInfo {
-	var peers []PeerInfo
-	names := make(map[net.Conn]string)
-	ips := make(map[net.Conn]string)
+	peers := []PeerInfo{}
+	conns := map[net.Conn]network.DebugPeerInfo{}
+	iwpeers := c.PacketConn.PacketConn.Debug.GetPeers()
+	for _, p := range iwpeers {
+		conns[p.Conn] = p
+	}
+
 	phony.Block(&c.links, func() {
-		for linkInfo, info := range c.links._links {
-			if info == nil {
-				continue
+		for info, state := range c.links._links {
+			var peerinfo PeerInfo
+			var conn net.Conn
+			peerinfo.URI = info.uri
+			peerinfo.LastError = state._err
+			peerinfo.LastErrorTime = state._errtime
+			if c := state._conn; c != nil {
+				conn = c
+				peerinfo.Up = true
+				peerinfo.Inbound = state.linkType == linkTypeIncoming
+				peerinfo.RXBytes = atomic.LoadUint64(&c.rx)
+				peerinfo.TXBytes = atomic.LoadUint64(&c.tx)
+				peerinfo.Uptime = time.Since(c.up)
 			}
-			names[info._conn] = linkInfo.uri
-			ips[info._conn] = linkInfo.sintf
-		}
-	})
-	ps := c.PacketConn.PacketConn.Debug.GetPeers()
-	for _, p := range ps {
-		var info PeerInfo
-		info.Domain = p.Domain
-		info.Root = p.Root
-		info.Coords = p.Coords
-		info.Port = p.Port
-		info.Priority = p.Priority
-		info.Remote = p.Conn.RemoteAddr().String()
-		if name := names[p.Conn]; name != "" {
-			info.Remote = name
-		}
-		if info.RemoteIp = ips[p.Conn]; info.RemoteIp != "" {
-			//Cut port
-			if host, _, err := net.SplitHostPort(info.RemoteIp); err == nil {
-				info.RemoteIp = host
+			if p, ok := conns[conn]; ok {
+				peerinfo.Domain = p.Domain
+				peerinfo.Remote = p.Conn.RemoteAddr().String()
+				peerinfo.Root = p.Root
+				peerinfo.Port = p.Port
+				peerinfo.Priority = p.Priority
 			}
+			peers = append(peers, peerinfo)
 		}
-		if linkconn, ok := p.Conn.(*linkConn); ok {
-			info.RXBytes = atomic.LoadUint64(&linkconn.rx)
-			info.TXBytes = atomic.LoadUint64(&linkconn.tx)
-			info.Uptime = time.Since(linkconn.up)
-		}
-		peers = append(peers, info)
-	}
+	})
+
 	return peers
 }
 

src/core/core_test.go

@@ -155,6 +155,8 @@ func TestCore_Start_Transfer(t *testing.T) {
 	if !WaitConnected(nodeA, nodeB) {
 		t.Fatal("nodes did not connect")
 	}
+	//FIX ME! Temporal fix to resolve issue in GetPeers.
+	time.Sleep(5000 * time.Millisecond)
 
 	// Send
 	msg := make([]byte, msgLen)
@@ -187,6 +189,8 @@ func BenchmarkCore_Start_Transfer(b *testing.B) {
 	if !WaitConnected(nodeA, nodeB) {
 		b.Fatal("nodes did not connect")
 	}
+	//FIX ME! Temporal fix to resolve issue in GetPeers.
+	time.Sleep(5000 * time.Millisecond)
 
 	// Send
 	msg := make([]byte, msgLen)