@@ -78,6 +78,9 @@ def _get_config_sets(self):
7878 def _check_exit_conditions (self , till , rbs_till , change_number , rbs_change_number ):
7979 return (till is not None and till < change_number ) or (rbs_till is not None and rbs_till < rbs_change_number )
8080
81+ def _check_return_conditions (self , feature_flag_changes ):
82+ return feature_flag_changes .get ('ff' )['t' ] == feature_flag_changes .get ('ff' )['s' ] and feature_flag_changes .get ('rbs' )['t' ] == feature_flag_changes .get ('rbs' )['s' ]
83+
8184class SplitSynchronizer (SplitSynchronizerBase ):
8285 """Feature Flag changes synchronizer."""
8386
@@ -145,7 +148,7 @@ def _fetch_until(self, fetch_options, till=None, rbs_till=None):
145148 segment_list .update (update_feature_flag_storage (self ._feature_flag_storage , fetched_feature_flags , feature_flag_changes .get ('ff' )['t' ], self ._api .clear_storage ))
146149 segment_list .update (rbs_segment_list )
147150
148- if feature_flag_changes . get ( 'ff' )[ 't' ] == feature_flag_changes . get ( 'ff' )[ 's' ] and feature_flag_changes . get ( 'rbs' )[ 't' ] == feature_flag_changes . get ( 'rbs' )[ 's' ] :
151+ if self . _check_return_conditions ( feature_flag_changes ) :
149152 return feature_flag_changes .get ('ff' )['t' ], feature_flag_changes .get ('rbs' )['t' ], segment_list
150153
151154 def _attempt_feature_flag_sync (self , fetch_options , till = None , rbs_till = None ):
@@ -304,7 +307,7 @@ async def _fetch_until(self, fetch_options, till=None, rbs_till=None):
304307 segment_list = await update_feature_flag_storage_async (self ._feature_flag_storage , fetched_feature_flags , feature_flag_changes .get ('ff' )['t' ], self ._api .clear_storage )
305308 segment_list .update (rbs_segment_list )
306309
307- if feature_flag_changes . get ( 'ff' )[ 't' ] == feature_flag_changes . get ( 'ff' )[ 's' ] and feature_flag_changes . get ( 'rbs' )[ 't' ] == feature_flag_changes . get ( 'rbs' )[ 's' ] :
310+ if self . _check_return_conditions ( feature_flag_changes ) :
308311 return feature_flag_changes .get ('ff' )['t' ], feature_flag_changes .get ('rbs' )['t' ], segment_list
309312
310313 async def _attempt_feature_flag_sync (self , fetch_options , till = None , rbs_till = None ):
0 commit comments