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

Identity E2E integration #755

Merged
merged 28 commits into from
May 21, 2024
Merged

Identity E2E integration #755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
0370df4
Get tests passing
neekolas May 19, 2024
94eb67e
Merge branch 'nm/group-updated-codec' into nm/end-to-end-integration
neekolas May 19, 2024
5412f0a
Use new group updated codec
neekolas May 19, 2024
9714d5b
More loose ends
neekolas May 20, 2024
679c7e1
Merge branch 'identity-release' into nm/end-to-end-integration
neekolas May 20, 2024
9c8eb36
More tests passing
neekolas May 20, 2024
649a305
Remove a few more todos
neekolas May 20, 2024
b6a9376
Fix up bindings
neekolas May 20, 2024
40422fc
Fix up bindings
neekolas May 20, 2024
20205fc
Fix up subscriptions tests
neekolas May 20, 2024
f75b4a1
Add hack for unexpected installations
neekolas May 21, 2024
d4e43d6
Fix issue with group creation
neekolas May 21, 2024
f8803fb
Fix lints
neekolas May 21, 2024
70d1353
Use specific docker image
neekolas May 21, 2024
39d8d92
Fix commit validation logic
neekolas May 21, 2024
90b8b5a
Update tests since we now have transcript messages
neekolas May 21, 2024
529dfa1
Unignore more tests
neekolas May 21, 2024
1eb5bd7
Lower concurrency
neekolas May 21, 2024
6050364
Change test-threads
neekolas May 21, 2024
b266c12
Lint
neekolas May 21, 2024
8fce7cc
Fix args
neekolas May 21, 2024
3593d81
Ignore failing test
neekolas May 21, 2024
1ef0b48
Update log line
neekolas May 21, 2024
c1702d1
Un-ignore test
neekolas May 21, 2024
b1c5f8d
Update docker image
neekolas May 21, 2024
2c49988
Lower number of test threads
neekolas May 21, 2024
ff8ce36
Lower number of test threads in bindings tests
neekolas May 21, 2024
b6e7366
Ignore flaky test
neekolas May 21, 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
5 changes: 3 additions & 2 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:

- name: Install Foundry
uses: foundry-rs/foundry-toolchain@v1

- uses: Swatinem/rust-cache@v2
with:
workspaces: |
Expand All @@ -33,6 +33,7 @@ jobs:
timeout-minutes: 20
with:
command: test
args: -- --test-threads=2

- name: Setup Kotlin
run: |
Expand All @@ -46,4 +47,4 @@ jobs:
- name: Run cargo test on FFI bindings
run: |
export CLASSPATH="${{ env.CLASSPATH }}"
cargo test --manifest-path bindings_ffi/Cargo.toml
cargo test --manifest-path bindings_ffi/Cargo.toml -- --test-threads=2
252 changes: 252 additions & 0 deletions .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,252 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "lldb",
"request": "launch",
"name": "Debug executable 'xmtp_cli'",
"cargo": {
"args": [
"build",
"--bin=xmtp_cli",
"--package=xmtp_cli"
],
"filter": {
"name": "xmtp_cli",
"kind": "bin"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "Debug unit tests in executable 'xmtp_cli'",
"cargo": {
"args": [
"test",
"--no-run",
"--bin=xmtp_cli",
"--package=xmtp_cli"
],
"filter": {
"name": "xmtp_cli",
"kind": "bin"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "Debug unit tests in library 'xmtp_api_grpc'",
"cargo": {
"args": [
"test",
"--no-run",
"--lib",
"--package=xmtp_api_grpc"
],
"filter": {
"name": "xmtp_api_grpc",
"kind": "lib"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "Debug unit tests in library 'xmtp_proto'",
"cargo": {
"args": [
"test",
"--no-run",
"--lib",
"--package=xmtp_proto"
],
"filter": {
"name": "xmtp_proto",
"kind": "lib"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "Debug unit tests in library 'xmtp_v2'",
"cargo": {
"args": [
"test",
"--no-run",
"--lib",
"--package=xmtp_v2"
],
"filter": {
"name": "xmtp_v2",
"kind": "lib"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "Debug unit tests in library 'xmtp_cryptography'",
"cargo": {
"args": [
"test",
"--no-run",
"--lib",
"--package=xmtp_cryptography"
],
"filter": {
"name": "xmtp_cryptography",
"kind": "lib"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "Debug unit tests in library 'xmtp_mls'",
"cargo": {
"args": [
"test",
"--no-run",
"--lib",
"--package=xmtp_mls"
],
"filter": {
"name": "xmtp_mls",
"kind": "lib"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "Debug executable 'update-schema'",
"cargo": {
"args": [
"build",
"--bin=update-schema",
"--package=xmtp_mls"
],
"filter": {
"name": "update-schema",
"kind": "bin"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "Debug unit tests in executable 'update-schema'",
"cargo": {
"args": [
"test",
"--no-run",
"--bin=update-schema",
"--package=xmtp_mls"
],
"filter": {
"name": "update-schema",
"kind": "bin"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "Debug unit tests in library 'xmtp_id'",
"cargo": {
"args": [
"test",
"--no-run",
"--lib",
"--package=xmtp_id"
],
"filter": {
"name": "xmtp_id",
"kind": "lib"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "Debug executable 'mls-validation-service'",
"cargo": {
"args": [
"build",
"--bin=mls-validation-service",
"--package=mls_validation_service"
],
"filter": {
"name": "mls-validation-service",
"kind": "bin"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "Debug unit tests in executable 'mls-validation-service'",
"cargo": {
"args": [
"test",
"--no-run",
"--bin=mls-validation-service",
"--package=mls_validation_service"
],
"filter": {
"name": "mls-validation-service",
"kind": "bin"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "Debug unit tests in library 'xmtp_user_preferences'",
"cargo": {
"args": [
"test",
"--no-run",
"--lib",
"--package=xmtp_user_preferences"
],
"filter": {
"name": "xmtp_user_preferences",
"kind": "lib"
}
},
"args": [],
"cwd": "${workspaceFolder}"
}
]
}
10 changes: 5 additions & 5 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.

8 changes: 4 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ futures-core = "0.3.30"
hex = "0.4.3"
jsonrpsee = { version = "0.22", features = ["macros", "server", "client-core"] }
log = "0.4"
openmls = { git = "https://github.com/xmtp/openmls", rev = "52cad0e" }
openmls_basic_credential = { git = "https://github.com/xmtp/openmls", rev = "52cad0e" }
openmls_rust_crypto = { git = "https://github.com/xmtp/openmls", rev = "52cad0e" }
openmls_traits = { git = "https://github.com/xmtp/openmls", rev = "52cad0e" }
openmls = { git = "https://github.com/xmtp/openmls", rev = "b3bcebe7b0405326b8887d17c04878823aed81c1" }
openmls_basic_credential = { git = "https://github.com/xmtp/openmls", rev = "b3bcebe7b0405326b8887d17c04878823aed81c1" }
openmls_rust_crypto = { git = "https://github.com/xmtp/openmls", rev = "b3bcebe7b0405326b8887d17c04878823aed81c1" }
openmls_traits = { git = "https://github.com/xmtp/openmls", rev = "b3bcebe7b0405326b8887d17c04878823aed81c1" }
prost = "^0.12"
prost-types = "^0.12"
rand = "0.8.5"
Expand Down
10 changes: 5 additions & 5 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.

Loading
Loading