diff --git a/Cargo.lock b/Cargo.lock index a712105..681518e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -135,6 +135,12 @@ dependencies = [ "critical-section", ] +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + [[package]] name = "authenticator" version = "0.1.0" @@ -469,6 +475,22 @@ dependencies = [ "url", ] +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + [[package]] name = "cpufeatures" version = "0.2.12" @@ -674,12 +696,37 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" +[[package]] +name = "encoding_rs" +version = "0.8.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +dependencies = [ + "cfg-if", +] + [[package]] name = "equivalent" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +[[package]] +name = "errno" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "fastrand" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" + [[package]] name = "fiat-crypto" version = "0.2.9" @@ -704,6 +751,21 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + [[package]] name = "form_urlencoded" version = "1.2.1" @@ -832,6 +894,25 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +[[package]] +name = "h2" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "hash32" version = "0.2.1" @@ -1002,6 +1083,7 @@ dependencies = [ "bytes", "futures-channel", "futures-util", + "h2", "http", "http-body", "httparse", @@ -1031,6 +1113,22 @@ dependencies = [ "webpki-roots", ] +[[package]] +name = "hyper-tls" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" +dependencies = [ + "bytes", + "http-body-util", + "hyper", + "hyper-util", + "native-tls", + "tokio", + "tokio-native-tls", + "tower-service", +] + [[package]] name = "hyper-util" version = "0.1.6" @@ -1139,6 +1237,12 @@ dependencies = [ "libc", ] +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + [[package]] name = "litrs" version = "0.4.1" @@ -1180,9 +1284,8 @@ checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" [[package]] name = "mainline" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b751ffb57303217bcae8f490eee6044a5b40eadf6ca05ff476cad37e7b7970d" +version = "3.0.0" +source = "git+https://github.com/pubky/mainline?branch=dev#47edb4617f3ce25883b889064de5c7d257848b8f" dependencies = [ "bytes", "crc", @@ -1255,6 +1358,23 @@ dependencies = [ "getrandom", ] +[[package]] +name = "native-tls" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" +dependencies = [ + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + [[package]] name = "nu-ansi-term" version = "0.46.0" @@ -1292,6 +1412,50 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" +[[package]] +name = "openssl" +version = "0.10.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" +dependencies = [ + "bitflags", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + [[package]] name = "overload" version = "0.1.1" @@ -1424,8 +1588,8 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkarr" -version = "2.2.0" -source = "git+https://github.com/Pubky/pkarr?branch=v3#17975121c809d97dcad907fbb2ffc782e994d270" +version = "3.0.0" +source = "git+https://github.com/Pubky/pkarr?branch=v3#0622003a851dfc34c4c3b44daaf13c99880d300a" dependencies = [ "base32", "bytes", @@ -1434,18 +1598,19 @@ dependencies = [ "ed25519-dalek", "flume", "futures", + "getrandom", "js-sys", "lru", "mainline", + "once_cell", "rand", + "reqwest", "self_cell", "serde", "simple-dns", "thiserror", + "tokio", "tracing", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", ] [[package]] @@ -1458,6 +1623,12 @@ dependencies = [ "spki", ] +[[package]] +name = "pkg-config" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" + [[package]] name = "poly1305" version = "0.8.0" @@ -1734,26 +1905,30 @@ checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "reqwest" -version = "0.12.5" +version = "0.12.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" +checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" dependencies = [ "base64 0.22.1", "bytes", "cookie", "cookie_store", + "encoding_rs", "futures-core", "futures-util", + "h2", "http", "http-body", "http-body-util", "hyper", "hyper-rustls", + "hyper-tls", "hyper-util", "ipnet", "js-sys", "log", "mime", + "native-tls", "once_cell", "percent-encoding", "pin-project-lite", @@ -1765,7 +1940,9 @@ dependencies = [ "serde_json", "serde_urlencoded", "sync_wrapper 1.0.1", + "system-configuration", "tokio", + "tokio-native-tls", "tokio-rustls", "tower-service", "url", @@ -1773,7 +1950,7 @@ dependencies = [ "wasm-bindgen-futures", "web-sys", "webpki-roots", - "winreg", + "windows-registry", ] [[package]] @@ -1833,6 +2010,19 @@ dependencies = [ "semver", ] +[[package]] +name = "rustix" +version = "0.38.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +dependencies = [ + "bitflags", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + [[package]] name = "rustls" version = "0.23.12" @@ -1895,12 +2085,44 @@ dependencies = [ "cipher", ] +[[package]] +name = "schannel" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" +dependencies = [ + "windows-sys 0.59.0", +] + [[package]] name = "scopeguard" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +[[package]] +name = "security-framework" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" +dependencies = [ + "bitflags", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "self_cell" version = "1.0.4" @@ -2148,6 +2370,9 @@ name = "sync_wrapper" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +dependencies = [ + "futures-core", +] [[package]] name = "synchronoise" @@ -2158,6 +2383,40 @@ dependencies = [ "crossbeam-queue", ] +[[package]] +name = "system-configuration" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" +dependencies = [ + "bitflags", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "tempfile" +version = "3.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +dependencies = [ + "cfg-if", + "fastrand", + "once_cell", + "rustix", + "windows-sys 0.59.0", +] + [[package]] name = "thiserror" version = "1.0.62" @@ -2263,6 +2522,16 @@ dependencies = [ "syn", ] +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", +] + [[package]] name = "tokio-rustls" version = "0.26.0" @@ -2517,6 +2786,12 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + [[package]] name = "version_check" version = "0.9.4" @@ -2646,6 +2921,36 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", +] + [[package]] name = "windows-sys" version = "0.48.0" @@ -2664,6 +2969,15 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + [[package]] name = "windows-targets" version = "0.48.5" @@ -2794,16 +3108,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "winreg" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - [[package]] name = "zeroize" version = "1.8.1" diff --git a/Cargo.toml b/Cargo.toml index 8514809..017397d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ members = [ resolver = "2" [workspace.dependencies] -pkarr = { git = "https://github.com/Pubky/pkarr", branch = "v3", package = "pkarr", features = ["async"] } +pkarr = { git = "https://github.com/Pubky/pkarr", branch = "v3", package = "pkarr" } serde = { version = "^1.0.209", features = ["derive"] } [profile.release] diff --git a/pubky-homeserver/src/config.rs b/pubky-homeserver/src/config.rs index 55f015c..4645f4c 100644 --- a/pubky-homeserver/src/config.rs +++ b/pubky-homeserver/src/config.rs @@ -55,7 +55,7 @@ impl Config { /// Testnet configurations pub fn testnet() -> Self { - let testnet = pkarr::mainline::Testnet::new(10); + let testnet = pkarr::mainline::Testnet::new(10).unwrap(); info!(?testnet.bootstrap, "Testnet bootstrap nodes"); let bootstrap = Some(testnet.bootstrap.to_owned()); diff --git a/pubky-homeserver/src/pkarr.rs b/pubky-homeserver/src/pkarr.rs index cf4d7b7..2302ab9 100644 --- a/pubky-homeserver/src/pkarr.rs +++ b/pubky-homeserver/src/pkarr.rs @@ -2,11 +2,11 @@ use pkarr::{ dns::{rdata::SVCB, Packet}, - Keypair, PkarrClientAsync, SignedPacket, + Keypair, SignedPacket, }; pub async fn publish_server_packet( - pkarr_client: PkarrClientAsync, + pkarr_client: pkarr::Client, keypair: &Keypair, domain: &str, port: u16, diff --git a/pubky-homeserver/src/server.rs b/pubky-homeserver/src/server.rs index c94a803..3b39631 100644 --- a/pubky-homeserver/src/server.rs +++ b/pubky-homeserver/src/server.rs @@ -7,7 +7,7 @@ use tracing::{debug, info, warn}; use pkarr::{ mainline::dht::{DhtSettings, Testnet}, - PkarrClient, PkarrClientAsync, PublicKey, Settings, + PublicKey, Settings, }; use crate::{config::Config, database::DB, pkarr::publish_server_packet}; @@ -23,7 +23,7 @@ pub struct Homeserver { pub(crate) struct AppState { pub verifier: AuthVerifier, pub db: DB, - pub pkarr_client: PkarrClientAsync, + pub pkarr_client: pkarr::Client, } impl Homeserver { @@ -34,15 +34,14 @@ impl Homeserver { let db = DB::open(&config.storage()?)?; - let pkarr_client = PkarrClient::new(Settings { + let pkarr_client = pkarr::Client::new(Settings { dht: DhtSettings { bootstrap: config.bootstsrap(), request_timeout: config.dht_request_timeout(), ..Default::default() }, ..Default::default() - })? - .as_async(); + })?; let state = AppState { verifier: AuthVerifier::default(), diff --git a/pubky/Cargo.toml b/pubky/Cargo.toml index 6871377..9caaf33 100644 --- a/pubky/Cargo.toml +++ b/pubky/Cargo.toml @@ -18,7 +18,7 @@ bytes = "^1.7.1" base64 = "0.22.1" pubky-common = { version = "0.1.0", path = "../pubky-common" } -pkarr = { workspace = true, features = ["async"] } +pkarr = { workspace = true } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] reqwest = { version = "0.12.5", features = ["cookies", "rustls-tls"], default-features = false } diff --git a/pubky/src/lib.rs b/pubky/src/lib.rs index 2b6cf42..9e22a3b 100644 --- a/pubky/src/lib.rs +++ b/pubky/src/lib.rs @@ -14,9 +14,6 @@ use std::{ use wasm_bindgen::prelude::*; -#[cfg(not(target_arch = "wasm32"))] -use ::pkarr::PkarrClientAsync; - pub use error::Error; #[cfg(not(target_arch = "wasm32"))] @@ -27,7 +24,7 @@ pub use crate::shared::list_builder::ListBuilder; pub struct PubkyClient { http: reqwest::Client, #[cfg(not(target_arch = "wasm32"))] - pub(crate) pkarr: PkarrClientAsync, + pub(crate) pkarr: pkarr::Client, /// A cookie jar for nodejs fetch. #[cfg(target_arch = "wasm32")] pub(crate) session_cookies: Arc>>, diff --git a/pubky/src/native.rs b/pubky/src/native.rs index 2a77039..c2c031b 100644 --- a/pubky/src/native.rs +++ b/pubky/src/native.rs @@ -13,7 +13,7 @@ use url::Url; use pkarr::Keypair; -use ::pkarr::{mainline::dht::Testnet, PkarrClient, PublicKey, SignedPacket}; +use ::pkarr::{mainline::dht::Testnet, PublicKey, SignedPacket}; use crate::{ error::{Error, Result}, @@ -69,7 +69,7 @@ impl PubkyClientBuilder { .user_agent(DEFAULT_USER_AGENT) .build() .unwrap(), - pkarr: PkarrClient::new(self.pkarr_settings).unwrap().as_async(), + pkarr: pkarr::Client::new(self.pkarr_settings).unwrap(), } } } diff --git a/pubky/src/shared/auth.rs b/pubky/src/shared/auth.rs index 60ae1ae..ceaddbe 100644 --- a/pubky/src/shared/auth.rs +++ b/pubky/src/shared/auth.rs @@ -238,7 +238,7 @@ mod tests { #[tokio::test] async fn basic_authn() { - let testnet = Testnet::new(10); + let testnet = Testnet::new(10).unwrap(); let server = Homeserver::start_test(&testnet).await.unwrap(); let client = PubkyClient::test(&testnet); @@ -279,7 +279,7 @@ mod tests { #[tokio::test] async fn authz() { - let testnet = Testnet::new(10); + let testnet = Testnet::new(10).unwrap(); let server = Homeserver::start_test(&testnet).await.unwrap(); let keypair = Keypair::random(); @@ -305,10 +305,9 @@ mod tests { .unwrap(); } - let session = pubkyauth_response.await.unwrap().unwrap(); + let response = pubkyauth_response.await.unwrap(); - assert_eq!(session.pubky(), &pubky); - assert_eq!(session.capabilities(), &capabilities.0); + assert_eq!(&response, &pubky); // Test access control enforcement diff --git a/pubky/src/shared/pkarr.rs b/pubky/src/shared/pkarr.rs index 85055ef..82f3adf 100644 --- a/pubky/src/shared/pkarr.rs +++ b/pubky/src/shared/pkarr.rs @@ -186,23 +186,22 @@ mod tests { Packet, }, mainline::{dht::DhtSettings, Testnet}, - Keypair, PkarrClient, Settings, SignedPacket, + Keypair, Settings, SignedPacket, }; use pubky_homeserver::Homeserver; #[tokio::test] async fn resolve_endpoint_https() { - let testnet = Testnet::new(10); + let testnet = Testnet::new(10).unwrap(); - let pkarr_client = PkarrClient::new(Settings { + let pkarr_client = pkarr::Client::new(Settings { dht: DhtSettings { bootstrap: Some(testnet.bootstrap.clone()), ..Default::default() }, ..Default::default() }) - .unwrap() - .as_async(); + .unwrap(); let domain = "example.com"; let mut target; @@ -281,19 +280,18 @@ mod tests { #[tokio::test] async fn resolve_homeserver() { - let testnet = Testnet::new(10); + let testnet = Testnet::new(10).unwrap(); let server = Homeserver::start_test(&testnet).await.unwrap(); // Publish an intermediate controller of the homeserver - let pkarr_client = PkarrClient::new(Settings { + let pkarr_client = pkarr::Client::new(Settings { dht: DhtSettings { bootstrap: Some(testnet.bootstrap.clone()), ..Default::default() }, ..Default::default() }) - .unwrap() - .as_async(); + .unwrap(); let intermediate = Keypair::random(); diff --git a/pubky/src/shared/public.rs b/pubky/src/shared/public.rs index becf2fb..43973d8 100644 --- a/pubky/src/shared/public.rs +++ b/pubky/src/shared/public.rs @@ -104,7 +104,7 @@ mod tests { #[tokio::test] async fn put_get_delete() { - let testnet = Testnet::new(10); + let testnet = Testnet::new(10).unwrap(); let server = Homeserver::start_test(&testnet).await.unwrap(); let client = PubkyClient::test(&testnet); @@ -131,7 +131,7 @@ mod tests { #[tokio::test] async fn unauthorized_put_delete() { - let testnet = Testnet::new(10); + let testnet = Testnet::new(10).unwrap(); let server = Homeserver::start_test(&testnet).await.unwrap(); let client = PubkyClient::test(&testnet); @@ -197,7 +197,7 @@ mod tests { #[tokio::test] async fn list() { - let testnet = Testnet::new(10); + let testnet = Testnet::new(10).unwrap(); let server = Homeserver::start_test(&testnet).await.unwrap(); let client = PubkyClient::test(&testnet); @@ -401,7 +401,7 @@ mod tests { #[tokio::test] async fn list_shallow() { - let testnet = Testnet::new(10); + let testnet = Testnet::new(10).unwrap(); let server = Homeserver::start_test(&testnet).await.unwrap(); let client = PubkyClient::test(&testnet); @@ -612,7 +612,7 @@ mod tests { #[tokio::test] async fn list_events() { - let testnet = Testnet::new(10); + let testnet = Testnet::new(10).unwrap(); let server = Homeserver::start_test(&testnet).await.unwrap(); let client = PubkyClient::test(&testnet); @@ -718,7 +718,7 @@ mod tests { #[tokio::test] async fn read_after_event() { - let testnet = Testnet::new(10); + let testnet = Testnet::new(10).unwrap(); let server = Homeserver::start_test(&testnet).await.unwrap(); let client = PubkyClient::test(&testnet); @@ -768,7 +768,7 @@ mod tests { #[tokio::test] async fn dont_delete_shared_blobs() { - let testnet = Testnet::new(10); + let testnet = Testnet::new(10).unwrap(); let homeserver = Homeserver::start_test(&testnet).await.unwrap(); let client = PubkyClient::test(&testnet);