Skip to content

Commit

Permalink
Revert "Live Consent Sync (#1234)" (#1288)
Browse files Browse the repository at this point in the history
* Revert "Live Consent Sync (#1234)"

This reverts commit 0b0bcde.

* fix bad merge
  • Loading branch information
nplasterer authored Nov 19, 2024
1 parent f049bb5 commit 46e3bc7
Show file tree
Hide file tree
Showing 12 changed files with 1,350 additions and 1,981 deletions.
2 changes: 0 additions & 2 deletions xmtp_id/src/associations/serialization.rs
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
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

0 comments on commit 46e3bc7

Please sign in to comment.