From 0ce56748fb320921ee01e38ec5d04f57db9cb3f7 Mon Sep 17 00:00:00 2001
From: Michael Sandstedt <michael.sandstedt@smartthings.com>
Date: Fri, 7 Jan 2022 10:33:12 -0600
Subject: [PATCH] remove workarounds for #13327, fixed by #13321

---
 src/commissioner/ExampleCommissioningStateMachine.cpp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/commissioner/ExampleCommissioningStateMachine.cpp b/src/commissioner/ExampleCommissioningStateMachine.cpp
index c4c879cd625808..b774f181b048a6 100644
--- a/src/commissioner/ExampleCommissioningStateMachine.cpp
+++ b/src/commissioner/ExampleCommissioningStateMachine.cpp
@@ -91,9 +91,7 @@ chip::StateMachine::Optional<State> Transitions::operator()(const State & state,
     {
         return mFactory.CreateInvokingArmFailSafe(event.Get<ArmFailSafe>());
     }
-    else if (state.Is<InvokingArmFailSafe>() &&
-             (event.Is<Success>() || event.Is<Failure>())) // TODO(#13327): accept failure; until #13327 is resolved, commissionees
-                                                           // will return ArmFailSafe instead of ArmFailSafeResponse
+    else if (state.Is<InvokingArmFailSafe>() && event.Is<Success>())
     {
         return mFactory.CreateFailSafeArmed();
     }
@@ -197,10 +195,7 @@ chip::StateMachine::Optional<State> Transitions::operator()(const State & state,
     {
         return mFactory.CreateInvokingCommissioningComplete();
     }
-    else if (state.Is<InvokingCommissioningComplete>() &&
-             (event.Is<Success>() ||
-              event.Is<Failure>())) // TODO(#13327): accept failure; until #13327 is resolved, commissionees will return
-                                    // CommissioningComplete instead of CommissioningCompleteResponse
+    else if (state.Is<InvokingCommissioningComplete>() && event.Is<Success>())
     {
         return mFactory.CreateCommissioningComplete();
     }