From e5e3b16a889baee7a23be3101ec624c98169ba81 Mon Sep 17 00:00:00 2001
From: Sandeep Mistry <sandeep.mistry@arm.com>
Date: Wed, 14 Sep 2022 15:13:01 -0400
Subject: [PATCH] Python: Use TestOnlyCommissionableDataProvider instead of
 LinuxCommissionableDataProvider

---
 src/controller/python/BUILD.gn                | 21 ++++--------------
 .../python/chip/server/ServerInit.cpp         | 22 +++----------------
 2 files changed, 7 insertions(+), 36 deletions(-)

diff --git a/src/controller/python/BUILD.gn b/src/controller/python/BUILD.gn
index fbb3e068598f26..22ca355b67e02c 100644
--- a/src/controller/python/BUILD.gn
+++ b/src/controller/python/BUILD.gn
@@ -73,23 +73,10 @@ shared_library("ChipDeviceCtrl") {
       "chip/utils/DeviceProxyUtils.cpp",
     ]
   } else {
-    sources += [ "chip/server/ServerInit.cpp" ]
-
-    if (current_os == "linux") {
-      include_dirs += [ "${chip_root}/examples/platform/linux" ]
-
-      sources += [
-        "${chip_root}/examples/platform/linux/CommissionableInit.cpp",
-        "${chip_root}/examples/platform/linux/CommissionableInit.h",
-        "${chip_root}/examples/platform/linux/LinuxCommissionableDataProvider.cpp",
-        "${chip_root}/examples/platform/linux/LinuxCommissionableDataProvider.h",
-        "${chip_root}/examples/platform/linux/Options.cpp",
-        "${chip_root}/examples/platform/linux/testing/CustomCSRResponseOperationalKeyStore.cpp",
-        "${chip_root}/examples/platform/linux/testing/CustomCSRResponseOperationalKeyStore.h",
-      ]
-    } else {
-      sources += [ "chip/server/Options.cpp" ]
-    }
+    sources += [
+      "chip/server/ServerInit.cpp",
+      "chip/server/Options.cpp"
+    ]
   }
 
   if (chip_enable_ble) {
diff --git a/src/controller/python/chip/server/ServerInit.cpp b/src/controller/python/chip/server/ServerInit.cpp
index 65d73968b6ee34..2f6c011e0a89c5 100644
--- a/src/controller/python/chip/server/ServerInit.cpp
+++ b/src/controller/python/chip/server/ServerInit.cpp
@@ -19,6 +19,7 @@
 
 #include <platform/CHIPDeviceLayer.h>
 #include <platform/PlatformManager.h>
+#include <platform/TestOnlyCommissionableDataProvider.h>
 
 #include <app/server/OnboardingCodesUtil.h>
 #include <app/server/Server.h>
@@ -34,12 +35,7 @@
 
 // #include <examples/platform/linux/AppMain.h>
 
-#if CHIP_DEVICE_LAYER_TARGET_LINUX
-#include "CommissionableInit.h"
-#include "LinuxCommissionableDataProvider.h"
-#else
 #include "Options.h"
-#endif
 
 using namespace chip;
 using namespace chip::Inet;
@@ -48,10 +44,6 @@ using namespace chip::DeviceLayer;
 
 namespace {
 
-#if CHIP_DEVICE_LAYER_TARGET_LINUX
-LinuxCommissionableDataProvider gCommissionableDataProvider;
-#endif
-
 void EventHandler(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg)
 {
     (void) arg;
@@ -147,16 +139,8 @@ void pychip_server_native_init()
         ChipLogError(DeviceLayer, "Failed to initialize CHIP stack: platform init failed: %s", chip::ErrorStr(err));
     }
 
-#if CHIP_DEVICE_LAYER_TARGET_LINUX
-    err = chip::examples::InitCommissionableDataProvider(gCommissionableDataProvider, LinuxDeviceOptions::GetInstance());
-    if (err != CHIP_NO_ERROR)
-    {
-        ChipLogError(DeviceLayer, "Failed to initialize CHIP stack: commisionable data provider init failed: %s",
-                     chip::ErrorStr(err));
-    }
-
-    DeviceLayer::SetCommissionableDataProvider(&gCommissionableDataProvider);
-#endif
+    static chip::DeviceLayer::TestOnlyCommissionableDataProvider TestOnlyCommissionableDataProvider;
+    chip::DeviceLayer::SetCommissionableDataProvider(&TestOnlyCommissionableDataProvider);
 
     ConfigurationMgr().LogDeviceConfig();