Malformed circuit relay address

[sandreae]

When relay and rendezvous address are set this error occurs:

Listen on circuit relay address: Some("/ip4/209.97.139.109/udp/2022/quic-v1/p2p/12D3KooWRDdfnngy3kGX5KAKT7kZkwL2hVJnTtsExT6rfUaDVPZs/p2p/12D3KooWRDdfnngy3kGX5KAKT7kZkwL2hVJnTtsExT6rfUaDVPZs/p2p-circuit/p2p/12D3KooWQDMCuosb7FSiVekTaih2ycnHgg5giyNn2BTEjAP2mhB3")
Err(
    Other(
        Custom {
            kind: Other,
            error: Right(
                Left(
                    Left(
                        MalformedMultiaddr,
                    ),
                ),
            ),
        },
    ),
)

Because the address is being incorrectly composed here:

aquadoggo/aquadoggo/src/network/service.rs

Lines 54 to 69 in 1d52522

	// Construct circuit relay addresses and listen on relayed address
	if let Some(relay_addr) = &network_config.relay_address {
	if let Some(rendezvous_peer_id) = network_config.rendezvous_peer_id {
	let circuit_addr = relay_addr
	.clone()
	.with(Protocol::P2p(rendezvous_peer_id))
	.with(Protocol::P2pCircuit);
	// Dialable circuit relay address for local node
	external_circuit_addr = Some(circuit_addr.clone().with(Protocol::P2p(local_peer_id)));
	swarm.listen_on(circuit_addr)?;
	} else {
	warn!("Unable to construct relay circuit address because rendezvous server peer ID was not provided");
	}
	}

It should look like this:

// Construct circuit relay addresses and listen on relayed address
if let Some(relay_addr) = &network_config.relay_address {
    let circuit_addr = relay_addr.clone().with(Protocol::P2pCircuit);

    // Dialable circuit relay address for local node
    external_circuit_addr = Some(circuit_addr.clone().with(Protocol::P2p(local_peer_id)));

    swarm.listen_on(circuit_addr)?;
}