From 115264362f8b10ad268d09c626edb6ee649edb29 Mon Sep 17 00:00:00 2001
From: Zang MingJie <mingjiez@google.com>
Date: Sat, 23 Apr 2022 20:42:19 +0800
Subject: [PATCH] ExchageContext: remove unused flag (#17661)

---
 src/messaging/ExchangeContext.cpp      |  1 -
 src/messaging/ExchangeMgr.cpp          |  7 -----
 src/messaging/ReliableMessageContext.h | 37 +++-----------------------
 3 files changed, 3 insertions(+), 42 deletions(-)

diff --git a/src/messaging/ExchangeContext.cpp b/src/messaging/ExchangeContext.cpp
index 64d8868c837efc..c75c687ea5e5e2 100644
--- a/src/messaging/ExchangeContext.cpp
+++ b/src/messaging/ExchangeContext.cpp
@@ -285,7 +285,6 @@ ExchangeContext::ExchangeContext(ExchangeManager * em, uint16_t ExchangeId, cons
 
     SetDropAckDebug(false);
     SetAckPending(false);
-    SetMsgRcvdFromPeer(false);
 
     // Do not request Ack for multicast
     SetAutoRequestAck(!session->IsGroupSession());
diff --git a/src/messaging/ExchangeMgr.cpp b/src/messaging/ExchangeMgr.cpp
index c59f2e7932e060..f54064b7d97109 100644
--- a/src/messaging/ExchangeMgr.cpp
+++ b/src/messaging/ExchangeMgr.cpp
@@ -208,13 +208,6 @@ void ExchangeManager::OnMessageReceived(const PacketHeader & packetHeader, const
         mContextPool.ForEachActiveObject([&](auto * ec) {
             if (ec->MatchExchange(session, packetHeader, payloadHeader))
             {
-                // Found a matching exchange. Set flag for correct subsequent MRP
-                // retransmission timeout selection.
-                if (!ec->HasRcvdMsgFromPeer())
-                {
-                    ec->SetMsgRcvdFromPeer(true);
-                }
-
                 ChipLogDetail(ExchangeManager, "Found matching exchange: " ChipLogFormatExchange ", Delegate: %p",
                               ChipLogValueExchange(ec), ec->GetDelegate());
 
diff --git a/src/messaging/ReliableMessageContext.h b/src/messaging/ReliableMessageContext.h
index d60c057f61086f..f82e94201d8a64 100644
--- a/src/messaging/ReliableMessageContext.h
+++ b/src/messaging/ReliableMessageContext.h
@@ -129,24 +129,6 @@ class ReliableMessageContext
      */
     bool IsAckPending() const;
 
-    /**
-     *  Determine whether at least one message has been received
-     *  on this exchange from peer.
-     *
-     *  @return Returns 'true' if message received, else 'false'.
-     */
-    bool HasRcvdMsgFromPeer() const;
-
-    /**
-     *  Set if a message has been received from the peer
-     *  on this exchange.
-     *
-     *  @param[in]  inMsgRcvdFromPeer  A Boolean indicating whether (true) or not
-     *                                 (false) a message has been received
-     *                                 from the peer on this exchange context.
-     */
-    void SetMsgRcvdFromPeer(bool inMsgRcvdFromPeer);
-
     /// Determine whether there is message hasn't been acknowledged.
     bool IsMessageNotAcked() const;
 
@@ -192,17 +174,14 @@ class ReliableMessageContext
         /// some message we have needed to acknowledge in the past.
         kFlagAckMessageCounterIsValid = (1u << 6),
 
-        /// When set, signifies that at least one message has been received from peer on this exchange context.
-        kFlagMsgRcvdFromPeer = (1u << 7),
-
         /// When set, signifies that this exchange is waiting for a call to SendMessage.
-        kFlagWillSendMessage = (1u << 8),
+        kFlagWillSendMessage = (1u << 7),
 
         /// When set, we have had Close() or Abort() called on us already.
-        kFlagClosed = (1u << 9),
+        kFlagClosed = (1u << 8),
 
         /// When set, signifies that the exchange is requesting Sleepy End Device fast-polling mode.
-        kFlagFastPollingMode = (1u << 10),
+        kFlagFastPollingMode = (1u << 9),
     };
 
     BitFlags<Flags> mFlags; // Internal state flags
@@ -244,11 +223,6 @@ inline bool ReliableMessageContext::IsAckPending() const
     return mFlags.Has(Flags::kFlagAckPending);
 }
 
-inline bool ReliableMessageContext::HasRcvdMsgFromPeer() const
-{
-    return mFlags.Has(Flags::kFlagMsgRcvdFromPeer);
-}
-
 inline bool ReliableMessageContext::IsMessageNotAcked() const
 {
     return mFlags.Has(Flags::kFlagMessageNotAcked);
@@ -274,11 +248,6 @@ inline void ReliableMessageContext::SetAutoRequestAck(bool autoReqAck)
     mFlags.Set(Flags::kFlagAutoRequestAck, autoReqAck);
 }
 
-inline void ReliableMessageContext::SetMsgRcvdFromPeer(bool inMsgRcvdFromPeer)
-{
-    mFlags.Set(Flags::kFlagMsgRcvdFromPeer, inMsgRcvdFromPeer);
-}
-
 inline void ReliableMessageContext::SetAckPending(bool inAckPending)
 {
     mFlags.Set(Flags::kFlagAckPending, inAckPending);