Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
473 changes: 244 additions & 229 deletions Cargo.lock

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -96,15 +96,15 @@ tokio = { version = "1", features = ["rt-multi-thread", "time", "macros", "sync"
tokio-util = { version = "0.7", features = ["io", "codec", "rt"] }

# Tor/Arti crates
arti-client = { git = "https://github.com/eigenwallet/arti", branch = "downgraded_rusqlite_arti_2_2_0", default-features = false }
arti-client = { git = "https://github.com/eigenwallet/arti", branch = "downgraded_rusqlite_arti_2_4_0", default-features = false }
libp2p-tor = { path = "./libp2p-tor" }
safelog = { git = "https://github.com/eigenwallet/arti", branch = "downgraded_rusqlite_arti_2_2_0" }
tor-cell = { git = "https://github.com/eigenwallet/arti", branch = "downgraded_rusqlite_arti_2_2_0" }
tor-hscrypto = { git = "https://github.com/eigenwallet/arti", branch = "downgraded_rusqlite_arti_2_2_0" }
tor-hsservice = { git = "https://github.com/eigenwallet/arti", branch = "downgraded_rusqlite_arti_2_2_0" }
tor-llcrypto = { git = "https://github.com/eigenwallet/arti", branch = "downgraded_rusqlite_arti_2_2_0" }
tor-proto = { git = "https://github.com/eigenwallet/arti", branch = "downgraded_rusqlite_arti_2_2_0" }
tor-rtcompat = { git = "https://github.com/eigenwallet/arti", branch = "downgraded_rusqlite_arti_2_2_0" }
safelog = { git = "https://github.com/eigenwallet/arti", branch = "downgraded_rusqlite_arti_2_4_0" }
tor-cell = { git = "https://github.com/eigenwallet/arti", branch = "downgraded_rusqlite_arti_2_4_0" }
tor-hscrypto = { git = "https://github.com/eigenwallet/arti", branch = "downgraded_rusqlite_arti_2_4_0" }
tor-hsservice = { git = "https://github.com/eigenwallet/arti", branch = "downgraded_rusqlite_arti_2_4_0" }
tor-llcrypto = { git = "https://github.com/eigenwallet/arti", branch = "downgraded_rusqlite_arti_2_4_0" }
tor-proto = { git = "https://github.com/eigenwallet/arti", branch = "downgraded_rusqlite_arti_2_4_0" }
tor-rtcompat = { git = "https://github.com/eigenwallet/arti", branch = "downgraded_rusqlite_arti_2_4_0" }

# Terminal Utilities
console = "0.16"
Expand Down
2 changes: 1 addition & 1 deletion libp2p-rendezvous-node/src/tor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ pub async fn create_tor_client(data_dir: &Path) -> Result<Arc<TorClient<TokioRus
.await
.context("Failed to create unbootstrapped Tor client")?;

Ok(Arc::new(tor_client))
Ok(tor_client)
}

/// Bootstraps an existing Tor client
Expand Down
2 changes: 1 addition & 1 deletion libp2p-tor/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ impl TorTransport {
builder: &TorClientBuilder<TokioRustlsRuntime>,
conversion_mode: AddressConversion,
) -> Result<Self, TorError> {
let client = Arc::new(builder.create_unbootstrapped()?);
let client = builder.create_unbootstrapped()?;

Ok(Self::from_client(client, conversion_mode))
}
Expand Down
2 changes: 0 additions & 2 deletions monero-rpc-pool/src/bin/stress_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,6 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
.create_unbootstrapped_async()
.await?;

let client = std::sync::Arc::new(client);

let client_clone = client.clone();
client_clone
.bootstrap()
Expand Down
2 changes: 0 additions & 2 deletions monero-rpc-pool/src/bin/stress_test_downloader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,6 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
.create_unbootstrapped_async()
.await?;

let client = std::sync::Arc::new(client);

let client_clone = client.clone();
client_clone
.bootstrap()
Expand Down
2 changes: 0 additions & 2 deletions monero-rpc-pool/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,6 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
.create_unbootstrapped_async()
.await?;

let client = std::sync::Arc::new(client);

let client_clone = client.clone();
tokio::spawn(async move {
match client_clone.bootstrap().await {
Expand Down
2 changes: 1 addition & 1 deletion swap-p2p/examples/fetch_quotes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ async fn main() -> Result<()> {
.config(config)
.create_bootstrapped()
.await?;
Some(Arc::new(tor_client))
Some(tor_client)
} else {
None
};
Expand Down
2 changes: 1 addition & 1 deletion swap/src/common/tor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ pub async fn create_tor_client(
.create_unbootstrapped_async()
.await?;

Ok(Arc::new(tor_client))
Ok(tor_client)
}

/// Bootstraps an existing Tor client
Expand Down
Loading