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

Jump to bottom

JS Bindings: make unused_fallback_keys as optional in machine.rs/receive_sync_changes #1838

Merged
merged 5 commits into from
Apr 28, 2023
Merged

JS Bindings: make unused_fallback_keys as optional in machine.rs/receive_sync_changes #1838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
404d500
`unused_fallback_keys` is optional in `machine.rs`
florianduros Apr 27, 2023
2b3d5e0
Update changelog
florianduros Apr 27, 2023
31b81cb
Run prettier
florianduros Apr 27, 2023
2de2a14
Run rustfmt
florianduros Apr 27, 2023
75870dd
Run clippy
florianduros Apr 27, 2023
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
4 changes: 4 additions & 0 deletions bindings/matrix-sdk-crypto-js/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# v0.1.0-alpha.8

- Make `unused_fallback_keys` as optional in `Machine.receive_sync_changes`

# v0.1.0-alpha.7

- Add new accessors `Device.algorithms` and `Device.isSignedByOwner`
Expand Down
21 changes: 13 additions & 8 deletions bindings/matrix-sdk-crypto-js/src/machine.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ impl OlmMachine {
to_device_events: &str,
changed_devices: &sync_events::DeviceLists,
one_time_key_counts: &Map,
unused_fallback_keys: &Set,
unused_fallback_keys: Option<Set>,
) -> Result<Promise, JsError> {
let to_device_events = serde_json::from_str(to_device_events)?;
let changed_devices = changed_devices.inner.clone();
Expand All @@ -239,13 +239,18 @@ impl OlmMachine {
Some((key, value))
})
.collect();
let unused_fallback_keys: Option<Vec<DeviceKeyAlgorithm>> = Some(
unused_fallback_keys
.values()
.into_iter()
.filter_map(|js_value| Some(DeviceKeyAlgorithm::from(js_value.ok()?.as_string()?)))
.collect(),
);

// Convert the unused_fallback_keys JS Set to a `Vec<DeviceKeyAlgorithm>`
let unused_fallback_keys: Option<Vec<DeviceKeyAlgorithm>> =
unused_fallback_keys.map(|fallback_keys| {
fallback_keys
.values()
.into_iter()
.filter_map(|js_value| {
Some(DeviceKeyAlgorithm::from(js_value.ok()?.as_string()?))
})
.collect()
});

let me = self.inner.clone();

Expand Down
13 changes: 13 additions & 0 deletions bindings/matrix-sdk-crypto-js/tests/machine.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,19 @@ describe(OlmMachine.name, () => {
expect(receiveSyncChanges).toEqual([]);
});

test("can receive sync changes with unusedFallbackKeys as undefined", async () => {
const m = await machine();
const toDeviceEvents = JSON.stringify([]);
const changedDevices = new DeviceLists();
const oneTimeKeyCounts = new Map();

const receiveSyncChanges = JSON.parse(
await m.receiveSyncChanges(toDeviceEvents, changedDevices, oneTimeKeyCounts, undefined),
);

expect(receiveSyncChanges).toEqual([]);
});

test("can get the outgoing requests that need to be send out", async () => {
const m = await machine();
const toDeviceEvents = JSON.stringify([]);
Expand Down