mirror of
https://github.com/comit-network/xmr-btc-swap.git
synced 2025-12-17 09:34:16 -05:00
refactor: rename crate to libp2p-tor (#485)
* refactor: Rename libp2p-community-tor to libp2p-tor * fmt
This commit is contained in:
parent
db5d02ea3d
commit
fb29fb97d1
14 changed files with 17 additions and 19 deletions
4
Cargo.lock
generated
4
Cargo.lock
generated
|
|
@ -5314,7 +5314,7 @@ dependencies = [
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "libp2p-community-tor"
|
name = "libp2p-tor"
|
||||||
version = "0.5.0"
|
version = "0.5.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
|
|
@ -10169,7 +10169,7 @@ dependencies = [
|
||||||
"get-port",
|
"get-port",
|
||||||
"hex",
|
"hex",
|
||||||
"libp2p",
|
"libp2p",
|
||||||
"libp2p-community-tor",
|
"libp2p-tor",
|
||||||
"mockito",
|
"mockito",
|
||||||
"moka",
|
"moka",
|
||||||
"monero",
|
"monero",
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
resolver = "2"
|
resolver = "2"
|
||||||
members = [
|
members = [
|
||||||
"electrum-pool",
|
"electrum-pool",
|
||||||
"libp2p-community-tor",
|
"libp2p-tor",
|
||||||
"monero-rpc",
|
"monero-rpc",
|
||||||
"monero-rpc-pool",
|
"monero-rpc-pool",
|
||||||
"monero-seed",
|
"monero-seed",
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
[package]
|
[package]
|
||||||
name = "libp2p-community-tor"
|
name = "libp2p-tor"
|
||||||
version = "0.5.0"
|
version = "0.5.0"
|
||||||
authors = ["umgefahren <hannes@umgefahren.xyz>"]
|
authors = ["umgefahren <hannes@umgefahren.xyz>"]
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
[](https://github.com/umgefahren/libp2p-tor/actions/workflows/ci.yml)
|
[](https://github.com/umgefahren/libp2p-tor/actions/workflows/ci.yml)
|
||||||
[](https://docs.rs/libp2p-community-tor/latest)
|
[](https://docs.rs/libp2p-tor/latest)
|
||||||
[](https://crates.io/crates/libp2p-community-tor)
|
[](https://crates.io/crates/libp2p-tor)
|
||||||
|
|
||||||
# libp2p Tor
|
# libp2p Tor
|
||||||
|
|
||||||
|
|
@ -26,7 +26,7 @@ are dealing with.
|
||||||
### Add to your dependencies
|
### Add to your dependencies
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
cargo add libp2p-community-tor
|
cargo add libp2p-tor
|
||||||
```
|
```
|
||||||
|
|
||||||
This crate uses tokio with rustls for its runtime and TLS implementation.
|
This crate uses tokio with rustls for its runtime and TLS implementation.
|
||||||
|
|
@ -39,7 +39,7 @@ No other combinations are supported.
|
||||||
|
|
||||||
```rust
|
```rust
|
||||||
let address = "/dns/www.torproject.org/tcp/1000".parse()?;
|
let address = "/dns/www.torproject.org/tcp/1000".parse()?;
|
||||||
let mut transport = libp2p_community_tor::TorTransport::bootstrapped().await?;
|
let mut transport = libp2p_tor::TorTransport::bootstrapped().await?;
|
||||||
// we have achieved tor connection
|
// we have achieved tor connection
|
||||||
let _conn = transport.dial(address)?.await?;
|
let _conn = transport.dial(address)?.await?;
|
||||||
```
|
```
|
||||||
|
|
@ -52,7 +52,7 @@ use libp2p::{
|
||||||
swarm::{NetworkBehaviour, SwarmEvent},
|
swarm::{NetworkBehaviour, SwarmEvent},
|
||||||
yamux, Multiaddr, PeerId, SwarmBuilder,
|
yamux, Multiaddr, PeerId, SwarmBuilder,
|
||||||
};
|
};
|
||||||
use libp2p_community_tor::{AddressConversion, TorTransport};
|
use libp2p_tor::{AddressConversion, TorTransport};
|
||||||
use std::error::Error;
|
use std::error::Error;
|
||||||
use tor_hsservice::config::OnionServiceConfigBuilder;
|
use tor_hsservice::config::OnionServiceConfigBuilder;
|
||||||
|
|
||||||
|
|
@ -43,7 +43,7 @@
|
||||||
//! use libp2p::core::Transport;
|
//! use libp2p::core::Transport;
|
||||||
//! # async fn test_func() -> Result<(), Box<dyn std::error::Error>> {
|
//! # async fn test_func() -> Result<(), Box<dyn std::error::Error>> {
|
||||||
//! let address = "/dns/www.torproject.org/tcp/1000".parse()?;
|
//! let address = "/dns/www.torproject.org/tcp/1000".parse()?;
|
||||||
//! let mut transport = libp2p_community_tor::TorTransport::bootstrapped().await?;
|
//! let mut transport = libp2p_tor::TorTransport::bootstrapped().await?;
|
||||||
//! // we have achieved tor connection
|
//! // we have achieved tor connection
|
||||||
//! let _conn = transport.dial(address)?.await?;
|
//! let _conn = transport.dial(address)?.await?;
|
||||||
//! # Ok(())
|
//! # Ok(())
|
||||||
|
|
@ -42,7 +42,7 @@ fns = "0.0.7"
|
||||||
futures = { workspace = true }
|
futures = { workspace = true }
|
||||||
hex = { workspace = true }
|
hex = { workspace = true }
|
||||||
libp2p = { workspace = true, features = ["tcp", "yamux", "dns", "noise", "request-response", "ping", "rendezvous", "identify", "macros", "cbor", "json", "tokio", "serde", "rsa"] }
|
libp2p = { workspace = true, features = ["tcp", "yamux", "dns", "noise", "request-response", "ping", "rendezvous", "identify", "macros", "cbor", "json", "tokio", "serde", "rsa"] }
|
||||||
libp2p-community-tor = { path = "../libp2p-community-tor", features = ["listen-onion-service"] }
|
libp2p-tor = { path = "../libp2p-tor", features = ["listen-onion-service"] }
|
||||||
moka = { version = "0.12", features = ["sync", "future"] }
|
moka = { version = "0.12", features = ["sync", "future"] }
|
||||||
monero = { workspace = true }
|
monero = { workspace = true }
|
||||||
monero-rpc = { path = "../monero-rpc" }
|
monero-rpc = { path = "../monero-rpc" }
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,7 @@ pub mod transport {
|
||||||
|
|
||||||
use arti_client::{config::onion_service::OnionServiceConfigBuilder, TorClient};
|
use arti_client::{config::onion_service::OnionServiceConfigBuilder, TorClient};
|
||||||
use libp2p::{core::transport::OptionalTransport, dns, identity, tcp, Transport};
|
use libp2p::{core::transport::OptionalTransport, dns, identity, tcp, Transport};
|
||||||
use libp2p_community_tor::AddressConversion;
|
use libp2p_tor::AddressConversion;
|
||||||
use tor_rtcompat::tokio::TokioRustlsRuntime;
|
use tor_rtcompat::tokio::TokioRustlsRuntime;
|
||||||
|
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|
@ -50,10 +50,8 @@ pub mod transport {
|
||||||
num_intro_points: u8,
|
num_intro_points: u8,
|
||||||
) -> Result<OnionTransportWithAddresses> {
|
) -> Result<OnionTransportWithAddresses> {
|
||||||
let (maybe_tor_transport, onion_addresses) = if let Some(tor_client) = maybe_tor_client {
|
let (maybe_tor_transport, onion_addresses) = if let Some(tor_client) = maybe_tor_client {
|
||||||
let mut tor_transport = libp2p_community_tor::TorTransport::from_client(
|
let mut tor_transport =
|
||||||
tor_client,
|
libp2p_tor::TorTransport::from_client(tor_client, AddressConversion::DnsOnly);
|
||||||
AddressConversion::DnsOnly,
|
|
||||||
);
|
|
||||||
|
|
||||||
let addresses = if register_hidden_service {
|
let addresses = if register_hidden_service {
|
||||||
let onion_service_config = OnionServiceConfigBuilder::default()
|
let onion_service_config = OnionServiceConfigBuilder::default()
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ use libp2p::core::transport::{Boxed, OptionalTransport};
|
||||||
use libp2p::dns;
|
use libp2p::dns;
|
||||||
use libp2p::tcp;
|
use libp2p::tcp;
|
||||||
use libp2p::{identity, PeerId, Transport};
|
use libp2p::{identity, PeerId, Transport};
|
||||||
use libp2p_community_tor::{AddressConversion, TorTransport};
|
use libp2p_tor::{AddressConversion, TorTransport};
|
||||||
use tor_rtcompat::tokio::TokioRustlsRuntime;
|
use tor_rtcompat::tokio::TokioRustlsRuntime;
|
||||||
|
|
||||||
/// Creates the libp2p transport for the swap CLI.
|
/// Creates the libp2p transport for the swap CLI.
|
||||||
|
|
@ -27,7 +27,7 @@ pub fn new(
|
||||||
let tcp_with_dns = dns::tokio::Transport::system(tcp)?;
|
let tcp_with_dns = dns::tokio::Transport::system(tcp)?;
|
||||||
|
|
||||||
let maybe_tor_transport: OptionalTransport<TorTransport> = match maybe_tor_client {
|
let maybe_tor_transport: OptionalTransport<TorTransport> = match maybe_tor_client {
|
||||||
Some(client) => OptionalTransport::some(libp2p_community_tor::TorTransport::from_client(
|
Some(client) => OptionalTransport::some(libp2p_tor::TorTransport::from_client(
|
||||||
client,
|
client,
|
||||||
AddressConversion::IpAndDns,
|
AddressConversion::IpAndDns,
|
||||||
)),
|
)),
|
||||||
|
|
|
||||||
|
|
@ -42,7 +42,7 @@ pub fn init(
|
||||||
"libp2p_core",
|
"libp2p_core",
|
||||||
"libp2p_tcp",
|
"libp2p_tcp",
|
||||||
"libp2p_noise",
|
"libp2p_noise",
|
||||||
"libp2p_community_tor",
|
"libp2p_tor",
|
||||||
// Specific libp2p module targets that appear in logs
|
// Specific libp2p module targets that appear in logs
|
||||||
"libp2p_core::transport",
|
"libp2p_core::transport",
|
||||||
"libp2p_core::transport::choice",
|
"libp2p_core::transport::choice",
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue