Skip to content
Draft
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
1 change: 0 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion pkarr-republisher/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ anyhow.workspace = true
pkarr = { workspace = true, features = ["default"] }
tokio = { workspace = true, features = ["full"] }
tracing.workspace = true
futures-lite = { version = "2.6.1" }
thiserror.workspace = true

# bin dependencies
Expand Down
4 changes: 2 additions & 2 deletions pkarr-republisher/examples/publish_and_save.rs
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,9 @@ async fn publish_records(num_records: usize, thread_id: usize) -> Vec<Keypair> {
.build(&key)
.unwrap();
let elapsed_time = instant.elapsed().as_millis();
match rclient.publish(packet, None).await {
match rclient.publish(packet).await {
Ok(info) => {
tracing::info!("- t{thread_id:<2} {i:>3}/{num_records} Published {} within {elapsed_time}ms to {} nodes {} attempts", key.public_key(), info.published_nodes_count, info.attempts_needed);
tracing::info!("- t{thread_id:<2} {i:>3}/{num_records} Published {} within {elapsed_time}ms stored_at={:?} attempts={}", key.public_key(), info.stored_at, info.attempts_needed);
records.push(key);
}
Err(e) => {
Expand Down
113 changes: 0 additions & 113 deletions pkarr-republisher/examples/read_and_verify.rs

This file was deleted.

2 changes: 0 additions & 2 deletions pkarr-republisher/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@ mod multi_republisher;
mod publisher;
mod republisher;
mod resilient_client;
mod verify;

pub use multi_republisher::*;
pub use publisher::*;
pub use republisher::*;
pub use resilient_client::*;
pub use verify::count_key_on_dht;
55 changes: 12 additions & 43 deletions pkarr-republisher/src/multi_republisher.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
use crate::{
republisher::{RepublishError, RepublishInfo, RepublisherSettings},
ResilientClient, ResilientClientBuilderError,
};
use crate::republisher::{RepublishError, RepublishInfo, RepublisherSettings};
use crate::{ResilientClient, ResilientClientBuilderError};
use pkarr::PublicKey;
use std::collections::HashMap;
use tokio::time::Instant;
Expand Down Expand Up @@ -113,19 +111,14 @@ impl MultiRepublisher {
ResilientClient::new_with_client(client, self.settings.retry_settings.clone())?;
for key in public_keys {
let start = Instant::now();
let res = rclient
.republish(
key.clone(),
Some(self.settings.min_sufficient_node_publish_count),
)
.await;
let res = rclient.republish(key.clone()).await;

let elapsed = start.elapsed().as_millis();
match &res {
Ok(info) => {
tracing::info!(
"Republished {key} successfully on {} nodes within {elapsed}ms. attemps={}",
info.published_nodes_count,
"Republished {key} successfully within {elapsed}ms. stored_at={:?} attempts={}",
info.stored_at,
info.attempts_needed
)
}
Expand Down Expand Up @@ -185,8 +178,6 @@ impl MultiRepublisher {

#[cfg(test)]
mod tests {
use std::num::NonZeroU8;

use pkarr::{dns::Name, Keypair, PublicKey};

use crate::{multi_republisher::MultiRepublisher, republisher::RepublisherSettings};
Expand All @@ -211,45 +202,23 @@ mod tests {
.build()
.unwrap();
let mut pkarr_builder = pkarr::ClientBuilder::default();
pkarr_builder.bootstrap(&dht.bootstrap).no_relays();
pkarr_builder
.no_default_network()
.bootstrap(&dht.bootstrap)
.no_relays();
let pkarr_client = pkarr_builder.clone().build().unwrap();

let public_keys = publish_sample_packets(&pkarr_client, 1).await;
let public_key = public_keys.first().unwrap().clone();

let mut settings = RepublisherSettings::default();
settings
.pkarr_client(pkarr_client)
.min_sufficient_node_publish_count(NonZeroU8::new(3).unwrap());
let publisher = MultiRepublisher::new_with_settings(settings, Some(pkarr_builder));
let results = publisher.run_serially(public_keys).await.unwrap();
settings.pkarr_client(pkarr_client);
let republisher = MultiRepublisher::new_with_settings(settings, Some(pkarr_builder));
let results = republisher.run_serially(public_keys).await.unwrap();
let result = results.get(&public_key).unwrap();
if let Err(e) = result {
println!("Err {e}");
}
assert!(result.is_ok());
}

#[tokio::test]
async fn single_key_republish_insufficient() {
let dht = pkarr::mainline::Testnet::builder(3)
.seeded(false)
.build()
.unwrap();
let mut pkarr_builder = pkarr::ClientBuilder::default();
pkarr_builder.bootstrap(&dht.bootstrap).no_relays();
let pkarr_client = pkarr_builder.clone().build().unwrap();

let public_keys = publish_sample_packets(&pkarr_client, 1).await;
let public_key = public_keys.first().unwrap().clone();

let mut settings = RepublisherSettings::default();
settings
.pkarr_client(pkarr_client)
.min_sufficient_node_publish_count(NonZeroU8::new(4).unwrap());
let publisher = MultiRepublisher::new_with_settings(settings, Some(pkarr_builder));
let results = publisher.run_serially(public_keys).await.unwrap();
let result = results.get(&public_key).unwrap();
assert!(result.is_err());
}
}
Loading
Loading