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

Stream/General improvements #1041

Merged
merged 6 commits into from
Sep 9, 2024
Merged

Stream/General improvements #1041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
beebf2f
stack-based streams all the way down
insipx Sep 6, 2024
f125f1f
fix bindings
insipx Sep 6, 2024
a88f31b
remove unused
insipx Sep 6, 2024
6bb2e03
fix retry doc tests
insipx Sep 6, 2024
7e37dcc
Merge branch 'main' of github.com:xmtp/libxmtp into insipx/pull-impro…
insipx Sep 6, 2024
fbad088
remove wasm-specific code in xmtp_mls
insipx Sep 7, 2024
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
71 changes: 15 additions & 56 deletions Cargo.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ version = "0.0.1"
anyhow = "1.0"
async-stream = "0.3"
async-trait = "0.1.77"
trait-variant = "0.1.2"
chrono = "0.4.38"
ctor = "0.2"
ed25519 = "2.2.3"
ed25519-dalek = "2.1.1"
ethers = "2.0.11"
ethers-core = "2.0.4"
futures = "0.3.30"
futures-core = "0.3.30"
getrandom = { version = "0.2", default-features = false }
Expand Down
36 changes: 15 additions & 21 deletions bindings_ffi/Cargo.lock
View file
Open in desktop

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

1 change: 0 additions & 1 deletion bindings_ffi/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ path = "src/bin.rs"

[dev-dependencies]
ethers = "2.0.13"
ethers-core = "2.0.13"
tempfile = "3.5.0"
tokio = { version = "1.28.1", features = ["full"] }
tokio-test = "0.4"
Expand Down
6 changes: 3 additions & 3 deletions bindings_ffi/src/mls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -961,7 +961,7 @@ impl FfiGroup {
self.created_at_ns,
);
let message = group
.process_streamed_group_message(envelope_bytes, self.inner_client.clone())
.process_streamed_group_message(envelope_bytes, &self.inner_client)
.await?;
let ffi_message = message.into();

Expand Down Expand Up @@ -1576,11 +1576,11 @@ mod tests {
};

use super::{create_client, FfiMessage, FfiMessageCallback, FfiXmtpClient};
use ethers::utils::hex;
use ethers_core::rand::{
use ethers::core::rand::{
self,
distributions::{Alphanumeric, DistString},
};
use ethers::utils::hex;
use tokio::{sync::Notify, time::error::Elapsed};
use xmtp_cryptography::{signature::RecoverableSignature, utils::rng};
use xmtp_id::associations::generate_inbox_id;
Expand Down
2 changes: 1 addition & 1 deletion bindings_ffi/src/v2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,7 @@ mod tests {
let msg = "TestVector1";
let sig_hash = "19d6bec562518e365d07ba3cce26d08a5fffa2cbb1e7fe03c1f2d6a722fd3a5e544097b91f8f8cd11d43b032659f30529139ab1a9ecb6c81ed4a762179e87db81c";

let sig_bytes = ethers_core::utils::hex::decode(sig_hash).unwrap();
let sig_bytes = ethers::core::utils::hex::decode(sig_hash).unwrap();
let recovered_addr = crate::v2::recover_address(sig_bytes, msg.to_string()).unwrap();
assert_eq!(recovered_addr, addr.to_lowercase());
}
Expand Down
Loading