Skip to content

Remove admins param from create_group, refactor tests a bit #326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 24, 2025
Merged

Remove admins param from create_group, refactor tests a bit #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7d7ea57
Remove admins param from create_group, refactor tests a bit
erskingardner Aug 24, 2025
2823acd
Small fix in integation test for new create_group signature
erskingardner Aug 24, 2025
d4c298d
Point to my branch on rust-nostr
erskingardner Aug 24, 2025
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
20 changes: 10 additions & 10 deletions Cargo.lock
View file
Open in desktop

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

15 changes: 8 additions & 7 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ keyring = { version = "3.6", features = [
] }
lightning-invoice = "0.33.1"

nostr = { version = "0.43.0", git="https://github.com/rust-nostr/nostr", rev = "d70bed548d2e1399b758ad8bb7da9f058a716064", features = [ "std" ] }
nostr-mls = { version = "0.43.0", git="https://github.com/rust-nostr/nostr", rev = "d70bed548d2e1399b758ad8bb7da9f058a716064" }
nostr-mls-sqlite-storage = { version = "0.43.0", git="https://github.com/rust-nostr/nostr", rev = "d70bed548d2e1399b758ad8bb7da9f058a716064" }
nwc = { version = "0.43.0", git="https://github.com/rust-nostr/nostr", rev = "d70bed548d2e1399b758ad8bb7da9f058a716064" }
nostr-blossom = { version = "0.43.0", git="https://github.com/rust-nostr/nostr", rev = "d70bed548d2e1399b758ad8bb7da9f058a716064" }
nostr-sdk = { version = "0.43.0", git="https://github.com/rust-nostr/nostr", rev = "d70bed548d2e1399b758ad8bb7da9f058a716064", features = [
nostr = { version = "0.43.0", git="https://github.com/erskingardner/rust-nostr", rev = "03934fc8e1e1e6c831f282cde9e13589be15c21e", features = [ "std" ] }
nostr-mls = { version = "0.43.0", git="https://github.com/erskingardner/rust-nostr", rev = "03934fc8e1e1e6c831f282cde9e13589be15c21e" }
nostr-mls-sqlite-storage = { version = "0.43.0", git="https://github.com/erskingardner/rust-nostr", rev = "03934fc8e1e1e6c831f282cde9e13589be15c21e" }
nwc = { version = "0.43.0", git="https://github.com/erskingardner/rust-nostr", rev = "03934fc8e1e1e6c831f282cde9e13589be15c21e" }
nostr-blossom = { version = "0.43.0", git="https://github.com/erskingardner/rust-nostr", rev = "03934fc8e1e1e6c831f282cde9e13589be15c21e" }
nostr-sdk = { version = "0.43.0", git="https://github.com/erskingardner/rust-nostr", rev = "03934fc8e1e1e6c831f282cde9e13589be15c21e", features = [
"lmdb",
"nip04",
"nip44",
Expand All @@ -45,14 +45,15 @@ nostr-sdk = { version = "0.43.0", git="https://github.com/rust-nostr/nostr", rev
# nostr = { version = "0.43", path="../rust-nostr/crates/nostr", features = [ "std" ] }
# nostr-mls = { version = "0.43", path="../rust-nostr/mls/nostr-mls" }
# nostr-mls-sqlite-storage = { version = "0.43", path="../rust-nostr/mls/nostr-mls-sqlite-storage" }
# nwc = { version = "0.43", path="../rust-nostr/crates/nwc" }
# nostr-blossom = { version = "0.43", path="../rust-nostr/rfs/nostr-blossom" }
# nostr-sdk = { version = "0.43", path="../rust-nostr/crates/nostr-sdk", features = [
# "lmdb",
# "nip04",
# "nip44",
# "nip47",
# "nip59",
# ] }
# nwc = { version = "0.43", path="../rust-nostr/crates/nwc" }

petname = "2.0.2"
rand = "0.9"
Expand Down
7 changes: 4 additions & 3 deletions src/integration_tests/test_cases/shared/create_group.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,19 +43,20 @@ impl TestCase for CreateGroupTestCase {
.iter()
.map(|name| context.get_account(name).map(|acc| acc.pubkey))
.collect::<Result<Vec<_>, _>>()?;
let admin_pubkeys = vec![creator.pubkey];

let test_group = context
.whitenoise
.create_group(
creator,
member_pubkeys,
vec![creator.pubkey],
NostrGroupConfigData::new(
self.group_name.clone(),
self.group_description.clone(),
None,
None,
None, // image_url
None, // image_key
vec![RelayUrl::parse("ws://localhost:8080").unwrap()],
admin_pubkeys,
),
None,
)
Expand Down
3 changes: 2 additions & 1 deletion src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ pub use types::MessageWithTokens;
pub use whitenoise::accounts::Account;
pub use whitenoise::app_settings::{AppSettings, ThemeMode};
pub use whitenoise::error::WhitenoiseError;
pub use whitenoise::group_information::{GroupInformation, GroupType};
pub use whitenoise::message_aggregator::{
ChatMessage, EmojiReaction, ReactionSummary, UserReaction,
};
Expand Down Expand Up @@ -61,7 +62,7 @@ pub use nostr::Tags;

// Nostr MLS Types
/// Nostr MLS Group. Re-exported from [`nostr_mls::group_types::Group`](https://docs.rs/nostr-mls/latest/nostr_mls/group_types/struct.Group.html)
pub use nostr_mls::prelude::group_types::{Group, GroupState, GroupType};
pub use nostr_mls::prelude::group_types::{Group, GroupState};

/// Nostr MLS Group ID. Re-exported from [`open_mls::group::GroupId`](https://latest.openmls.tech/doc/openmls/group/struct.GroupId.html)
pub use nostr_mls::prelude::GroupId;
Expand Down
3 changes: 1 addition & 2 deletions src/whitenoise/event_processor/event_handlers/handle_giftwrap.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,7 @@ mod tests {
.create_group(
&creator_account.pubkey,
vec![key_pkg_event],
vec![creator_account.pubkey],
create_nostr_group_config_data(),
create_nostr_group_config_data(vec![creator_account.pubkey]),
)
.unwrap();

Expand Down
6 changes: 2 additions & 4 deletions src/whitenoise/event_processor/event_handlers/handle_mls_message.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,7 @@ mod tests {
.create_group(
&creator_account,
vec![member_pubkey],
vec![creator_account.pubkey],
create_nostr_group_config_data(),
create_nostr_group_config_data(vec![creator_account.pubkey]),
None,
)
.await
Expand Down Expand Up @@ -110,8 +109,7 @@ mod tests {
.create_group(
&creator_account,
vec![member_pubkey],
vec![creator_account.pubkey],
create_nostr_group_config_data(),
create_nostr_group_config_data(vec![creator_account.pubkey]),
None,
)
.await
Expand Down
Loading
Loading