[INDY-2324] Get back requests from PrePrepare

Signed-off-by: Andrew Nikitin <andrew.nikitin@dsr-corporation.com>
orol7894 · Jan 18, 2020 · 900dd54 · 900dd54
1 parent d627e33
commit 900dd54
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/plenum/common/ledger.py b/plenum/common/ledger.py
@@ -114,7 +114,6 @@ def discardTxns(self, count: int):
             raise LogicError("expected to revert {} txns while there are only {}".
                              format(count, len(self.uncommittedTxns)))
         old_hash = self.uncommittedRootHash
-        discarded_txns = self.uncommittedTxns[-count:]
         self.uncommittedTxns = self.uncommittedTxns[:-count]
         if not self.uncommittedTxns:
             self.uncommittedTree = None
@@ -126,7 +125,6 @@ def discardTxns(self, count: int):
         logger.info('Discarding {} txns and root hash {} and new root hash is {}. {} are still uncommitted'.
                     format(count, Ledger.hashToStr(old_hash), Ledger.hashToStr(self.uncommittedRootHash),
                            len(self.uncommittedTxns)))
-        return discarded_txns
 
     def treeWithAppliedTxns(self, txns: List, currentTree=None):
         """

diff --git a/plenum/server/consensus/ordering_service.py b/plenum/server/consensus/ordering_service.py
@@ -1228,10 +1228,7 @@ def _revert(self, ledgerId, stateRootHash, reqCount):
                     .format(self, reqCount, Ledger.hashToStr(state.headHash),
                             Ledger.hashToStr(stateRootHash), ledgerId))
         state.revertToHead(stateRootHash)
-        reverted_txns = ledger.discardTxns(reqCount)
-        if reverted_txns:
-            for txn in reverted_txns:
-                self.requestQueues[ledgerId].add(get_digest(txn))
+        ledger.discardTxns(reqCount)
         self.post_batch_rejection(ledgerId)
 
     def _track_batches(self, pp: PrePrepare, prevStateRootHash):
@@ -2186,6 +2183,10 @@ def revert_unordered_batches(self):
                 discarded = invalid_index_serializer.deserialize(discarded)
                 logger.debug('{} reverting 3PC key {}'.format(self, key))
                 self._revert(ledger_id, prevStateRoot, len_reqIdr - len(discarded))
+                pre_prepare = self.get_preprepare(*key)
+                if pre_prepare:
+                    for req_id in pre_prepare.reqIdr:
+                        self.requestQueues[ledger_id].add(req_id)
                 self._lastPrePrepareSeqNo -= 1
                 i += 1
             else: