Simplify testnet setup

pubky · Jan 9, 2025 · 4da5fa5 · 4da5fa5
1 parent e4c443a
commit 4da5fa5
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 26 deletions.
diff --git a/examples/new_homeserver_user.rs b/examples/new_homeserver_user.rs
@@ -1,6 +1,5 @@
 use anyhow::Result;
 use log::info;
-use mainline::Testnet;
 use pubky::Client;
 use pubky_app_specs::{traits::HasPath, PubkyAppUser, PubkyAppUserLink, PROTOCOL};
 use pubky_common::crypto::{Keypair, PublicKey};
@@ -13,13 +12,7 @@ async fn main() -> Result<()> {
 
     // Initialize the Client based on configuration
     let client = match config.testnet {
-        true => {
-            let testnet = Testnet {
-                bootstrap: vec![config.bootstrap.clone()],
-                nodes: vec![],
-            };
-            Client::builder().testnet(&testnet).build()?
-        }
+        true => Client::testnet()?,
         false => Client::new()?,
     };
 

diff --git a/examples/stress_network_sim.rs b/examples/stress_network_sim.rs
@@ -1,6 +1,5 @@
 use anyhow::Result;
 use chrono::Utc;
-use mainline::Testnet;
 use pubky::Client;
 use pubky_app_specs::{
     traits::{HashId, TimestampId},
@@ -43,13 +42,7 @@ async fn main() -> Result<()> {
 
     // Initialize the Client based on configuration
     let client = match config.testnet {
-        true => {
-            let testnet = Testnet {
-                bootstrap: vec![config.bootstrap.clone()],
-                nodes: vec![],
-            };
-            Client::builder().testnet(&testnet).build()?
-        }
+        true => Client::testnet()?,
         false => Client::new()?,
     };
 

diff --git a/src/config.rs b/src/config.rs
@@ -16,7 +16,6 @@ pub struct Config {
     pub server_port: String,
     pub reindex: bool,
     pub testnet: bool,
-    pub bootstrap: String,
     pub homeserver: String,
     pub events_limit: u32,
     pub watcher_sleep: u64,
@@ -46,7 +45,6 @@ impl Config {
                 .unwrap_or_else(|_| "false".to_string())
                 .parse()
                 .unwrap_or(true),
-            bootstrap: env::var("BOOTSTRAP").unwrap_or_else(|_| "127.0.0.1:6881".to_string()),
             homeserver: env::var("HOMESERVER").expect("HOMESERVER pubky id not set"),
             events_limit: env::var("EVENTS_LIMIT")
                 .unwrap_or("1000".to_string())

diff --git a/src/db/connectors/pubky.rs b/src/db/connectors/pubky.rs
@@ -51,19 +51,16 @@ impl PubkyConnector {
         let pubky_client = match testnet {
             Some(testnet) => Client::builder().testnet(testnet).build()?,
             None => match config.testnet {
-                true => {
-                    let testnet = Testnet {
-                        bootstrap: vec![config.bootstrap.clone()],
-                        nodes: vec![],
-                    };
-                    Client::builder().testnet(&testnet).build()?
-                }
+                true => Client::testnet()?,
                 false => Client::new()?,
             },
         };
+
+        println!("CLIEEENNNNNNNNNNNNT, {:?}", pubky_client);
         let manager = Self {
             pubky_client: Arc::new(pubky_client),
         };
+
         PUBKY_CONNECTOR_SINGLETON
             .set(manager)
             .map_err(|_| PubkyConnectorError::AlreadyInitialized)?;

diff --git a/src/events/processor.rs b/src/events/processor.rs
@@ -62,6 +62,7 @@ impl EventProcessor {
         let res: String;
         {
             let pubky_client = PubkyConnector::get_pubky_client()?;
+            debug!("BEFORE PUBKY CLIENT");
             res = pubky_client
                 .get(format!(
                     "https://{}/events/?cursor={}&limit={}",
@@ -71,6 +72,7 @@ impl EventProcessor {
                 .await?
                 .text()
                 .await?;
+            debug!("AFTER PUBKY CLIENT");
         }
 
         let lines: Vec<String> = res.trim().split('\n').map(|s| s.to_string()).collect();

diff --git a/src/models/homeserver.rs b/src/models/homeserver.rs
@@ -39,7 +39,7 @@ impl Homeserver {
 
     pub async fn from_config(config: &Config) -> Result<Homeserver, DynError> {
         let homeserver_id = config.homeserver.clone();
-
+        println!("HOMESERVERRRRRRRRRRRRRRRRRRRRRRRR {}", homeserver_id);
         // Create a PubkyId from the homeserver public key
         let id = PubkyId::try_from(&homeserver_id)?;