Remove SetRemoteNodeId/SetLocalNodeId from RendezvousParameters (#9830)

project-chip · Sep 20, 2021 · f2c89ed · f2c89ed
1 parent 3d9cb11
commit f2c89ed
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 19 deletions.
diff --git 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
@@ -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