chaintool/chainsyncer
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add tests for begin, end, middle revert and continue filter after lock

Browse Source
This commit is contained in:
lash
2022-04-30 07:49:10 +00:00
parent 6b6b26f1ae
commit 4af735e5d3
3 changed files with 200 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
chainsyncer/runnable/unlock.py
View File

@@ -107,41 +107,6 @@ def main():
store.connect()
store.start(ignore_lock=True)
store.unlock_filter(not action_is_forward)
return
lock_state = store.filter_state.from_name('LOCK')
locked_item = store.filter_state.list(lock_state)
if len(locked_item) == 0:
sys.stderr.write('Sync filter in {} is not locked\n'.format(state_dir))
sys.exit(1)
elif len(locked_item) > 1:
sys.stderr.write('More than one locked item encountered in {}. That should never happen, so I do not know what to do next.\n'.format(state_dir))
sys.exit(1)
locked_item_key = locked_item[0]
locked_item = store.get(int(locked_item_key))
locked_state = store.filter_state.state(locked_item_key) - lock_state
locked_state_name = store.filter_state.name(locked_state)
logg.info('found item "{}" in locked state {}'.format(locked_item, store.filter_state.name(locked_state)))
if action_is_forward:
k = locked_state_name
filter_index = None
filter_index = filter_list.index(k)
filter_pos = filter_index + 1
filter_count = len(filter_list)
logg.debug('Locked filter {} found at position {} of {}'.format(k, filter_pos, filter_count))
if filter_pos == filter_count:
logg.info('Locked filter {} is the last filter in the list. Executing filter reset'.format(k))
locked_item.reset(check_incomplete=False)
else:
locked_item.advance(ignore_lock=True)
store.filter_state.unset(locked_item_key, lock_state)
else:
filter_mask = 0xf
filter_state = store.filter_state.mask(locked_state, filter_mask)
logg.info('Chosen action is "{}": will continue execution at previous filter {}'.format(args.action, store.filter_state.name(filter_state)))
store.filter_state.unset(locked_item_key, lock_state)
if __name__ == '__main__':

21
chainsyncer/store/base.py
View File

@@ -67,19 +67,6 @@ class SyncItem:
raise FilterDone(self.state_key)
def resume(self):
return
filter_state = self.filter_state.state(self.state_key)
if filter_state > 0x0f:
filter_state_part = self.filter_state.mask(filter_state, 0x0f)
if filter_state_part > 0:
filter_state_part_name = self.filter_state.name(filter_state_part)
if filter_state_part_name[0] != '_':
logg.info('resume execution on state {} ({})'.format(self.filter_state.name(filter_state_part), filter_state_part))
lock_state = self.filter_state.from_name('LOCK')
self.filter_state.set(self.state_key, lock_state)
def reset(self, check_incomplete=True):
if check_incomplete:
if self.filter_state.state(self.state_key) & self.filter_state.from_name('LOCK') > 0:
@@ -225,7 +212,6 @@ class SyncStore:
self.state.put(block_number_str, contents=state_bytes)
self.filter_state.put(block_number_str)
o = SyncItem(offset, target, self.state, self.filter_state, ignore_lock=ignore_lock)
o.resume()
k = str(offset)
self.items[k] = o
self.item_keys.append(k)
@@ -276,7 +262,6 @@ class SyncStore:
if i < lim:
item_target = thresholds[i+1]
o = SyncItem(block_number, item_target, self.state, self.filter_state, started=True, ignore_lock=ignore_lock)
o.resume()
k = str(block_number)
self.items[k] = o
self.item_keys.append(k)
@@ -366,7 +351,6 @@ class SyncStore:
def __unlock_next(self, item, lst, index):
#self.filter_state.state_store.unset(item.state_key, self.filter_state.state_store.LOCK)
if index == len(lst) - 1:
item.reset(check_incomplete=False)
else:
@@ -377,8 +361,9 @@ class SyncStore:
if index == 0:
item.reset(check_incomplete=False)
else:
new_state = lst(index)
self.filter_state.state_store.from_name(new_state.upper())
new_state_str = lst[index - 1]
new_state = self.filter_state.state_store.from_name(new_state_str)
self.filter_state.state_store.move(item.state_key, new_state)
def peek_current_filter(self):