Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 3 additions & 4 deletions src/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3414,11 +3414,10 @@ impl Client {
self.resolve_sent_node_waiters(&Arc::new(node.clone()));
}

let mut plaintext_buf = Vec::with_capacity(1024);
if let Err(e) = wacore_binary::marshal::marshal_to(&node, &mut plaintext_buf) {
let plaintext_buf = wacore_binary::marshal::marshal_auto(&node).map_err(|e| {
error!("Failed to marshal node: {e:?}");
return Err(SocketError::Crypto("Marshal error".to_string()).into());
}
SocketError::Crypto("Marshal error".to_string())
})?;

self.send_raw_bytes(plaintext_buf).await
}
Expand Down
12 changes: 6 additions & 6 deletions src/message.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1968,7 +1968,7 @@ mod tests {
let phone_sender_key_name = SenderKeyName::from_jid(&group_jid, &phone_protocol_address);

let phone_lookup_result = {
let mut device_guard = device_arc.write().await;
let device_guard = device_arc.read().await;
device_guard.load_sender_key(&phone_sender_key_name).await
};

Expand All @@ -1981,7 +1981,7 @@ mod tests {

// Try to retrieve using LID address (THE FIX)
let lid_lookup_result = {
let mut device_guard = device_arc.write().await;
let device_guard = device_arc.read().await;
device_guard.load_sender_key(&lid_sender_key_name).await
};

Expand Down Expand Up @@ -2081,7 +2081,7 @@ mod tests {

// Should find with LID address
let lid_lookup = {
let mut device_guard = device_arc.write().await;
let device_guard = device_arc.read().await;
device_guard.load_sender_key(&lid_sender_key_name).await
};
assert!(
Expand All @@ -2092,7 +2092,7 @@ mod tests {

// Should NOT find with phone number address (the bug)
let phone_lookup = {
let mut device_guard = device_arc.write().await;
let device_guard = device_arc.read().await;
device_guard.load_sender_key(&phone_sender_key_name).await
};
assert!(
Expand Down Expand Up @@ -2524,7 +2524,7 @@ mod tests {

// Verify it's stored under display JID
let lookup_with_display = {
let mut device_guard = device_arc.write().await;
let device_guard = device_arc.read().await;
device_guard.load_sender_key(&display_sender_key_name).await
};
assert!(
Expand All @@ -2540,7 +2540,7 @@ mod tests {
SenderKeyName::from_jid(&group_jid, &encryption_protocol_address);

let lookup_with_encryption = {
let mut device_guard = device_arc.write().await;
let device_guard = device_arc.read().await;
device_guard
.load_sender_key(&encryption_sender_key_name)
.await
Expand Down
2 changes: 1 addition & 1 deletion src/store/signal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ impl SenderKeyStore for Device {
}

async fn load_sender_key(
&mut self,
&self,
sender_key_name: &SenderKeyName,
) -> SignalResult<Option<SenderKeyRecord>> {
match self
Expand Down
2 changes: 1 addition & 1 deletion src/store/signal_adapter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ impl wacore::libsignal::protocol::SenderKeyStore for SenderKeyAdapter {
}

async fn load_sender_key(
&mut self,
&self,
sender_key_name: &SenderKeyName,
) -> wacore::libsignal::protocol::error::Result<
Option<wacore::libsignal::protocol::SenderKeyRecord>,
Expand Down
2 changes: 1 addition & 1 deletion wacore/benches/send_receive_benchmark.rs
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ impl SenderKeyStore for MemSenderKeyStore {
self.0.insert(n.clone(), r);
Ok(())
}
async fn load_sender_key(&mut self, n: &SenderKeyName) -> SigResult<Option<SenderKeyRecord>> {
async fn load_sender_key(&self, n: &SenderKeyName) -> SigResult<Option<SenderKeyRecord>> {
Ok(self.0.get(n).cloned())
}
}
Expand Down
2 changes: 1 addition & 1 deletion wacore/libsignal/benches/libsignal_benchmark.rs
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ impl SenderKeyStore for InMemorySenderKeyStore {
}

async fn load_sender_key(
&mut self,
&self,
sender_key_name: &SenderKeyName,
) -> wacore_libsignal::protocol::error::Result<Option<SenderKeyRecord>> {
Ok(self.sender_keys.get(sender_key_name).cloned())
Expand Down
2 changes: 1 addition & 1 deletion wacore/libsignal/src/protocol/storage/traits.rs
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ pub trait SenderKeyStore: ThreadSafe {

/// Look up the entry corresponding to `(sender, distribution_id)`.
async fn load_sender_key(
&mut self,
&self,
sender_key_name: &SenderKeyName,
) -> Result<Option<SenderKeyRecord>>;
}
Expand Down
Loading