chore: fix up all deps (#346)

* Fix up all deps

* Replace pkarr for pubky for keypair

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pubky-nexus"
-version = "0.2.0"
+version = "0.3.0"
 edition = "2021"
 description = "Nexus between homeservers and Pubky-App. Pubky-nexus constructs a social graph out of all of the events on pubky-core homeservers and exposes a social-media-like API capable of powerful Web-of-Trust inference."
 homepage = "https://github.com/pubky"
@@ -10,13 +10,9 @@ default-run = "service"
 build = "build.rs"
 
 [dependencies]
-bytes = "1.9.0" # Enforce this version as Pubky and Axum conflict v1.7.1 vs v1.9.0
-pkarr = { git = "https://github.com/pubky/pkarr", rev = "4269e68" } # a few commits after v3.3.1
-pubky = { git = "https://github.com/pubky/pubky", branch = "main" }
-pubky-testnet = { git = "https://github.com/pubky/pubky", branch = "main" }
-pubky-app-specs = { git = "https://github.com/pubky/pubky-app-specs", branch = "main", features = [
-    "openapi",
-] }
+pubky = "0.4.1"
+pubky-testnet = "0.1.1"
+pubky-app-specs = { version = "0.3.2", features = ["openapi"] }
 tokio = { version = "1.43.0", features = ["full"] }
 axum = "0.8.1"
 redis = { version = "0.29.0", features = ["tokio-comp", "json"] }
@@ -39,7 +35,7 @@ async-trait = "0.1.85"
 anyhow = "1.0.95"
 httpc-test = "0.1.10"
 criterion = { version = "0.5.1", features = ["async_tokio"] }
-pubky-homeserver = { git = "https://github.com/pubky/pubky", branch = "main" }
+pubky-homeserver = "0.1.1"
 rand = "0.8.5"
 rand_distr = "0.4.3"
 tokio-shared-rt = "0.1"

benches/watcher.rs

@@ -1,5 +1,5 @@
 use criterion::{criterion_group, criterion_main, Criterion};
-use pkarr::Keypair;
+use pubky::Keypair;
 use pubky_app_specs::{PubkyAppUser, PubkyAppUserLink};
 use pubky_nexus::EventProcessor;
 use pubky_testnet::Testnet;

examples/stress_network_sim.rs

@@ -1,7 +1,7 @@
 use anyhow::Result;
 use chrono::Utc;
-use pkarr::{Keypair, PublicKey};
 use pubky::Client;
+use pubky::{Keypair, PublicKey};
 use pubky_app_specs::{
     traits::{HasPath, HashId, TimestampId},
     PubkyAppBlob, PubkyAppFile, PubkyAppFollow, PubkyAppPost, PubkyAppPostKind, PubkyAppTag,

examples/test_testnet.rs

@@ -1,4 +1,4 @@
-use pkarr::Keypair;
+use pubky::Keypair;
 use pubky_testnet::Testnet;
 
 #[tokio::main]

src/models/user/mod.rs

@@ -1,6 +1,5 @@
 mod counts;
 mod details;
-//mod id;
 mod muted;
 mod relationship;
 mod search;
@@ -10,7 +9,6 @@ mod view;
 
 pub use counts::UserCounts;
 pub use details::UserDetails;
-//pub use id::PubkyId;
 pub use muted::Muted;
 pub use relationship::Relationship;
 pub use search::{UserSearch, USER_NAME_KEY_PARTS};

tests/watcher/bookmarks/del.rs

@@ -2,7 +2,7 @@ use super::utils::find_post_bookmark;
 use crate::watcher::users::utils::find_user_counts;
 use crate::watcher::utils::watcher::WatcherTest;
 use anyhow::Result;
-use pkarr::Keypair;
+use pubky::Keypair;
 use pubky_app_specs::{traits::HashId, PubkyAppBookmark, PubkyAppPost, PubkyAppUser};
 use pubky_nexus::models::post::{Bookmark, PostStream};
 

tests/watcher/bookmarks/fail_index.rs

@@ -1,7 +1,7 @@
 use crate::watcher::utils::watcher::{retrieve_and_handle_event_line, WatcherTest};
 use anyhow::Result;
 use log::error;
-use pkarr::Keypair;
+use pubky::Keypair;
 use pubky_app_specs::{traits::HashId, PubkyAppBookmark, PubkyAppPost, PubkyAppUser};
 
 /// The user profile is stored in the homeserver. Missing the author that creates the bookmark

tests/watcher/bookmarks/raw.rs

@@ -2,7 +2,7 @@ use super::utils::find_post_bookmark;
 use crate::watcher::users::utils::find_user_counts;
 use crate::watcher::utils::watcher::WatcherTest;
 use anyhow::Result;
-use pkarr::Keypair;
+use pubky::Keypair;
 use pubky_app_specs::{traits::HashId, PubkyAppBookmark, PubkyAppPost, PubkyAppUser};
 use pubky_nexus::models::post::{Bookmark, PostStream};
 

tests/watcher/bookmarks/retry_bookmark.rs

@@ -1,6 +1,6 @@
 use crate::watcher::utils::watcher::{assert_eventually_exists, WatcherTest};
 use anyhow::Result;
-use pkarr::Keypair;
+use pubky::Keypair;
 use pubky_app_specs::{traits::HashId, PubkyAppBookmark, PubkyAppUser};
 use pubky_nexus::events::{error::EventProcessorError, retry::event::RetryEvent, EventType};
 

tests/watcher/bookmarks/viewer.rs

@@ -1,7 +1,7 @@
 use super::utils::find_post_bookmark;
 use crate::watcher::utils::watcher::WatcherTest;
 use anyhow::Result;
-use pkarr::Keypair;
+use pubky::Keypair;
 use pubky_app_specs::{traits::HashId, PubkyAppBookmark, PubkyAppPost, PubkyAppUser};
 use pubky_nexus::models::post::PostStream;
 

tests/watcher/files/create.rs

@@ -3,7 +3,7 @@ use crate::{
 };
 use anyhow::Result;
 use chrono::Utc;
-use pkarr::Keypair;
+use pubky::Keypair;
 use pubky_app_specs::traits::HasPath;
 use pubky_app_specs::{PubkyAppBlob, PubkyAppFile, PubkyAppUser};
 use pubky_nexus::{

tests/watcher/files/delete.rs

@@ -3,7 +3,7 @@ use crate::{
 };
 use anyhow::Result;
 use chrono::Utc;
-use pkarr::Keypair;
+use pubky::Keypair;
 use pubky_app_specs::{traits::HasPath, PubkyAppBlob, PubkyAppFile, PubkyAppUser};
 use pubky_nexus::{
     models::{file::FileDetails, traits::Collection},

tests/watcher/follows/del.rs

@@ -2,7 +2,7 @@ use super::utils::find_follow_relationship;
 use crate::watcher::users::utils::find_user_counts;
 use crate::watcher::utils::watcher::WatcherTest;
 use anyhow::Result;
-use pkarr::Keypair;
+use pubky::Keypair;
 use pubky_app_specs::PubkyAppUser;
 use pubky_nexus::{
     models::{

tests/watcher/follows/del_friends.rs

@@ -1,7 +1,7 @@
 use crate::watcher::follows::utils::find_follow_relationship;
 use crate::watcher::utils::watcher::WatcherTest;
 use anyhow::Result;
-use pkarr::Keypair;
+use pubky::Keypair;
 use pubky_app_specs::PubkyAppUser;
 use pubky_nexus::{
     models::user::{Relationship, UserCounts},

tests/watcher/follows/del_notification.rs

@@ -1,6 +1,6 @@
 use crate::watcher::utils::watcher::WatcherTest;
 use anyhow::Result;
-use pkarr::Keypair;
+use pubky::Keypair;
 use pubky_nexus::{
     models::notification::{Notification, NotificationBody},
     types::Pagination,

tests/watcher/follows/del_sequential.rs

@@ -1,6 +1,6 @@
 use crate::watcher::utils::watcher::WatcherTest;
 use anyhow::Result;
-use pkarr::Keypair;
+use pubky::Keypair;
 use pubky_app_specs::PubkyAppUser;
 use pubky_nexus::models::notification::{Notification, NotificationBody};
 use pubky_nexus::models::user::Relationship;

tests/watcher/follows/fail_index.rs

@@ -1,7 +1,7 @@
 use crate::watcher::utils::watcher::{retrieve_and_handle_event_line, WatcherTest};
 use anyhow::Result;
 use log::error;
-use pkarr::Keypair;
+use pubky::Keypair;
 use pubky_app_specs::PubkyAppUser;
 
 /// The follower user is stored in the homeserver but it is not in sync with the graph