[INDY-1874] add set_last_committed and delay_without_unstash for tests

plenum/common/ledger_uncommitted_tracker.py

@@ -9,7 +9,7 @@ class LedgerUncommittedTracker:
 
     def __init__(self, last_committed_hash, ledger_size):
         self.un_committed = deque()
-        self.last_committed = (last_committed_hash, ledger_size)
+        self.set_last_committed(last_committed_hash, ledger_size)
 
     def apply_batch(self, state_root, ledger_size):
         """
@@ -61,3 +61,6 @@ def reject_batch(self):
         else:
             lhash, lsize = self.un_committed[-1]
             return lhash, prev_size - lsize
+
+    def set_last_committed(self, state_root, ledger_size):
+        self.last_committed = (state_root, ledger_size)

plenum/test/stasher.py

@@ -131,14 +131,7 @@ def reset_delays_and_process_delayeds(self, *names):
         self.force_unstash(*names)
 
 
-@contextmanager
-def delay_rules(stasher, *delayers):
-    """
-    Context manager to add delay rules to stasher(s) on entry and clean everything up on exit.
-
-    :param stasher: Instance of Stasher or iterable over instances of stasher
-    :param delayers: Delay rule functions to be added to stashers
-    """
+def _make_stashers(stasher, *delayers):
     try:
         stashers = [s for s in stasher]
     except TypeError:
@@ -151,6 +144,32 @@ def delay_rules(stasher, *delayers):
     for s in stashers:
         for d in delayers:
             s.delay(d)
+    return stashers
+
+
+@contextmanager
+def delay_rules(stasher, *delayers):
+    """
+    Context manager to add delay rules to stasher(s) on entry and clean everything up on exit.
+
+    :param stasher: Instance of Stasher or iterable over instances of stasher
+    :param delayers: Delay rule functions to be added to stashers
+    """
+    stashers = _make_stashers(stasher, *delayers)
     yield
     for s in stashers:
         s.reset_delays_and_process_delayeds(*(d.__name__ for d in delayers))
+
+
+@contextmanager
+def delay_rules_without_processing(stasher, *delayers):
+    """
+    Context manager to add delay rules to stasher(s) on entry and clean everything up on exit.
+
+    :param stasher: Instance of Stasher or iterable over instances of stasher
+    :param delayers: Delay rule functions to be added to stashers
+    """
+    stashers = _make_stashers(stasher, *delayers)
+    yield
+    for s in stashers:
+        s.resetDelays(*(d.__name__ for d in delayers))

plenum/test/tracker/test_ledger_uncommitted_tracker.py

@@ -94,3 +94,10 @@ def test_apply_batch_with_zero_ledger_size(make_tracker):
     test_ledger_size = 0
     test_root = "test_root"
     make_tracker.apply_batch(test_root, test_ledger_size)
+
+
+def test_set_last_committed(make_tracker):
+    test_tuple = ('some_state_root', 42)
+    assert make_tracker.last_committed != test_tuple
+    make_tracker.set_last_committed(*test_tuple)
+    assert make_tracker.last_committed == test_tuple