Fix none finalised reqs in case of not participating (#574)

* Fix none finalised reqs in case of not participating Signed-off-by: dsurnin <[email protected]> * Move add instruction after apply Signed-off-by: dsurnin <[email protected]>
hyperledger · Mar 16, 2018 · 0b8d0cb · 0b8d0cb
1 parent e3148f9
commit 0b8d0cb
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/plenum/server/replica.py b/plenum/server/replica.py
@@ -860,16 +860,16 @@ def can_process_since_view_change_in_progress(self, msg):
 
     def _process_valid_preprepare(self, pre_prepare, sender):
         # TODO: rename to apply_pre_prepare
-        old_state_root = self.stateRootHash(pre_prepare.ledgerId, to_str=False)
-        why_not_applied = self._apply_pre_prepare(pre_prepare, sender)
-        if why_not_applied is not None:
-            return why_not_applied
         key = (pre_prepare.viewNo, pre_prepare.ppSeqNo)
-        self.addToPrePrepares(pre_prepare)
         if not self.node.isParticipating:
             self.stashingWhileCatchingUp.add(key)
             self.logger.warning('{} stashing PRE-PREPARE{}'.format(self, key))
             return None
+        old_state_root = self.stateRootHash(pre_prepare.ledgerId, to_str=False)
+        why_not_applied = self._apply_pre_prepare(pre_prepare, sender)
+        if why_not_applied is not None:
+            return why_not_applied
+        self.addToPrePrepares(pre_prepare)
         if self.isMaster:
             # TODO: can old_state_root be used here instead?
             state_root = self.stateRootHash(pre_prepare.ledgerId, to_str=False)