test(p2p): fix host factory option handling and enhance addressbook tests

Author: gacevicljubisa

pkg/p2p/libp2p/connections_test.go

@@ -1579,16 +1579,18 @@ func TestAddressbookPersistence(t *testing.T) {
 
 		ctx := t.Context()
 
-		ab := addressbook.New(mock.NewStateStore())
+		ab1 := addressbook.New(mock.NewStateStore())
+		ab2 := addressbook.New(mock.NewStateStore())
 
 		s1, overlay1 := newService(t, 1, libp2pServiceOpts{
+			Addressbook: ab1,
 			libp2pOpts: libp2p.Options{
 				FullNode: true,
 			},
 		})
 
 		s2, overlay2 := newService(t, 1, libp2pServiceOpts{
-			Addressbook:    ab,
+			Addressbook:    ab2,
 			emptyUnderlays: true,
 			libp2pOpts: libp2p.Options{
 				FullNode: true,
@@ -1611,13 +1613,19 @@ func TestAddressbookPersistence(t *testing.T) {
 		expectPeersEventually(t, s1, overlay2)
 
 		// Verify s1 (has underlays) is persisted in s2's addressbook
-		addr, err := ab.Get(overlay1)
+		addr, err := ab2.Get(overlay1)
 		if err != nil {
 			t.Fatal(err)
 		}
 		if !containsAtLeastOne(addr.Underlays, s1Addrs) {
 			t.Fatalf("expected at least one of s1's addresses %v in addressbook, got %v", s1Addrs, addr.Underlays)
 		}
+
+		// Verify s2 (empty underlays) is NOT persisted in s1's addressbook
+		_, err = ab1.Get(overlay2)
+		if err == nil {
+			t.Fatal("expected s2 (inbound-only peer with empty underlays) not to be persisted in s1's addressbook")
+		}
 	})
 }
 

pkg/p2p/libp2p/export_test.go

@@ -53,6 +53,10 @@ func SetAutoTLSCertManager(o *Options, m autoTLSCertManager) {
 	o.autoTLSCertManager = m
 }
 
+func SetHostFactory(o *Options, factory func(...libp2pm.Option) (host.Host, error)) {
+	o.hostFactory = factory
+}
+
 type AutoTLSCertManager = autoTLSCertManager
 
 var NewCompositeAddressResolver = newCompositeAddressResolver

pkg/p2p/libp2p/libp2p_test.go

@@ -88,14 +88,11 @@ func newService(t *testing.T, networkID uint64, o libp2pServiceOpts) (s *libp2p.
 	// If emptyUnderlays is set, use a custom host factory that creates a host with no listen addresses
 	// This simulates an inbound-only peer (browser, WebRTC connection, strict NAT)
 	if o.emptyUnderlays {
-		opts = libp2p.WithHostFactory(
-			func(hostOpts ...libp2pm.Option) (host.Host, error) {
-				// Add NoListenAddrs option to prevent the host from listening on any addresses
-				hostOpts = append(hostOpts, libp2pm.NoListenAddrs)
-				return libp2pm.New(hostOpts...)
-			},
-		)
-		opts.Nonce = nonce
+		libp2p.SetHostFactory(&opts, func(hostOpts ...libp2pm.Option) (host.Host, error) {
+			// Add NoListenAddrs option to prevent the host from listening on any addresses
+			hostOpts = append(hostOpts, libp2pm.NoListenAddrs)
+			return libp2pm.New(hostOpts...)
+		})
 	}
 
 	if o.autoTLSCertManager != nil {