diff --git a/crates/matrix-sdk-base/src/store/integration_tests.rs b/crates/matrix-sdk-base/src/store/integration_tests.rs index 26412fa8a..03feadc83 100644 --- a/crates/matrix-sdk-base/src/store/integration_tests.rs +++ b/crates/matrix-sdk-base/src/store/integration_tests.rs @@ -1478,7 +1478,7 @@ impl StateStoreIntegrationTests for DynStateStore { // Update the event id. let event_id = owned_event_id!("$1"); let num_updated = self - .update_dependent_queued_request( + .mark_dependent_queued_requests_as_ready( room_id, &txn0, SentRequestKey::Event(event_id.clone()), diff --git a/crates/matrix-sdk-base/src/store/memory_store.rs b/crates/matrix-sdk-base/src/store/memory_store.rs index 623fba571..844e87fe2 100644 --- a/crates/matrix-sdk-base/src/store/memory_store.rs +++ b/crates/matrix-sdk-base/src/store/memory_store.rs @@ -917,7 +917,7 @@ impl StateStore for MemoryStore { Ok(()) } - async fn update_dependent_queued_request( + async fn mark_dependent_queued_requests_as_ready( &self, room: &RoomId, parent_txn_id: &TransactionId, diff --git a/crates/matrix-sdk-base/src/store/traits.rs b/crates/matrix-sdk-base/src/store/traits.rs index 04dad0e24..ccc9707cd 100644 --- a/crates/matrix-sdk-base/src/store/traits.rs +++ b/crates/matrix-sdk-base/src/store/traits.rs @@ -424,15 +424,15 @@ pub trait StateStore: AsyncTraitDeps { content: DependentQueuedRequestKind, ) -> Result<(), Self::Error>; - /// Update a set of dependent send queue requests with a key identifying the - /// homeserver's response, effectively marking them as ready. + /// Mark a set of dependent send queue requests as ready, using a key + /// identifying the homeserver's response. /// /// ⚠ Beware! There's no verification applied that the parent key type is /// compatible with the dependent event type. The invalid state may be /// lazily filtered out in `load_dependent_queued_requests`. /// /// Returns the number of updated requests. - async fn update_dependent_queued_request( + async fn mark_dependent_queued_requests_as_ready( &self, room_id: &RoomId, parent_txn_id: &TransactionId, @@ -709,14 +709,14 @@ impl StateStore for EraseStateStoreError { .map_err(Into::into) } - async fn update_dependent_queued_request( + async fn mark_dependent_queued_requests_as_ready( &self, room_id: &RoomId, parent_txn_id: &TransactionId, sent_parent_key: SentRequestKey, ) -> Result { self.0 - .update_dependent_queued_request(room_id, parent_txn_id, sent_parent_key) + .mark_dependent_queued_requests_as_ready(room_id, parent_txn_id, sent_parent_key) .await .map_err(Into::into) } diff --git a/crates/matrix-sdk-indexeddb/src/state_store/mod.rs b/crates/matrix-sdk-indexeddb/src/state_store/mod.rs index 6e6193e43..82fbc3918 100644 --- a/crates/matrix-sdk-indexeddb/src/state_store/mod.rs +++ b/crates/matrix-sdk-indexeddb/src/state_store/mod.rs @@ -1594,7 +1594,7 @@ impl_state_store!({ Ok(()) } - async fn update_dependent_queued_request( + async fn mark_dependent_queued_requests_as_ready( &self, room_id: &RoomId, parent_txn_id: &TransactionId, diff --git a/crates/matrix-sdk-sqlite/src/state_store.rs b/crates/matrix-sdk-sqlite/src/state_store.rs index b67b7c459..1996dac65 100644 --- a/crates/matrix-sdk-sqlite/src/state_store.rs +++ b/crates/matrix-sdk-sqlite/src/state_store.rs @@ -1924,7 +1924,7 @@ impl StateStore for SqliteStateStore { .await } - async fn update_dependent_queued_request( + async fn mark_dependent_queued_requests_as_ready( &self, room_id: &RoomId, parent_txn_id: &TransactionId, diff --git a/crates/matrix-sdk/src/send_queue.rs b/crates/matrix-sdk/src/send_queue.rs index 3ab04db90..c9a8d5301 100644 --- a/crates/matrix-sdk/src/send_queue.rs +++ b/crates/matrix-sdk/src/send_queue.rs @@ -1077,7 +1077,9 @@ impl QueueStorage { let store = client.store(); // Update all dependent requests. - store.update_dependent_queued_request(&self.room_id, transaction_id, parent_key).await?; + store + .mark_dependent_queued_requests_as_ready(&self.room_id, transaction_id, parent_key) + .await?; let removed = store.remove_send_queue_request(&self.room_id, transaction_id).await?;