From d6faad17e814d252a72e3aca39a4b3898382bab9 Mon Sep 17 00:00:00 2001 From: DanConwayDev Date: Wed, 25 Sep 2024 14:37:17 +0100 Subject: chore: bump rust-nostr v0.35 bump all rust-nostr packages --- test_utils/Cargo.toml | 8 ++++---- test_utils/src/git.rs | 2 +- test_utils/src/lib.rs | 14 +++++++------- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'test_utils') diff --git a/test_utils/Cargo.toml b/test_utils/Cargo.toml index d0442ac..baed990 100644 --- a/test_utils/Cargo.toml +++ b/test_utils/Cargo.toml @@ -10,10 +10,10 @@ dialoguer = "0.10.4" directories = "5.0.1" futures = "0.3.28" git2 = "0.19.0" -nostr = "0.34.1" -nostr-database = "0.34.0" -nostr-sdk = "0.34.0" -nostr-sqlite = "0.34.0" +nostr = "0.35.0" +nostr-database = "0.35.0" +nostr-sdk = "0.35.0" +nostr-sqlite = "0.35.0" once_cell = "1.18.0" rand = "0.8" rexpect = { git = "https://github.com/rust-cli/rexpect.git", rev = "9eb61dd" } diff --git a/test_utils/src/git.rs b/test_utils/src/git.rs index 2a3d566..3c19a2c 100644 --- a/test_utils/src/git.rs +++ b/test_utils/src/git.rs @@ -25,7 +25,7 @@ impl Default for GitTestRepo { let repo_event = generate_repo_ref_event(); let coordinate = Coordinate { kind: Kind::GitRepoAnnouncement, - public_key: repo_event.author(), + public_key: repo_event.pubkey, identifier: repo_event.identifier().unwrap().to_string(), relays: vec![ "ws://localhost:8055".to_string(), diff --git a/test_utils/src/lib.rs b/test_utils/src/lib.rs index be51ed9..f329681 100644 --- a/test_utils/src/lib.rs +++ b/test_utils/src/lib.rs @@ -10,7 +10,7 @@ use dialoguer::theme::{ColorfulTheme, Theme}; use futures::executor::block_on; use git::GitTestRepo; use nostr::{self, nips::nip65::RelayMetadata, Kind, Tag}; -use nostr_database::{NostrDatabase, Order}; +use nostr_database::NostrDatabase; use nostr_sdk::{serde_json, Client, NostrSigner, TagStandard}; use nostr_sqlite::SQLiteDatabase; use once_cell::sync::Lazy; @@ -1064,7 +1064,7 @@ pub async fn get_events_from_cache( ) -> Result> { get_local_cache_database(git_repo_path) .await? - .query(filters.clone(), Order::Asc) + .query(filters.clone()) .await .context( "cannot execute query on opened git repo nostr cache database .git/nostr-cache.sqlite", @@ -1091,10 +1091,10 @@ pub fn get_proposal_branch_name_from_events( branch_name_in_event: &str, ) -> Result { for event in events { - if event.tags().iter().any(|t| { - !t.as_vec()[1].eq("revision-root") - && event.tags().iter().any(|t| { - t.as_vec()[0].eq("branch-name") && t.as_vec()[1].eq(branch_name_in_event) + if event.tags.iter().any(|t| { + !t.as_slice()[1].eq("revision-root") + && event.tags.iter().any(|t| { + t.as_slice()[0].eq("branch-name") && t.as_slice()[1].eq(branch_name_in_event) }) }) { return Ok(format!( @@ -1379,7 +1379,7 @@ fn get_first_proposal_event_id() -> Result { .find(|e| { e.tags .iter() - .any(|t| t.as_vec()[1].eq(&FEATURE_BRANCH_NAME_1)) + .any(|t| t.as_slice()[1].eq(&FEATURE_BRANCH_NAME_1)) }) .unwrap() .id; -- cgit v1.2.3