Manual changes to make the mass-replaces compile.

project-chip · Feb 14, 2023 · 1efc319 · 1efc319
1 parent 7990de5
commit 1efc319
Show file tree

Hide file tree

Showing 18 changed files with 110 additions and 76 deletions.
diff --git a/src/app/clusters/account-login-server/account-login-server.cpp b/src/app/clusters/account-login-server/account-login-server.cpp
@@ -41,6 +41,7 @@ using namespace chip::app::Clusters::AccountLogin;
 using namespace chip::AppPlatform;
 #endif // CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED
 using chip::app::Clusters::AccountLogin::Delegate;
+using chip::Protocols::InteractionModel::Status;
 
 static constexpr size_t kAccountLoginDeletageTableSize =
     EMBER_AF_ACCOUNT_LOGIN_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT;
@@ -125,7 +126,7 @@ bool emberAfAccountLoginClusterGetSetupPINCallback(app::CommandHandler * command
     {
         ChipLogError(Zcl, "emberAfAccountLoginClusterGetSetupPINCallback error: %s", err.AsString());
 
-        commandObj->AddStatus(commandPath, Status::Failure);
+        command->AddStatus(commandPath, Status::Failure);
     }
 
     return true;

diff --git a/src/app/clusters/administrator-commissioning-server/administrator-commissioning-server.cpp b/src/app/clusters/administrator-commissioning-server/administrator-commissioning-server.cpp
@@ -41,6 +41,7 @@ using namespace chip::app;
 using namespace chip::app::Clusters;
 using namespace chip::app::Clusters::AdministratorCommissioning;
 using namespace chip::Protocols;
+using chip::Protocols::InteractionModel::Status;
 
 class AdministratorCommissioningAttrAccess : public AttributeAccessInterface
 {

diff --git a/src/app/clusters/application-launcher-server/application-launcher-server.cpp b/src/app/clusters/application-launcher-server/application-launcher-server.cpp
@@ -55,6 +55,7 @@ static constexpr size_t kApplicationLauncherDelegateTableSize =
 using chip::app::Clusters::ApplicationBasic::CatalogVendorApp;
 using chip::app::Clusters::ApplicationLauncher::Delegate;
 using ApplicationStatusEnum = app::Clusters::ApplicationBasic::ApplicationStatusEnum;
+using chip::Protocols::InteractionModel::Status;
 
 namespace {
 
@@ -301,7 +302,7 @@ bool emberAfApplicationLauncherClusterLaunchAppCallback(app::CommandHandler * co
     if (err != CHIP_NO_ERROR)
     {
         ChipLogError(Zcl, "emberAfApplicationLauncherClusterLaunchAppCallback error: %s", err.AsString());
-        commandObj->AddStatus(commandPath, Status::Failure);
+        command->AddStatus(commandPath, Status::Failure);
     }
 
     return true;
@@ -390,7 +391,7 @@ bool emberAfApplicationLauncherClusterStopAppCallback(app::CommandHandler * comm
     if (err != CHIP_NO_ERROR)
     {
         ChipLogError(Zcl, "emberAfApplicationLauncherClusterStopAppCallback error: %s", err.AsString());
-        commandObj->AddStatus(commandPath, Status::Failure);
+        command->AddStatus(commandPath, Status::Failure);
     }
 
     return true;
@@ -475,7 +476,7 @@ bool emberAfApplicationLauncherClusterHideAppCallback(app::CommandHandler * comm
     if (err != CHIP_NO_ERROR)
     {
         ChipLogError(Zcl, "emberAfApplicationLauncherClusterStopAppCallback error: %s", err.AsString());
-        commandObj->AddStatus(commandPath, Status::Failure);
+        command->AddStatus(commandPath, Status::Failure);
     }
 
     return true;

diff --git a/src/app/clusters/channel-server/channel-server.cpp b/src/app/clusters/channel-server/channel-server.cpp
@@ -34,6 +34,7 @@ using namespace chip::app::Clusters::Channel;
 #if CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED
 using namespace chip::AppPlatform;
 #endif // CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED
+using chip::Protocols::InteractionModel::Status;
 
 static constexpr size_t kChannelDelegateTableSize =
     EMBER_AF_CHANNEL_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT;
@@ -223,7 +224,7 @@ bool emberAfChannelClusterChangeChannelCallback(app::CommandHandler * command, c
     // If isDelegateNull, no one will call responder, so HasSentResponse will be false
     if (!responder.HasSentResponse())
     {
-        commandObj->AddStatus(commandPath, Status::Failure);
+        command->AddStatus(commandPath, Status::Failure);
     }
 
     return true;

diff --git a/src/app/clusters/color-control-server/color-control-server.cpp b/src/app/clusters/color-control-server/color-control-server.cpp
diff --git a/src/app/clusters/color-control-server/color-control-server.h b/src/app/clusters/color-control-server/color-control-server.h
@@ -18,6 +18,7 @@
 #pragma once
 
 #include <app-common/zap-generated/cluster-objects.h>
+#include <app/CommandHandler.h>
 #include <app/ConcreteCommandPath.h>
 #include <app/util/af-types.h>
 #include <app/util/basic-types.h>
@@ -133,42 +134,45 @@ class ColorControlServer
     bool stopMoveStepCommand(chip::EndpointId, uint8_t optionsMask, uint8_t optionsOverride);
 
 #ifdef EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_HSV
-    bool moveHueCommand(chip::EndpointId endpoint, uint8_t moveMode, uint16_t rate, uint8_t optionsMask, uint8_t optionsOverride,
+    bool moveHueCommand(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+                        uint8_t moveMode, uint16_t rate, uint8_t optionsMask, uint8_t optionsOverride, bool isEnhanced);
+    bool moveToHueCommand(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, uint16_t hue,
+                          uint8_t hueMoveMode, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride,
+                          bool isEnhanced);
+    bool moveToHueAndSaturationCommand(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+                                       uint16_t hue, uint8_t saturation, uint16_t transitionTime, uint8_t optionsMask,
+                                       uint8_t optionsOverride, bool isEnhanced);
+    bool stepHueCommand(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+                        uint8_t stepMode, uint16_t stepSize, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride,
                         bool isEnhanced);
-    bool moveToHueCommand(chip::EndpointId endpoint, uint16_t hue, uint8_t hueMoveMode, uint16_t transitionTime,
-                          uint8_t optionsMask, uint8_t optionsOverride, bool isEnhanced);
-    bool moveToHueAndSaturationCommand(chip::EndpointId endpoint, uint16_t hue, uint8_t saturation, uint16_t transitionTime,
-                                       uint8_t optionsMask, uint8_t optionsOverride, bool isEnhanced);
-    bool stepHueCommand(chip::EndpointId endpoint, uint8_t stepMode, uint16_t stepSize, uint16_t transitionTime,
-                        uint8_t optionsMask, uint8_t optionsOverride, bool isEnhanced);
-    bool moveSaturationCommand(const chip::app::ConcreteCommandPath & commandPath,
+    bool moveSaturationCommand(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
                                const chip::app::Clusters::ColorControl::Commands::MoveSaturation::DecodableType & commandData);
-    bool moveToSaturationCommand(const chip::app::ConcreteCommandPath & commandPath,
+    bool moveToSaturationCommand(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
                                  const chip::app::Clusters::ColorControl::Commands::MoveToSaturation::DecodableType & commandData);
-    bool stepSaturationCommand(const chip::app::ConcreteCommandPath & commandPath,
+    bool stepSaturationCommand(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
                                const chip::app::Clusters::ColorControl::Commands::StepSaturation::DecodableType & commandData);
-    bool colorLoopCommand(const chip::app::ConcreteCommandPath & commandPath,
+    bool colorLoopCommand(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
                           const chip::app::Clusters::ColorControl::Commands::ColorLoopSet::DecodableType & commandData);
     void updateHueSatCommand(chip::EndpointId endpoint);
 #endif // EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_HSV
 
 #ifdef EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_XY
-    bool moveToColorCommand(const chip::app::ConcreteCommandPath & commandPath,
+    bool moveToColorCommand(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
                             const chip::app::Clusters::ColorControl::Commands::MoveToColor::DecodableType & commandData);
-    bool moveColorCommand(const chip::app::ConcreteCommandPath & commandPath,
+    bool moveColorCommand(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
                           const chip::app::Clusters::ColorControl::Commands::MoveColor::DecodableType & commandData);
-    bool stepColorCommand(const chip::app::ConcreteCommandPath & commandPath,
+    bool stepColorCommand(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
                           const chip::app::Clusters::ColorControl::Commands::StepColor::DecodableType & commandData);
     void updateXYCommand(chip::EndpointId endpoint);
 #endif // EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_XY
 
 #ifdef EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP
-    bool moveColorTempCommand(const chip::app::ConcreteCommandPath & commandPath,
+    bool moveColorTempCommand(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
                               const chip::app::Clusters::ColorControl::Commands::MoveColorTemperature::DecodableType & commandData);
     bool
-    moveToColorTempCommand(const chip::app::ConcreteCommandPath & commandPath,
+    moveToColorTempCommand(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
                            const chip::app::Clusters::ColorControl::Commands::MoveToColorTemperature::DecodableType & commandData);
-    bool stepColorTempCommand(const chip::app::ConcreteCommandPath & commandPath,
+    bool stepColorTempCommand(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
                               const chip::app::Clusters::ColorControl::Commands::StepColorTemperature::DecodableType & commandData);
     void levelControlColorTempChangeCommand(chip::EndpointId endpoint);
     void startUpColorTempCommand(chip::EndpointId endpoint);

diff --git a/src/app/clusters/content-launch-server/content-launch-server.cpp b/src/app/clusters/content-launch-server/content-launch-server.cpp
@@ -39,6 +39,7 @@ using namespace chip::app::Clusters::ContentLauncher;
 #if CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED
 using namespace chip::AppPlatform;
 #endif // CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED
+using chip::Protocols::InteractionModel::Status;
 
 static constexpr size_t kContentLaunchDelegateTableSize =
     EMBER_AF_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT;

diff --git a/src/app/clusters/door-lock-server/door-lock-server.cpp b/src/app/clusters/door-lock-server/door-lock-server.cpp
@@ -41,6 +41,7 @@ using namespace chip;
 using namespace chip::app;
 using namespace chip::app::DataModel;
 using namespace chip::app::Clusters::DoorLock;
+using chip::Protocols::InteractionModel::Status;
 
 static constexpr uint8_t DOOR_LOCK_SCHEDULE_MAX_HOUR   = 23;
 static constexpr uint8_t DOOR_LOCK_SCHEDULE_MAX_MINUTE = 59;

diff --git a/src/app/clusters/group-key-mgmt-server/group-key-mgmt-server.cpp b/src/app/clusters/group-key-mgmt-server/group-key-mgmt-server.cpp
@@ -31,6 +31,7 @@ using namespace chip::app;
 using namespace chip::Credentials;
 using namespace chip::app::Clusters;
 using namespace chip::app::Clusters::GroupKeyManagement;
+using chip::Protocols::InteractionModel::Status;
 
 //
 // Attributes

diff --git a/src/app/clusters/identify-server/identify-server.cpp b/src/app/clusters/identify-server/identify-server.cpp
@@ -43,6 +43,7 @@
 using namespace chip;
 using namespace chip::app;
 using namespace chip::app::Clusters::Identify;
+using chip::Protocols::InteractionModel::Status;
 
 static Identify * firstIdentify = nullptr;
 

diff --git a/src/app/clusters/keypad-input-server/keypad-input-server.cpp b/src/app/clusters/keypad-input-server/keypad-input-server.cpp
@@ -42,6 +42,7 @@ using namespace chip::app::Clusters::KeypadInput;
 #if CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED
 using namespace chip::AppPlatform;
 #endif // CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED
+using chip::Protocols::InteractionModel::Status;
 
 static constexpr size_t kKeypadInputDelegateTableSize =
     EMBER_AF_KEYPAD_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT;
@@ -183,7 +184,7 @@ bool emberAfKeypadInputClusterSendKeyCallback(app::CommandHandler * command, con
     if (err != CHIP_NO_ERROR)
     {
         ChipLogError(Zcl, "emberAfKeypadInputClusterSendKeyCallback error: %s", err.AsString());
-        commandObj->AddStatus(commandPath, Status::Failure);
+        command->AddStatus(commandPath, Status::Failure);
     }
     return true;
 }

diff --git a/src/app/clusters/media-playback-server/media-playback-server.cpp b/src/app/clusters/media-playback-server/media-playback-server.cpp
@@ -42,6 +42,7 @@ using namespace chip::app::Clusters::MediaPlayback;
 #if CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED
 using namespace chip::AppPlatform;
 #endif // CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED
+using chip::Protocols::InteractionModel::Status;
 
 static constexpr size_t kMediaPlaybackDelegateTableSize =
     EMBER_AF_MEDIA_PLAYBACK_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT;
@@ -245,7 +246,7 @@ bool emberAfMediaPlaybackClusterPlayCallback(app::CommandHandler * command, cons
     if (err != CHIP_NO_ERROR)
     {
         ChipLogError(Zcl, "emberAfMediaPlaybackClusterPlayCallback error: %s", err.AsString());
-        commandObj->AddStatus(commandPath, Status::Failure);
+        command->AddStatus(commandPath, Status::Failure);
     }
 
     return true;
@@ -269,7 +270,7 @@ bool emberAfMediaPlaybackClusterPauseCallback(app::CommandHandler * command, con
     if (err != CHIP_NO_ERROR)
     {
         ChipLogError(Zcl, "emberAfMediaPlaybackClusterPauseCallback error: %s", err.AsString());
-        commandObj->AddStatus(commandPath, Status::Failure);
+        command->AddStatus(commandPath, Status::Failure);
     }
 
     return true;
@@ -293,7 +294,7 @@ bool emberAfMediaPlaybackClusterStopCallback(app::CommandHandler * command, cons
     if (err != CHIP_NO_ERROR)
     {
         ChipLogError(Zcl, "emberAfMediaPlaybackClusterStopCallback error: %s", err.AsString());
-        commandObj->AddStatus(commandPath, Status::Failure);
+        command->AddStatus(commandPath, Status::Failure);
     }
 
     return true;
@@ -317,7 +318,7 @@ bool emberAfMediaPlaybackClusterFastForwardCallback(app::CommandHandler * comman
     if (err != CHIP_NO_ERROR)
     {
         ChipLogError(Zcl, "emberAfMediaPlaybackClusterFastForwardCallback error: %s", err.AsString());
-        commandObj->AddStatus(commandPath, Status::Failure);
+        command->AddStatus(commandPath, Status::Failure);
     }
 
     return true;
@@ -341,7 +342,7 @@ bool emberAfMediaPlaybackClusterPreviousCallback(app::CommandHandler * command,
     if (err != CHIP_NO_ERROR)
     {
         ChipLogError(Zcl, "emberAfMediaPlaybackClusterPreviousCallback error: %s", err.AsString());
-        commandObj->AddStatus(commandPath, Status::Failure);
+        command->AddStatus(commandPath, Status::Failure);
     }
 
     return true;
@@ -365,7 +366,7 @@ bool emberAfMediaPlaybackClusterRewindCallback(app::CommandHandler * command, co
     if (err != CHIP_NO_ERROR)
     {
         ChipLogError(Zcl, "emberAfMediaPlaybackClusterRewindCallback error: %s", err.AsString());
-        commandObj->AddStatus(commandPath, Status::Failure);
+        command->AddStatus(commandPath, Status::Failure);
     }
 
     return true;
@@ -391,7 +392,7 @@ bool emberAfMediaPlaybackClusterSkipBackwardCallback(app::CommandHandler * comma
     if (err != CHIP_NO_ERROR)
     {
         ChipLogError(Zcl, "emberAfMediaPlaybackClusterSkipBackwardCallback error: %s", err.AsString());
-        commandObj->AddStatus(commandPath, Status::Failure);
+        command->AddStatus(commandPath, Status::Failure);
     }
 
     return true;
@@ -416,7 +417,7 @@ bool emberAfMediaPlaybackClusterSkipForwardCallback(app::CommandHandler * comman
     if (err != CHIP_NO_ERROR)
     {
         ChipLogError(Zcl, "emberAfMediaPlaybackClusterSkipForwardCallback error: %s", err.AsString());
-        commandObj->AddStatus(commandPath, Status::Failure);
+        command->AddStatus(commandPath, Status::Failure);
     }
 
     return true;
@@ -441,7 +442,7 @@ bool emberAfMediaPlaybackClusterSeekCallback(app::CommandHandler * command, cons
     if (err != CHIP_NO_ERROR)
     {
         ChipLogError(Zcl, "emberAfMediaPlaybackClusterSeekCallback error: %s", err.AsString());
-        commandObj->AddStatus(commandPath, Status::Failure);
+        command->AddStatus(commandPath, Status::Failure);
     }
 
     return true;
@@ -465,7 +466,7 @@ bool emberAfMediaPlaybackClusterNextCallback(app::CommandHandler * command, cons
     if (err != CHIP_NO_ERROR)
     {
         ChipLogError(Zcl, "emberAfMediaPlaybackClusterNextCallback error: %s", err.AsString());
-        commandObj->AddStatus(commandPath, Status::Failure);
+        command->AddStatus(commandPath, Status::Failure);
     }
 
     return true;
@@ -489,7 +490,7 @@ bool emberAfMediaPlaybackClusterStartOverCallback(app::CommandHandler * command,
     if (err != CHIP_NO_ERROR)
     {
         ChipLogError(Zcl, "emberAfMediaPlaybackClusterStartOverCallback error: %s", err.AsString());
-        commandObj->AddStatus(commandPath, Status::Failure);
+        command->AddStatus(commandPath, Status::Failure);
     }
 
     return true;

diff --git a/src/app/clusters/mode-select-server/mode-select-server.cpp b/src/app/clusters/mode-select-server/mode-select-server.cpp
@@ -40,6 +40,7 @@ using namespace chip::app;
 using namespace chip::app::Clusters;
 using namespace chip::app::Clusters::ModeSelect;
 using namespace chip::Protocols;
+using chip::Protocols::InteractionModel::Status;
 
 using BootReasonType = GeneralDiagnostics::BootReasonEnum;
 
@@ -110,7 +111,7 @@ bool emberAfModeSelectClusterChangeToModeCallback(CommandHandler * commandHandle
     ModeSelect::Attributes::CurrentMode::Set(endpointId, newMode);
 
     emberAfPrintln(EMBER_AF_PRINT_DEBUG, "ModeSelect: ChangeToMode successful");
-    commandObj->AddStatus(commandPath, Status::Success);
+    commandHandler->AddStatus(commandPath, Status::Success);
     return true;
 }
 

diff --git a/src/app/clusters/on-off-server/on-off-server.cpp b/src/app/clusters/on-off-server/on-off-server.cpp
@@ -35,6 +35,7 @@
 using namespace chip;
 using namespace chip::app::Clusters;
 using namespace chip::app::Clusters::OnOff;
+using chip::Protocols::InteractionModel::Status;
 
 /**********************************************************
  * Attributes Definition

diff --git a/src/app/clusters/target-navigator-server/target-navigator-server.cpp b/src/app/clusters/target-navigator-server/target-navigator-server.cpp
@@ -41,6 +41,7 @@ using namespace chip::app::Clusters::TargetNavigator;
 #if CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED
 using namespace chip::AppPlatform;
 #endif // CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED
+using chip::Protocols::InteractionModel::Status;
 
 static constexpr size_t kTargetNavigatorDelegateTableSize =
     EMBER_AF_TARGET_NAVIGATOR_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT;
@@ -191,7 +192,7 @@ bool emberAfTargetNavigatorClusterNavigateTargetCallback(app::CommandHandler * c
     if (err != CHIP_NO_ERROR)
     {
         ChipLogError(Zcl, "emberAfTargetNavigatorClusterNavigateTargetCallback error: %s", err.AsString());
-        commandObj->AddStatus(commandPath, Status::Failure);
+        command->AddStatus(commandPath, Status::Failure);
     }
 
     return true;

diff --git a/src/app/clusters/test-cluster-server/test-cluster-server.cpp b/src/app/clusters/test-cluster-server/test-cluster-server.cpp
@@ -41,6 +41,7 @@ using namespace chip::app::Clusters;
 using namespace chip::app::Clusters::UnitTesting;
 using namespace chip::app::Clusters::UnitTesting::Commands;
 using namespace chip::app::Clusters::UnitTesting::Attributes;
+using chip::Protocols::InteractionModel::Status;
 
 // The number of elements in the test attribute list
 constexpr uint8_t kAttributeListLength = 4;
@@ -674,7 +675,7 @@ CHIP_ERROR TestAttrAccess::WriteListFabricScopedAttribute(const ConcreteDataAttr
 
 } // namespace
 
-bool emberAfUnitTestingClusterTestCallback(app::CommandHandler *, const app::ConcreteCommandPath & commandPath,
+bool emberAfUnitTestingClusterTestCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
                                            const Clusters::UnitTesting::Commands::Test::DecodableType & commandData)
 {
     // Setup the test variables
@@ -720,7 +721,8 @@ bool emberAfUnitTestingClusterTestAddArgumentsCallback(CommandHandler * apComman
 {
     if (commandData.arg1 > UINT8_MAX - commandData.arg2)
     {
-        return commandObj->AddStatus(commandPath, Status::InvalidCommand);
+        apCommandObj->AddStatus(commandPath, Status::InvalidCommand);
+        return true;
     }
 
     TestAddArgumentsResponse::Type responseData;

diff --git a/src/app/clusters/thread-network-diagnostics-server/thread-network-diagnostics-server.cpp b/src/app/clusters/thread-network-diagnostics-server/thread-network-diagnostics-server.cpp
@@ -37,6 +37,7 @@ using namespace chip::app::Clusters;
 using namespace chip::app::Clusters::ThreadNetworkDiagnostics;
 using namespace chip::app::Clusters::ThreadNetworkDiagnostics::Attributes;
 using namespace chip::DeviceLayer;
+using chip::Protocols::InteractionModel::Status;
 
 namespace {
 

diff --git a/src/app/clusters/window-covering-server/window-covering-server.cpp b/src/app/clusters/window-covering-server/window-covering-server.cpp
@@ -36,6 +36,7 @@
 using namespace chip;
 using namespace chip::app::Clusters;
 using namespace chip::app::Clusters::WindowCovering;
+using chip::Protocols::InteractionModel::Status;
 
 #define CHECK_BOUNDS_INVALID(MIN, VAL, MAX) ((VAL < MIN) || (VAL > MAX))
 #define CHECK_BOUNDS_VALID(MIN, VAL, MAX) (!CHECK_BOUNDS_INVALID(MIN, VAL, MAX))
@@ -755,7 +756,7 @@ bool emberAfWindowCoveringClusterStopMotionCallback(app::CommandHandler * comman
         (void) Attributes::TargetPositionTiltPercent100ths::Set(endpoint, current);
     }
 
-    return EMBER_SUCCESS == commandObj->AddStatus(commandPath, Status::Success);
+    return CHIP_NO_ERROR == commandObj->AddStatus(commandPath, Status::Success);
 }
 
 /**