From 1b5c9e627ab52e802eb7ef7ab6fe2a11e898e92f Mon Sep 17 00:00:00 2001
From: Lorenzo Blasa <lblasa@meta.com>
Date: Wed, 21 Jun 2023 23:16:34 -0700
Subject: [PATCH] Move reset state to a more appropriate location

Summary: Not really part of the connect process in this case, so is getting moved closer to where the CSR is generated.

Reviewed By: passy

Differential Revision: D46849966

fbshipit-source-id: b91e2925552cd7fcab67b3d1d7af006f4f8c1431
---
 xplat/Flipper/FlipperConnectionManagerImpl.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/xplat/Flipper/FlipperConnectionManagerImpl.cpp b/xplat/Flipper/FlipperConnectionManagerImpl.cpp
index 7404f0ec3..d326c31b5 100644
--- a/xplat/Flipper/FlipperConnectionManagerImpl.cpp
+++ b/xplat/Flipper/FlipperConnectionManagerImpl.cpp
@@ -225,11 +225,8 @@ bool FlipperConnectionManagerImpl::connectAndExchangeCertificate() {
 
   connectingInsecurely->complete();
 
-  auto resettingState = flipperState_->start("Reset state");
-  contextStore_->resetState();
-  resettingState->complete();
-
   requestSignedCertificate();
+
   return true;
 }
 
@@ -464,6 +461,10 @@ void FlipperConnectionManagerImpl::processSignedCertificateResponse(
 }
 
 void FlipperConnectionManagerImpl::requestSignedCertificate() {
+  auto resettingState = flipperState_->start("Reset connection store state");
+  contextStore_->resetState();
+  resettingState->complete();
+
   auto generatingCSR = flipperState_->start("Generate CSR");
   std::string csr = contextStore_->getCertificateSigningRequest();
   generatingCSR->complete();