From f2c89edd4f712c5e4bb977247eeb790af27221b2 Mon Sep 17 00:00:00 2001
From: Vivien Nicolas <vnicolas@apple.com>
Date: Mon, 20 Sep 2021 21:37:01 +0200
Subject: [PATCH] Remove SetRemoteNodeId/SetLocalNodeId from
 RendezvousParameters (#9830)

---
 .../python/chip/internal/CommissionerImpl.cpp  |  2 +-
 .../secure_channel/RendezvousParameters.h      | 18 ------------------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/src/controller/python/chip/internal/CommissionerImpl.cpp b/src/controller/python/chip/internal/CommissionerImpl.cpp
index b42a39cd9300c9..c7cab06ee31cd2 100644
--- a/src/controller/python/chip/internal/CommissionerImpl.cpp
+++ b/src/controller/python/chip/internal/CommissionerImpl.cpp
@@ -173,7 +173,7 @@ pychip_internal_Commissioner_BleConnectForPairing(chip::Controller::DeviceCommis
     chip::python::ChipMainThreadScheduleAndWait([&]() {
         chip::RendezvousParameters params;
 
-        params.SetDiscriminator(discriminator).SetSetupPINCode(pinCode).SetRemoteNodeId(remoteNodeId);
+        params.SetDiscriminator(discriminator).SetSetupPINCode(pinCode);
 #if CONFIG_NETWORK_LAYER_BLE
         params.SetBleLayer(chip::DeviceLayer::ConnectivityMgr().GetBleLayer()).SetPeerAddress(chip::Transport::PeerAddress::BLE());
 #endif
diff --git a/src/protocols/secure_channel/RendezvousParameters.h b/src/protocols/secure_channel/RendezvousParameters.h
index 4f13d4f6e24890..9a4d8401adda00 100644
--- a/src/protocols/secure_channel/RendezvousParameters.h
+++ b/src/protocols/secure_channel/RendezvousParameters.h
@@ -70,22 +70,6 @@ class RendezvousParameters
         return *this;
     }
 
-    bool HasLocalNodeId() const { return mLocalNodeId.HasValue(); }
-    const Optional<NodeId> GetLocalNodeId() const { return mLocalNodeId; }
-    RendezvousParameters & SetLocalNodeId(NodeId nodeId)
-    {
-        mLocalNodeId.SetValue(nodeId);
-        return *this;
-    }
-
-    bool HasRemoteNodeId() const { return mRemoteNodeId.HasValue(); }
-    const Optional<NodeId> GetRemoteNodeId() const { return mRemoteNodeId; }
-    RendezvousParameters & SetRemoteNodeId(NodeId nodeId)
-    {
-        mRemoteNodeId.SetValue(nodeId);
-        return *this;
-    }
-
     bool HasPASEVerifier() const { return mHasPASEVerifier; }
     bool HasCSRNonce() const { return mCSRNonce.HasValue(); }
     const PASEVerifier & GetPASEVerifier() const { return mPASEVerifier; }
@@ -117,9 +101,7 @@ class RendezvousParameters
 #endif // CONFIG_NETWORK_LAYER_BLE
 
 private:
-    Optional<NodeId> mLocalNodeId;        ///< the local node id
     Transport::PeerAddress mPeerAddress;  ///< the peer node address
-    Optional<NodeId> mRemoteNodeId;       ///< the remote node id
     uint32_t mSetupPINCode  = 0;          ///< the target peripheral setup PIN Code
     uint16_t mDiscriminator = UINT16_MAX; ///< the target peripheral discriminator
     Optional<ByteSpan> mCSRNonce;         ///< CSR Nonce passed by the commissioner