@@ -10,7 +10,7 @@ use matrix_sdk_base::{
10
10
store:: StoreConfig , BaseClient , RoomInfo , RoomState , SessionMeta , StateChanges , StateStore ,
11
11
} ;
12
12
use matrix_sdk_sqlite:: SqliteStateStore ;
13
- use matrix_sdk_test:: { EventBuilder , JoinedRoomBuilder , StateTestEvent , SyncResponseBuilder } ;
13
+ use matrix_sdk_test:: { EventBuilder , JoinedRoomBuilder , StateTestEvent , SyncResponseBuilder , ALICE } ;
14
14
use matrix_sdk_ui:: { timeline:: TimelineFocus , Timeline } ;
15
15
use ruma:: {
16
16
api:: client:: membership:: get_member_events,
@@ -20,6 +20,8 @@ use ruma::{
20
20
serde:: Raw ,
21
21
user_id, EventId , MilliSecondsSinceUnixEpoch , OwnedEventId , OwnedUserId ,
22
22
} ;
23
+ use ruma:: events:: AnyStateEvent ;
24
+ use ruma:: events:: room:: member:: MembershipState ;
23
25
use serde:: Serialize ;
24
26
use serde_json:: json;
25
27
use tokio:: runtime:: Builder ;
@@ -153,11 +155,10 @@ pub fn load_pinned_events_benchmark(c: &mut Criterion) {
153
155
154
156
runtime. block_on (
155
157
Mock :: given ( method ( "GET" ) )
156
- . and ( path_regex ( r"/_matrix/client/r0/rooms/.*/event /.*" ) )
158
+ . and ( path_regex ( r"/_matrix/client/r0/rooms/.*/context /.*" ) )
157
159
. respond_with ( move |r : & Request | {
158
160
let segments: Vec < & str > = r. url . path_segments ( ) . expect ( "Invalid path" ) . collect ( ) ;
159
161
let event_id_str = segments[ 6 ] ;
160
- // let f = EventFactory::new().room(&room_id)
161
162
let event_id = EventId :: parse ( event_id_str) . expect ( "Invalid event id in response" ) ;
162
163
let event = f
163
164
. text_msg ( format ! ( "Message {event_id_str}" ) )
@@ -166,13 +167,16 @@ pub fn load_pinned_events_benchmark(c: &mut Criterion) {
166
167
. into_raw_sync ( ) ;
167
168
ResponseTemplate :: new ( 200 )
168
169
. set_delay ( Duration :: from_millis ( 50 ) )
169
- . set_body_json ( event. json ( ) )
170
+ . set_body_json ( json ! ( {
171
+ "events_before" : [ ] ,
172
+ "event" : event. json( ) ,
173
+ "events_after" : [ ] ,
174
+ "state" : [ ] ,
175
+ } )
176
+ )
170
177
} )
171
178
. mount ( & server) ,
172
179
) ;
173
- // runtime.block_on(server.reset());
174
-
175
- client. event_cache ( ) . subscribe ( ) . unwrap ( ) ;
176
180
177
181
let room = client. get_room ( & room_id) . expect ( "Room not found" ) ;
178
182
assert ! ( !room. pinned_event_ids( ) . is_empty( ) ) ;
@@ -186,6 +190,8 @@ pub fn load_pinned_events_benchmark(c: &mut Criterion) {
186
190
187
191
group. bench_function ( BenchmarkId :: new ( "load_pinned_events" , name) , |b| {
188
192
b. to_async ( & runtime) . iter ( || async {
193
+ client. event_cache ( ) . subscribe ( ) . unwrap ( ) ;
194
+
189
195
assert ! ( !room. pinned_event_ids( ) . is_empty( ) ) ;
190
196
assert_eq ! ( room. pinned_event_ids( ) . len( ) , PINNED_EVENTS_COUNT ) ;
191
197
0 commit comments