Test and code cleanup

Author: oskarszoon

client.go

@@ -358,26 +358,31 @@ func setupDHT(ctx context.Context, h host.Host, config Config, bootstrapPeers []
 
 // parseRelayPeersFromConfig parses relay peer multiaddr strings into AddrInfo
 func parseRelayPeersFromConfig(relayPeersConfig []string, log logger) []peer.AddrInfo {
-	if len(relayPeersConfig) == 0 {
+	return parsePeerMultiaddrs(relayPeersConfig, "relay", log)
+}
+
+// parsePeerMultiaddrs is a shared helper to parse peer multiaddr strings
+func parsePeerMultiaddrs(peerConfigs []string, peerType string, log logger) []peer.AddrInfo {
+	if len(peerConfigs) == 0 {
 		return nil
 	}
 
-	relayPeers := make([]peer.AddrInfo, 0, len(relayPeersConfig))
-	for _, relayStr := range relayPeersConfig {
-		maddr, err := multiaddr.NewMultiaddr(relayStr)
+	peers := make([]peer.AddrInfo, 0, len(peerConfigs))
+	for _, peerStr := range peerConfigs {
+		maddr, err := multiaddr.NewMultiaddr(peerStr)
 		if err != nil {
-			log.Errorf("Invalid relay address %s: %v (hint: use /dns4/ for hostnames, /ip4/ for IP addresses)", relayStr, err)
+			log.Errorf("Invalid %s address %s: %v (hint: use /dns4/ for hostnames, /ip4/ for IP addresses)", peerType, peerStr, err)
 			continue
 		}
 		addrInfo, err := peer.AddrInfoFromP2pAddr(maddr)
 		if err != nil {
-			log.Errorf("Invalid relay peer info %s: %v", relayStr, err)
+			log.Errorf("Invalid %s peer info %s: %v", peerType, peerStr, err)
 			continue
 		}
-		relayPeers = append(relayPeers, *addrInfo)
+		peers = append(peers, *addrInfo)
 	}
 
-	return relayPeers
+	return peers
 }
 
 // selectRelayPeers determines which peers to use as relays

client_additional_test.go

@@ -71,7 +71,8 @@ func TestConfigureRelayPeersWithValidPeers(t *testing.T) {
 		testRelayPeerMultiaddr,
 	}
 
-	relayPeers := configureRelayPeers(relayPeersConfig, bootstrapPeers, logger)
+	customRelayPeers := parseRelayPeersFromConfig(relayPeersConfig, logger)
+	relayPeers := selectRelayPeers(customRelayPeers, bootstrapPeers, logger)
 
 	assert.Len(t, relayPeers, 1)
 }
@@ -86,7 +87,8 @@ func TestConfigureRelayPeersWithMixedValidity(t *testing.T) {
 		"invalid-peer",
 	}
 
-	relayPeers := configureRelayPeers(relayPeersConfig, bootstrapPeers, logger)
+	customRelayPeers := parseRelayPeersFromConfig(relayPeersConfig, logger)
+	relayPeers := selectRelayPeers(customRelayPeers, bootstrapPeers, logger)
 
 	// Should have 1 valid peer (second one is invalid)
 	assert.Len(t, relayPeers, 1)
@@ -114,25 +116,6 @@ func TestClientCloseTwice(t *testing.T) {
 	_ = err
 }
 
-func TestClientWithBootstrapPeers(t *testing.T) {
-	privKey, err := GeneratePrivateKey()
-	require.NoError(t, err)
-
-	config := Config{
-		Name:       testPeerName,
-		PrivateKey: privKey,
-		BootstrapPeers: []string{
-			"/ip4/127.0.0.1/tcp/9999/p2p/QmYyQSo1c1Ym7orWxLYvCrM2EmxFTANf8wXmmE7DWjhx5N",
-		},
-	}
-
-	cl, err := NewClient(config)
-	require.NoError(t, err)
-
-	err = cl.Close()
-	require.NoError(t, err)
-}
-
 func TestGetPeersWithNoConnections(t *testing.T) {
 	privKey, err := GeneratePrivateKey()
 	require.NoError(t, err)

client_test.go

@@ -416,7 +416,8 @@ func TestConfigureRelayPeersEmpty(t *testing.T) {
 		{ID: "QmYyQSo1c1Ym7orWxLYvCrM2EmxFTANf8wXmmE7DWjhx5N"},
 	}
 
-	relayPeers := configureRelayPeers([]string{}, bootstrapPeers, logger)
+	customRelayPeers := parseRelayPeersFromConfig([]string{}, logger)
+	relayPeers := selectRelayPeers(customRelayPeers, bootstrapPeers, logger)
 
 	// Should return bootstrap peers when no custom relays
 	assert.Equal(t, bootstrapPeers, relayPeers)
@@ -435,7 +436,8 @@ func TestConfigureRelayPeersInvalidAddresses(t *testing.T) {
 		"not-a-multiaddr",
 	}
 
-	relayPeers := configureRelayPeers(invalidRelays, bootstrapPeers, logger)
+	customRelayPeers := parseRelayPeersFromConfig(invalidRelays, logger)
+	relayPeers := selectRelayPeers(customRelayPeers, bootstrapPeers, logger)
 
 	// Should fall back to bootstrap peers on invalid addresses
 	assert.Equal(t, bootstrapPeers, relayPeers)

config.go

@@ -36,11 +36,6 @@ type Config struct {
 	// so other peers can identify the sender.
 	Name string
 
-	// BootstrapPeers is an optional list of multiaddr strings for initial peers to connect to.
-	// If not provided, the client will use libp2p's default bootstrap peers.
-	// Example: []string{"/ip4/192.168.1.100/tcp/4001/p2p/QmPeerID"}
-	BootstrapPeers []string
-
 	// Logger is an optional logger to use for logging. If not provided, the client will use
 	// DefaultLogger. Set to a custom implementation to integrate with your logging framework.
 	Logger logger