Skip to content

Commit

Permalink
Update matrix-rust-sdk
Browse files Browse the repository at this point in the history
... to pull in matrix-org/matrix-rust-sdk#2227, which
is a pre-requisite for element-hq/crypto-internal#100
  • Loading branch information
richvdh committed Jul 19, 2023
1 parent 328d393 commit 1e2970b
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
14 changes: 7 additions & 7 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ console_error_panic_hook = "0.1.7"
futures-util = "0.3.27"
http = "0.2.6"
js-sys = "0.3.49"
matrix-sdk-common = { git = "https://github.com/matrix-org/matrix-rust-sdk", rev = "51ba4483c08520b9763d2d860d7c918de0359f73", features = ["js"] }
matrix-sdk-indexeddb = { git = "https://github.com/matrix-org/matrix-rust-sdk", rev = "51ba4483c08520b9763d2d860d7c918de0359f73" }
matrix-sdk-qrcode = { git = "https://github.com/matrix-org/matrix-rust-sdk", rev = "51ba4483c08520b9763d2d860d7c918de0359f73", optional = true }
matrix-sdk-common = { git = "https://github.com/matrix-org/matrix-rust-sdk", rev = "24e3ccfbb33b78bfbdc832e50acc43fa12b5a718", features = ["js"] }
matrix-sdk-indexeddb = { git = "https://github.com/matrix-org/matrix-rust-sdk", rev = "24e3ccfbb33b78bfbdc832e50acc43fa12b5a718" }
matrix-sdk-qrcode = { git = "https://github.com/matrix-org/matrix-rust-sdk", rev = "24e3ccfbb33b78bfbdc832e50acc43fa12b5a718", optional = true }
serde_json = "1.0.91"
tracing = { version = "0.1.36", default-features = false, features = ["std"] }
tracing-subscriber = { version = "0.3.14", default-features = false, features = ["registry", "std"] }
Expand All @@ -52,6 +52,6 @@ zeroize = "1.3.0"

[dependencies.matrix-sdk-crypto]
git = "https://github.com/matrix-org/matrix-rust-sdk"
rev = "51ba4483c08520b9763d2d860d7c918de0359f73"
rev = "24e3ccfbb33b78bfbdc832e50acc43fa12b5a718"
default_features = false
features = ["js", "automatic-room-key-forwarding"]
4 changes: 2 additions & 2 deletions tests/machine.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ describe(OlmMachine.name, () => {
expect(databases).toHaveLength(2);
expect(databases).toStrictEqual([
{ name: `${store_name}::matrix-sdk-crypto-meta`, version: 1 },
{ name: `${store_name}::matrix-sdk-crypto`, version: 3 },
{ name: `${store_name}::matrix-sdk-crypto`, version: 4 },
]);

// Creating a new Olm machine, with the stored state.
Expand Down Expand Up @@ -154,7 +154,7 @@ describe(OlmMachine.name, () => {
expect(databases).toHaveLength(2);
expect(databases).toStrictEqual([
{ name: `${store_name}::matrix-sdk-crypto-meta`, version: 1 },
{ name: `${store_name}::matrix-sdk-crypto`, version: 3 },
{ name: `${store_name}::matrix-sdk-crypto`, version: 4 },
]);

// Let's force to close the `OlmMachine`.
Expand Down

0 comments on commit 1e2970b

Please sign in to comment.