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.cpp

diff --git a/firmware_handler.cpp b/firmware_handler.cpp
index d72c5c7..56ad3a2 100644
--- a/firmware_handler.cpp
+++ b/firmware_handler.cpp
@@ -17,8 +17,8 @@
 #include "firmware_handler.hpp"
 
 #include "image_handler.hpp"
+#include "status.hpp"
 #include "util.hpp"
-#include "verify.hpp"
 
 #include <algorithm>
 #include <cstdint>
@@ -38,8 +38,8 @@
     FirmwareBlobHandler::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)
 {
     /* There must be at least one. */
     if (!firmwares.size())
@@ -708,7 +708,7 @@
 
 bool FirmwareBlobHandler::triggerVerification()
 {
-    bool result = verification->triggerVerification();
+    bool result = verification->trigger();
     if (result)
     {
         state = UpdateState::verificationStarted;
@@ -719,7 +719,7 @@
 
 bool FirmwareBlobHandler::triggerUpdate()
 {
-    bool result = update->triggerUpdate();
+    bool result = update->trigger();
     if (result)
     {
         state = UpdateState::updateStarted;