commit 1d66fe6ee6805d682e0b6be4b177b58b8acbade2
author Patrick Venture <venture@google.com> Mon Jun 03 14:57:27 2019 -0700
committer Patrick Venture <venture@google.com> Tue Jun 04 18:15:15 2019 +0000
tree 04659eb1428f883a8278271d6b06fb04cebfdf7a
parent fdeb864820b17a7b6d4e26c64f9fcad74fa2415f

merge Verification and Update Interfaces

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

firmware_handler.hpp

diff --git a/firmware_handler.hpp b/firmware_handler.hpp
index fd4f9ef..9aab59a 100644
--- a/firmware_handler.hpp
+++ b/firmware_handler.hpp
@@ -4,9 +4,8 @@
 
 #include "data_handler.hpp"
 #include "image_handler.hpp"
-#include "update.hpp"
+#include "status.hpp"
 #include "util.hpp"
-#include "verify.hpp"
 
 #include <algorithm>
 #include <blobs-ipmid/blobs.hpp>
@@ -118,8 +117,8 @@
     static std::unique_ptr<GenericBlobInterface> CreateFirmwareBlobHandler(
         const std::vector<HandlerPack>& firmwares,
         const std::vector<DataHandlerPack>& transports,
-        std::unique_ptr<VerificationInterface> verification,
-        std::unique_ptr<UpdateInterface> update);
+        std::unique_ptr<TriggerableActionInterface> verification,
+        std::unique_ptr<TriggerableActionInterface> update);
 
     /**
      * Create a FirmwareBlobHandler.
@@ -131,12 +130,12 @@
      * @param[in] verification - pointer to object for triggering verification
      * @param[in] update - point to object for triggering the update
      */
-    FirmwareBlobHandler(const std::vector<HandlerPack>& firmwares,
-                        const std::vector<std::string>& blobs,
-                        const std::vector<DataHandlerPack>& transports,
-                        std::uint16_t bitmask,
-                        std::unique_ptr<VerificationInterface> verification,
-                        std::unique_ptr<UpdateInterface> update) :
+    FirmwareBlobHandler(
+        const std::vector<HandlerPack>& firmwares,
+        const std::vector<std::string>& blobs,
+        const std::vector<DataHandlerPack>& transports, std::uint16_t bitmask,
+        std::unique_ptr<TriggerableActionInterface> verification,
+        std::unique_ptr<TriggerableActionInterface> update) :
         handlers(firmwares),
         blobIDs(blobs), transports(transports), bitmask(bitmask),
         activeImage(activeImageBlobId), activeHash(activeHashBlobId),
@@ -228,9 +227,9 @@
     /** The firmware update state. */
     UpdateState state;
 
-    std::unique_ptr<VerificationInterface> verification;
+    std::unique_ptr<TriggerableActionInterface> verification;
 
-    std::unique_ptr<UpdateInterface> update;
+    std::unique_ptr<TriggerableActionInterface> update;
 
     /** Temporary variable to track whether a blob is open. */
     bool fileOpen = false;