fluencelabs/aquavm
1
0
Fork 0
mirror of https://github.com/fluencelabs/aquavm synced 2025-06-24 04:01:32 +00:00
Code Issues Projects Releases Wiki Activity

fix bug with ap merger #295 (#296)

Browse Source
This commit is contained in:
Mike Voronov
2022-08-18 22:31:29 +03:00
committed by GitHub
parent 0d9390d333
commit dcab0023d8
5 changed files with 58 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/air-lib/trace-handler/src/merger/ap_merger.rs
View File

@ -36,7 +36,7 @@ pub(crate) fn try_merge_next_state_as_ap(data_keeper: &mut DataKeeper) -> MergeR
let current_state = data_keeper.current_slider_mut().next_state();
match (prev_state, current_state) {
(Some(Ap(prev_ap)), Some(_)) => prepare_merge_result(Some(prev_ap), Both, data_keeper),
(Some(Ap(prev_ap)), Some(Ap(_))) => prepare_merge_result(Some(prev_ap), Both, data_keeper),
(Some(Ap(prev_ap)), None) => prepare_merge_result(Some(prev_ap), Previous, data_keeper),
// check that current state is Ap, but it's impossible to use it, because prev_data
// could not have streams with such generations