commit da66fd84209f93d9f9c11ea45d45819b92a4a98f
author Patrick Venture <venture@google.com> Mon Jun 03 11:11:24 2019 -0700
committer Patrick Venture <venture@google.com> Mon Jun 03 11:24:59 2019 -0700
tree d076a0c3958f3466ddf67501cd78529c4584b24f
parent a2d8239473ea9c441e157481c83195c5dcffe5bc

merge Verification and Update statuses

Signed-off-by: Patrick Venture <venture@google.com>
Change-Id: Ibb9c1c9f9cb7e9cda18f4e8dddb31d57a12f0d90

firmware_handler.hpp

diff --git a/firmware_handler.hpp b/firmware_handler.hpp
index e08cb66..649b059 100644
--- a/firmware_handler.hpp
+++ b/firmware_handler.hpp
@@ -195,8 +195,8 @@
                       blobIDs.end());
     }
 
-    VerifyCheckResponses getVerifyStatus();
-    UpdateStatus getUpdateStatus();
+    ActionStatus getVerifyStatus();
+    ActionStatus getActionStatus();
 
     /** List of handlers by type. */
     std::vector<HandlerPack> handlers;
@@ -235,9 +235,9 @@
     /** Temporary variable to track whether a blob is open. */
     bool fileOpen = false;
 
-    VerifyCheckResponses lastVerificationResponse = VerifyCheckResponses::other;
+    ActionStatus lastVerificationStatus = ActionStatus::unknown;
 
-    UpdateStatus lastUpdateStatus = UpdateStatus::unknown;
+    ActionStatus lastUpdateStatus = ActionStatus::unknown;
 };
 
 } // namespace ipmi_flash