chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix failing tests because clean overwrites resolved_state in resolve fn

Browse Source
This commit is contained in:
Devin Ragotzy 2020-12-14 13:27:47 -05:00
parent 55e889a11f
commit 33bb319b45
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/lib.rs
View File

@ -196,19 +196,20 @@ impl StateResolution {
.collect::<Vec<_>>()
);
let mut resolved_state = StateResolution::iterative_auth_check(
let resolved_state = StateResolution::iterative_auth_check(
room_id,
room_version,
&sorted_left_events,
&resolved_control, // the control events are added to the final resolved state
&resolved_control, // The control events are added to the final resolved state
&mut event_map,
store,
)?;
// add unconflicted state to the resolved state
resolved_state.extend(unconflicted.clone());
Ok(resolved_state)
// Add unconflicted state to the resolved state
// We do it this way so any resolved_state would overwrite unconflicted
let mut clean = unconflicted.clone();
clean.extend(resolved_state);
Ok(clean)
}
/// Resolve sets of state events as they come in. Internally `StateResolution` builds a graph
@ -384,14 +385,15 @@ impl StateResolution {
room_id,
room_version,
&sorted_left_events,
&resolved_control, // the control events are added to the final resolved state
&resolved_control, // The control events are added to the final resolved state
&mut event_map,
store,
)?;
// add unconflicted state to the resolved state
// TODO:
// CLEAN OVERWRITES ANY DUPLICATE KEYS FROM RESOLVED STATE
resolved_state.extend(clean);
Ok(resolved_state)
}