diff options
Diffstat (limited to 'test_utils/src')
| -rw-r--r-- | test_utils/src/lib.rs | 2 | ||||
| -rw-r--r-- | test_utils/src/relay.rs | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/test_utils/src/lib.rs b/test_utils/src/lib.rs index 7d79cff..3ae004f 100644 --- a/test_utils/src/lib.rs +++ b/test_utils/src/lib.rs | |||
| @@ -13,7 +13,7 @@ use futures::{executor::block_on, future::join_all}; | |||
| 13 | use git::GitTestRepo; | 13 | use git::GitTestRepo; |
| 14 | use git2::{Signature, Time}; | 14 | use git2::{Signature, Time}; |
| 15 | use nostr::{self, Kind, Tag, nips::nip65::RelayMetadata}; | 15 | use nostr::{self, Kind, Tag, nips::nip65::RelayMetadata}; |
| 16 | use nostr_database::NostrEventsDatabase; | 16 | use nostr_database::NostrDatabase; |
| 17 | use nostr_lmdb::NostrLMDB; | 17 | use nostr_lmdb::NostrLMDB; |
| 18 | use nostr_sdk::{Client, Event, NostrSigner, TagStandard, serde_json}; | 18 | use nostr_sdk::{Client, Event, NostrSigner, TagStandard, serde_json}; |
| 19 | use once_cell::sync::Lazy; | 19 | use once_cell::sync::Lazy; |
diff --git a/test_utils/src/relay.rs b/test_utils/src/relay.rs index b14f532..8a982a4 100644 --- a/test_utils/src/relay.rs +++ b/test_utils/src/relay.rs | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | use std::collections::HashMap; | 1 | use std::collections::HashMap; |
| 2 | 2 | ||
| 3 | use anyhow::{Result, bail}; | 3 | use anyhow::{Result, bail}; |
| 4 | use nostr::{ClientMessage, JsonUtil, RelayMessage}; | 4 | use nostr::{ClientMessage, JsonUtil, RelayMessage, filter::MatchEventOptions}; |
| 5 | 5 | ||
| 6 | use crate::CliTester; | 6 | use crate::CliTester; |
| 7 | 7 | ||
| @@ -105,7 +105,11 @@ impl<'a> Relay<'a> { | |||
| 105 | &self | 105 | &self |
| 106 | .events | 106 | .events |
| 107 | .iter() | 107 | .iter() |
| 108 | .filter(|e| filters.iter().any(|filter| filter.match_event(e))) | 108 | .filter(|e| { |
| 109 | filters | ||
| 110 | .iter() | ||
| 111 | .any(|filter| filter.match_event(e, MatchEventOptions::default())) | ||
| 112 | }) | ||
| 109 | .filter(|_| true) | 113 | .filter(|_| true) |
| 110 | .cloned() | 114 | .cloned() |
| 111 | .collect(), | 115 | .collect(), |