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.

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

Adds test for group members function for non group creator client #768

Closed
wants to merge 116 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
116 commits
Select commit Hold shift + click to select a range
2f38cd9
Create validated commit for MLS
neekolas May 1, 2024
58a8c86
Create validated commit for MLS
neekolas May 1, 2024
0ae2683
Add/Remove members using GroupMembership
neekolas May 1, 2024
78d14fc
Merge branch '05-01-create_validated_commit_for_mls' of github.com:xm…
neekolas May 2, 2024
e134c3c
Add/Remove members using GroupMembership
neekolas May 1, 2024
e1d05c3
Merge branch '05-01-add_remove_members_using_groupmembership' of gith…
neekolas May 2, 2024
0b5943f
Remove unused import
neekolas May 2, 2024
3a2232e
initial commit
neekolas May 7, 2024
4724ba3
Merge branch 'main' into identity-release
neekolas May 8, 2024
991b07e
initial commit
neekolas May 7, 2024
3f7b54e
Merge branch 'identity-release' of github.com:xmtp/libxmtp into ident…
neekolas May 8, 2024
ee5cb08
Merge branch 'identity-release' into nm/add-remove-members
neekolas May 8, 2024
e48c2bb
Use latest protos
neekolas May 8, 2024
b5c4a60
Add missing installations
neekolas May 9, 2024
557cdf5
Validate Credential (#689)
insipx May 8, 2024
ea73ac3
Message History: handle Reply better (#723)
tuddman May 9, 2024
3ac3126
Merge branch 'main' into identity-release
37ng May 10, 2024
0304b68
Merge branch 'main' into identity-release
37ng May 10, 2024
214a7b3
new identity in client (#728)
37ng May 10, 2024
405c19a
Consolidate on single method
neekolas May 14, 2024
26407fb
initial commit
neekolas May 7, 2024
a51d4b0
initial commit
neekolas May 7, 2024
431d5bf
new identity in client (#728)
37ng May 10, 2024
631483d
Hack together something that compiles
neekolas May 15, 2024
6066ced
Merge branch 'identity-release' of github.com:xmtp/libxmtp into ident…
neekolas May 15, 2024
1a84f8e
Fix straggling issues
neekolas May 15, 2024
3419b6e
New DB schema
neekolas May 15, 2024
9450e3b
Stub validated commit v2
neekolas May 15, 2024
4515220
Merge branch 'main' into 05-15-merge_updateable_permissions
neekolas May 15, 2024
1a485da
Start on mutable metadata
neekolas May 15, 2024
fc7e6e8
Add some metadata changes
neekolas May 15, 2024
27ddfe8
initial commit
neekolas May 7, 2024
4b83a36
initial commit
neekolas May 7, 2024
ba060c1
new identity in client (#728)
37ng May 10, 2024
b99fef7
Hack together something that compiles
neekolas May 15, 2024
a7280df
initial commit
neekolas May 7, 2024
8326244
initial commit
neekolas May 7, 2024
7cb0d8e
new identity in client (#728)
37ng May 10, 2024
16d49d8
Fix straggling issues
neekolas May 15, 2024
fa36d90
Add inbox_id fixes
neekolas May 15, 2024
f1fb807
Merge branch 'identity-release' of github.com:xmtp/libxmtp into ident…
neekolas May 15, 2024
8497f8e
Remove dead code
neekolas May 15, 2024
2f80049
Fix lints
neekolas May 15, 2024
48063c1
Derive default for MutableMetadataChanges
neekolas May 15, 2024
afb96e7
Rename identity table
neekolas May 15, 2024
ab4444a
Stub validated commit v2
neekolas May 15, 2024
e2c1252
Identity DB Schema (#739)
neekolas May 15, 2024
6e493e9
Merge branch '05-15-use_validated_commit_v2' of github.com:xmtp/libxm…
neekolas May 15, 2024
dd39ca1
Added new Permissions Extension (#724) (#741)
neekolas May 15, 2024
477c374
Merge branch 'identity-release' into 05-15-use_validated_commit_v2
neekolas May 15, 2024
5b4af2c
Use new validated commit (#740)
neekolas May 15, 2024
ef582be
Merge branch 'nm/add-remove-members' into nm/add-remove-group-members
neekolas May 15, 2024
d1ad903
Cache association state (#733)
richardhuaaa May 16, 2024
d635b42
Adding and removing group members
neekolas May 16, 2024
0e7d3db
More cleanup
neekolas May 16, 2024
4573ded
Remove after add
neekolas May 16, 2024
1021a7b
Lint
neekolas May 16, 2024
5316256
Update xmtp_mls/src/groups/sync.rs
neekolas May 16, 2024
6a6e6da
Adding and removing group members (#746)
neekolas May 16, 2024
e3398f5
bindings_ffi: new client & signatureRequest. (#748)
37ng May 17, 2024
4123a3b
Gather group members from DB
neekolas May 17, 2024
aa71fb9
Implement inbox_sequence_id method in client (#737)
37ng May 17, 2024
3b2545a
Lint
neekolas May 17, 2024
6468cac
Remove unused import
neekolas May 17, 2024
f103d3b
Update group.members() (#749)
neekolas May 17, 2024
0370df4
Get tests passing
neekolas May 19, 2024
e596dab
Add new GroupUpdated proto
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
0a45969
Move back to main
neekolas May 20, 2024
74afa30
Make pub
neekolas May 20, 2024
66e2bd3
Add new GroupUpdated proto (#754)
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
76010ba
Identity E2E integration (#755)
neekolas May 21, 2024
f411548
Merge branch 'main' into nm/merge-main
neekolas May 21, 2024
d021cc6
Update lock files
neekolas May 21, 2024
1815417
Use latest openmls branch
neekolas May 21, 2024
2945dc5
Fix some errors
neekolas May 21, 2024
985c650
Fix key package reference
neekolas May 21, 2024
efd26b9
No more compile errors
neekolas May 21, 2024
d76e3d9
Remove unused import
neekolas May 21, 2024
a795fdd
Use latest node go
neekolas May 21, 2024
e74ac31
Store key package hash ref
neekolas May 21, 2024
c80cc28
Get inbox ID for address method
neekolas May 21, 2024
3c0bd56
Add test
neekolas May 21, 2024
3b17cee
Remove unused import
neekolas May 21, 2024
8042063
[WIP] Merge storage provider changes (#765)
neekolas May 21, 2024
a78ca40
Merge branch 'identity-release' into nm/get-inbox-ids-static-method
neekolas May 21, 2024
1651edc
Lint
neekolas May 21, 2024
c38495d
`get_inbox_id_for_address` static method (#766)
neekolas May 21, 2024
f88c4d9
Added test showing group members func returning incorrectly
cameronvoell May 22, 2024
17563aa
lint fix
cameronvoell May 22, 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
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,8 @@ dist

# Sqlite Instances
*.db3
*.db3-shm
*.db3-wal

# JAR files
*.jar
Expand Down
252 changes: 252 additions & 0 deletions .vscode/launch.json
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}"
}
]
}
39 changes: 32 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 @@ -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 = "0239b96" }
openmls_basic_credential = { git = "https://github.com/xmtp/openmls", rev = "0239b96" }
openmls_rust_crypto = { git = "https://github.com/xmtp/openmls", rev = "0239b96" }
openmls_traits = { git = "https://github.com/xmtp/openmls", rev = "0239b96" }
openmls = { git = "https://github.com/xmtp/openmls", rev = "9f3cad8c6c434f4860bd4f120451558e8d6293ce" }
openmls_basic_credential = { git = "https://github.com/xmtp/openmls", rev = "9f3cad8c6c434f4860bd4f120451558e8d6293ce" }
openmls_rust_crypto = { git = "https://github.com/xmtp/openmls", rev = "9f3cad8c6c434f4860bd4f120451558e8d6293ce" }
openmls_traits = { git = "https://github.com/xmtp/openmls", rev = "9f3cad8c6c434f4860bd4f120451558e8d6293ce" }
prost = "^0.12"
prost-types = "^0.12"
rand = "0.8.5"
Expand Down
Loading
Loading