Merge pull request #168 from AestheticIntegration/kostya/gapfill-yes-…

…reset

Adding GapFill=Y special treatment when in the Recovery mode

defs/Imandra7_CriticalResetLogon.def

@@ -0,0 +1,17 @@
+iCONNECT
+I8=FIX.4.4
35=A
34=107
49=TW
52=<TIME>
56=ISLD
98=0
108=30

+E8=FIX.4.4
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+
+# ResendRequest - reply with GapFill=N
+E8=FIX.4.4
35=2
34=2
49=ISLD
56=TW
52=00000000-00:00:00.000
7=1
16=0
10=0

+I8=FIX.4.4
35=4
34=108
49=TW
56=ISLD
43=Y
52=<TIME>
122=<TIME>
36=109
123=N

+
+# Checking that SeqNums are properly reset
+I8=FIX.4.4
35=1
34=109
49=TW
52=<TIME>
56=ISLD
112=HELLO

+E8=FIX.4.4
35=0
34=3
49=ISLD
52=00000000-00:00:00.000
56=TW
112=HELLO
10=0

+
+# logout message and response
+I8=FIX.4.4
35=5
34=110
49=TW
52=<TIME>
56=ISLD

+E8=FIX.4.4
35=5
34=4
49=ISLD
52=00000000-00:00:00.000
56=TW
10=0

+
+eDISCONNECT

run_test.sh

@@ -61,5 +61,6 @@ run_test ./defs/Imandra3_CacheReplayApplication.def
 run_test ./defs/Imandra4_CacheReplayOutOfOrder.def
 run_test ./defs/Imandra5_SeqResetWithGapFillOvershoot.def
 run_test ./defs/Imandra6_CacheReplayAdminOnly.def
+run_test ./defs/Imandra7_CriticalResetLogon.def
 
 rm dune

src/fix_engine_transitions.iml

@@ -436,9 +436,15 @@ let run_recovery ( m, engine : full_valid_fix_msg * fix_engine_state ) =
     | _ ->
     let msg = match m with
     | { full_msg_header = { h_msg_seq_num; _ }
-        ; full_msg_data = Full_FIX_Admin_Msg (Full_Msg_Sequence_Reset { seqr_new_seq_no; _ } )
+        ; full_msg_data = Full_FIX_Admin_Msg (Full_Msg_Sequence_Reset { seqr_new_seq_no; seqr_gap_fill_flag } )
         ; _ } ->
-        CacheGap (h_msg_seq_num, seqr_new_seq_no)
+        (* If the GapFillFlag <123> field is not present (or set to N). 
+           The MsgSeqNum <34> in the header should be ignored... *)
+        let gap_start = match seqr_gap_fill_flag with
+            | Some FIX_GapFillFlag_Y -> h_msg_seq_num
+            | _ -> engine.incoming_seq_num
+            in
+        CacheGap (gap_start, seqr_new_seq_no)
     | _ -> CacheMessage(m)
     in
     let new_cache = update_cache engine.fe_cache msg in