From 16b6766d743c21441c0718f077c5ead463ac15cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D1=85=D0=B5=D1=80=D0=B5=D1=82=D0=B8=D0=BA?=
 <херетик@indra.org>
Date: Tue, 6 Jun 2023 18:15:06 +0100
Subject: [PATCH] added helper for multiaddr->AddrPort

---
 pkg/engine/dispatcher_test.go   | 18 +++++-----
 pkg/engine/engine.go            |  2 +-
 pkg/engine/mock.go              | 59 +++++++++++++++++++--------------
 pkg/engine/peerstore.go         | 18 +++++-----
 pkg/engine/transport/tpt_sim.go |  2 +-
 pkg/onions/adpeer/peer.go       |  4 +--
 6 files changed, 56 insertions(+), 47 deletions(-)

diff --git a/pkg/engine/dispatcher_test.go b/pkg/engine/dispatcher_test.go
index 02f189d1..4b057654 100644
--- a/pkg/engine/dispatcher_test.go
+++ b/pkg/engine/dispatcher_test.go
@@ -81,15 +81,15 @@ func TestEngine_PeerStore(t *testing.T) {
 		t.FailNow()
 	}
 	const key = "testkey"
-	if e = engines[0].Publish(engines[0].Manager.Listener.Host.ID(),
-		key, s.GetAll().ToBytes());fails(e){
-		t.FailNow()
-	}
-	var val interface{}
-	val, e = engines[1].FindPeerRecord(engines[0].Manager.Listener.Host.ID(), key)
-	log.D.S("val", val)
-	val, e = engines[0].FindPeerRecord(engines[0].Manager.Listener.Host.ID(), key)
-	log.D.S("val", val)
+	//if e = engines[0].Publish(engines[0].Manager.Listener.Host.ID(),
+	//	key, s.GetAll().ToBytes());fails(e){
+	//	t.FailNow()
+	//}
+	//var val interface{}
+	//val, e = engines[1].FindPeerRecord(engines[0].Manager.Listener.Host.ID(), key)
+	//log.D.S("val", val)
+	//val, e = engines[0].FindPeerRecord(engines[0].Manager.Listener.Host.ID(), key)
+	//log.D.S("val", val)
 	time.Sleep(time.Second*3)
 	cancel()
 	for i := range engines {
diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go
index 9035e466..38d2eec7 100644
--- a/pkg/engine/engine.go
+++ b/pkg/engine/engine.go
@@ -34,7 +34,7 @@ type (
 		ShuttingDown atomic.Bool
 	}
 	Params struct {
-		tpt.Transport
+		Transport tpt.Transport
 		Listener *transport.Listener
 		*crypto.Keys
 		Node            *node.Node
diff --git a/pkg/engine/mock.go b/pkg/engine/mock.go
index e10873eb..f203ac59 100644
--- a/pkg/engine/mock.go
+++ b/pkg/engine/mock.go
@@ -2,6 +2,7 @@ package engine
 
 import (
 	"context"
+	"errors"
 	"github.com/indra-labs/indra"
 	"github.com/indra-labs/indra/pkg/crypto"
 	"github.com/indra-labs/indra/pkg/crypto/nonce"
@@ -12,8 +13,10 @@ import (
 	log2 "github.com/indra-labs/indra/pkg/proc/log"
 	"github.com/indra-labs/indra/pkg/util/slice"
 	"github.com/multiformats/go-multiaddr"
+	manet "github.com/multiformats/go-multiaddr/net"
 	"net/netip"
 	"os"
+	"strconv"
 )
 
 var (
@@ -90,6 +93,11 @@ func createNMockCircuits(inclSessions bool, nCircuits int,
 
 // CreateMockEngine creates an indra Engine with a random localhost listener.
 func CreateMockEngine(seed, dataPath string) (ng *Engine, cancel func(), e error) {
+	defer func(f *error) {
+		if *f != nil {
+			fails(os.RemoveAll(dataPath))
+		}
+	}(&e)
 	var ctx context.Context
 	ctx, cancel = context.WithCancel(context.Background())
 	var keys []*crypto.Keys
@@ -102,45 +110,48 @@ func CreateMockEngine(seed, dataPath string) (ng *Engine, cancel func(), e error
 	var l *transport.Listener
 	if l, e = transport.NewListener(seed, transport.LocalhostZeroIPv4TCP,
 		dataPath, k, ctx, transport.DefaultMTU); fails(e) {
-		os.RemoveAll(dataPath)
 		return
 	}
 	sa := transport.GetHostAddress(l.Host)
-	var addr netip.AddrPort
+	var ap *netip.AddrPort
 	var ma multiaddr.Multiaddr
 	if ma, e = multiaddr.NewMultiaddr(sa); fails(e) {
-		e = os.RemoveAll(dataPath)
 		return
 	}
-
-	var ip, port string
-	if ip, e = ma.ValueForProtocol(multiaddr.P_IP4); fails(e) {
-		// we specified ipv4 previously.
-		fails(os.RemoveAll(dataPath))
-		return
-	}
-	if port, e = ma.ValueForProtocol(multiaddr.P_TCP); fails(e) {
-		fails(os.RemoveAll(dataPath))
-		return
-	}
-	if addr, e = netip.ParseAddrPort(ip + ":" + port); fails(e) {
-		fails(os.RemoveAll(dataPath))
+	if ap = MultiaddrToAddrPort(ma); ap == nil {
+		e = errors.New("unable to parse multiaddr")
 		return
 	}
 	var nod *node.Node
-	if nod, _ = node.NewNode(&addr, k, nil, 50000); fails(e) {
-		fails(os.RemoveAll(dataPath))
+	if nod, _ = node.NewNode(ap, k, nil, 50000); fails(e) {
 		return
 	}
 	nodes = append(nodes, nod)
 	if ng, e = NewEngine(Params{
-		Transport: transport.NewByteChan(transport.ConnBufs),
-		Listener: l,
-		Keys:     k,
-		Node:     nod,
+		Transport: transport.NewDuplexByteChan(transport.ConnBufs),
+		Listener:  l,
+		Keys:      k,
+		Node:      nod,
 	}); fails(e) {
-		os.RemoveAll(dataPath)
-		return
 	}
 	return
 }
+
+// MultiaddrToAddrPort returns the ip and port for a. p should be either ma.P_TCP or ma.P_UDP.
+// a must be an (ip, TCP) or (ip, udp) address.
+func MultiaddrToAddrPort(a multiaddr.Multiaddr) (ap *netip.AddrPort) {
+	ip, _ := manet.ToIP(a)
+	var port string
+	var e error
+	for _, p := range []int{multiaddr.P_TCP, multiaddr.P_UDP} {
+		if port, e = a.ValueForProtocol(p); e == nil {
+			break
+		} else {
+			return
+		}
+	}
+	pi, _ := strconv.Atoi(port)
+	addr, _ := netip.AddrFromSlice(ip)
+	aap := netip.AddrPortFrom(addr, uint16(pi))
+	return &aap
+}
diff --git a/pkg/engine/peerstore.go b/pkg/engine/peerstore.go
index 779ff52d..4f2b977c 100644
--- a/pkg/engine/peerstore.go
+++ b/pkg/engine/peerstore.go
@@ -1,11 +1,11 @@
 package engine
 
-import "github.com/libp2p/go-libp2p/core/peer"
-
-func (ng *Engine) Publish(p peer.ID, key string, val interface{}) error {
-	return ng.Manager.Listener.Host.Peerstore().Put(p, key, val)
-}
-
-func (ng *Engine) FindPeerRecord(p peer.ID, key string) (val interface{}, e error) {
-	return ng.Manager.Listener.Host.Peerstore().Get(p, key)
-}
+//import "github.com/libp2p/go-libp2p/core/peer"
+//
+//func (ng *Engine) Publish(p peer.ID, key string, val interface{}) error {
+//	return ng.Manager.Listener.Host.Peerstore().Put(p, key, val)
+//}
+//
+//func (ng *Engine) FindPeerRecord(p peer.ID, key string) (val interface{}, e error) {
+//	return ng.Manager.Listener.Host.Peerstore().Get(p, key)
+//}
diff --git a/pkg/engine/transport/tpt_sim.go b/pkg/engine/transport/tpt_sim.go
index c718cb6f..d64c4cae 100644
--- a/pkg/engine/transport/tpt_sim.go
+++ b/pkg/engine/transport/tpt_sim.go
@@ -34,7 +34,7 @@ func NewDuplexByteChan(bufs int) *DuplexByteChan {
 }
 
 // NewSimDuplex creates a DuplexByteChan that behaves like a single ByteChan by
-// forwarding from the send channel to the receive channel. This creates
+// forwarding from the send channel to the receiver channel. This creates
 // something like a virtual in memory packet connection, as used in many of the
 // Onion tests for testing correct forwarding without a full network.
 //
diff --git a/pkg/onions/adpeer/peer.go b/pkg/onions/adpeer/peer.go
index cbc05fce..2647fe24 100644
--- a/pkg/onions/adpeer/peer.go
+++ b/pkg/onions/adpeer/peer.go
@@ -76,9 +76,7 @@ func (x *Ad) Decode(s *splice.Splice) (e error) {
 }
 
 func (x *Ad) Encode(s *splice.Splice) (e error) {
-	log.T.S("encoding", reflect.TypeOf(x),
-		x.ID, x.Sig,
-	)
+	log.T.S("encoding "+reflect.TypeOf(x).String(), x)
 	x.Splice(s.Magic(Magic))
 	return
 }