Remove unused FifoTransactionManager. (#1966)

Author: janiversen

pymodbus/transaction.py

@@ -1,7 +1,6 @@
 """Collection of transaction based abstractions."""
 
 __all__ = [
-    "FifoTransactionManager",
     "DictTransactionManager",
     "ModbusSocketFramer",
     "ModbusTlsFramer",
@@ -520,56 +519,3 @@ def delTransaction(self, tid):
         """
         Log.debug("deleting transaction {}", tid)
         self.transactions.pop(tid, None)
-
-
-class FifoTransactionManager(ModbusTransactionManager):
-    """Implements a transaction.
-
-    For a manager where the results are returned in a FIFO manner.
-    """
-
-    def __init__(self, client, **kwargs):
-        """Initialize an instance of the ModbusTransactionManager.
-
-        :param client: The client socket wrapper
-        """
-        super().__init__(client, **kwargs)
-        self.transactions = []
-
-    def __iter__(self):
-        """Iterate over the current managed transactions.
-
-        :returns: An iterator of the managed transactions
-        """
-        return iter(self.transactions)
-
-    def addTransaction(self, request, tid=None):
-        """Add a transaction to the handler.
-
-        This holds the requests in case it needs to be resent.
-        After being sent, the request is removed.
-
-        :param request: The request to hold on to
-        :param tid: The overloaded transaction id to use
-        """
-        tid = tid if tid is not None else request.transaction_id
-        Log.debug("Adding transaction {}", tid)
-        self.transactions.append(request)
-
-    def getTransaction(self, tid):
-        """Return a transaction matching the referenced tid.
-
-        If the transaction does not exist, None is returned
-
-        :param tid: The transaction to retrieve
-        """
-        return self.transactions.pop(0) if self.transactions else None
-
-    def delTransaction(self, tid):
-        """Remove a transaction matching the referenced tid.
-
-        :param tid: The transaction to remove
-        """
-        Log.debug("Deleting transaction {}", tid)
-        if self.transactions:
-            self.transactions.pop(0)

test/test_transaction.py

@@ -13,7 +13,6 @@
 from pymodbus.pdu import ModbusRequest
 from pymodbus.transaction import (
     DictTransactionManager,
-    FifoTransactionManager,
     ModbusAsciiFramer,
     ModbusBinaryFramer,
     ModbusRtuFramer,
@@ -37,7 +36,6 @@ class TestTransaction:  # pylint: disable=too-many-public-methods
     _ascii = None
     _binary = None
     _manager = None
-    _queue_manager = None
     _tm = None
 
     # ----------------------------------------------------------------------- #
@@ -53,7 +51,6 @@ def setup_method(self):
         self._ascii = ModbusAsciiFramer(decoder=self.decoder, client=None)
         self._binary = ModbusBinaryFramer(decoder=self.decoder, client=None)
         self._manager = DictTransactionManager(self.client)
-        self._queue_manager = FifoTransactionManager(self.client)
         self._tm = ModbusTransactionManager(self.client)
 
     # ----------------------------------------------------------------------- #
@@ -245,49 +242,6 @@ class Request:  # pylint: disable=too-few-public-methods
         self._manager.delTransaction(handle.transaction_id)
         assert not self._manager.getTransaction(handle.transaction_id)
 
-    # ----------------------------------------------------------------------- #
-    # Queue based transaction manager
-    # ----------------------------------------------------------------------- #
-    def test_fifo_transaction_manager_tid(self):
-        """Test the fifo transaction manager TID."""
-        for tid in range(1, self._queue_manager.getNextTID() + 10):
-            assert tid + 1 == self._queue_manager.getNextTID()
-        self._queue_manager.reset()
-        assert self._queue_manager.getNextTID() == 1
-
-    def test_get_fifo_transaction_manager_transaction(self):
-        """Test the fifo transaction manager."""
-
-        class Request:  # pylint: disable=too-few-public-methods
-            """Request."""
-
-        self._queue_manager.reset()
-        handle = Request()
-        handle.transaction_id = (  # pylint: disable=attribute-defined-outside-init
-            self._queue_manager.getNextTID()
-        )
-        handle.message = b"testing"  # pylint: disable=attribute-defined-outside-init
-        self._queue_manager.addTransaction(handle)
-        result = self._queue_manager.getTransaction(handle.transaction_id)
-        assert handle.message == result.message
-
-    def test_delete_fifo_transaction_manager_transaction(self):
-        """Test the fifo transaction manager."""
-
-        class Request:  # pylint: disable=too-few-public-methods
-            """Request."""
-
-        self._queue_manager.reset()
-        handle = Request()
-        handle.transaction_id = (  # pylint: disable=attribute-defined-outside-init
-            self._queue_manager.getNextTID()
-        )
-        handle.message = b"testing"  # pylint: disable=attribute-defined-outside-init
-
-        self._queue_manager.addTransaction(handle)
-        self._queue_manager.delTransaction(handle.transaction_id)
-        assert not self._queue_manager.getTransaction(handle.transaction_id)
-
     # ----------------------------------------------------------------------- #
     # TCP tests
     # ----------------------------------------------------------------------- #