Skip to content
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

Revert "Live Consent Sync (#1234)" #1288

Merged
merged 2 commits into from
Nov 19, 2024
Merged

Revert "Live Consent Sync (#1234)" #1288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb669ad
Revert "Live Consent Sync (#1234)"
nplasterer Nov 19, 2024
496ca34
fix bad merge
nplasterer Nov 19, 2024
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
2 changes: 0 additions & 2 deletions xmtp_id/src/associations/serialization.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,6 @@ pub enum DeserializationError {
InvalidAccountId,
#[error("Invalid hash (needs to be 32 bytes)")]
InvalidHash,
#[error("A required field is unspecified: {0}")]
Unspecified(&'static str),
#[error("Error creating public key from proto bytes")]
Ed25519(#[from] ed25519_dalek::ed25519::Error),
}
Expand Down
12 changes: 1 addition & 11 deletions xmtp_mls/src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ use crate::{
refresh_state::EntityKind,
EncryptedMessageStore, StorageError,
},
subscriptions::{LocalEventError, LocalEvents},
subscriptions::LocalEvents,
verified_key_package_v2::{KeyPackageVerificationError, VerifiedKeyPackageV2},
xmtp_openmls_provider::XmtpOpenMlsProvider,
Fetch, Store, XmtpApi,
Expand Down Expand Up @@ -97,8 +97,6 @@ pub enum ClientError {
// the box is to prevent infinite cycle between client and group errors
#[error(transparent)]
Group(Box<GroupError>),
#[error(transparent)]
LocalEvent(#[from] LocalEventError),
#[error("generic:{0}")]
Generic(String),
}
Expand Down Expand Up @@ -422,14 +420,6 @@ where
conn.insert_or_replace_consent_records(records)?;
conn.insert_or_replace_consent_records(&new_records)?;

if self.history_sync_url.is_some() {
let mut records = records.to_vec();
records.append(&mut new_records);
self.local_events
.send(LocalEvents::ConsentUpdate(records))
.map_err(|e| ClientError::Generic(e.to_string()))?;
}

Ok(())
}

Expand Down
Loading
Loading