Revert the `enum struct` change

Not a regular git revert as there have been many merges and things.

1 files changed, 7 insertions, 6 deletions

diff --git a/src/nix/verify.cc b/src/nix/verify.cc
index 5b9175744..d1aba08e3 100644
--- a/src/nix/verify.cc
+++ b/src/nix/verify.cc
@@ -59,7 +59,7 @@ struct CmdVerify : StorePathsCommand
 
         auto publicKeys = getDefaultPublicKeys();
 
-        Activity act(*logger, ActivityType::VerifyPaths);
+        Activity act(*logger, actVerifyPaths);
 
         std::atomic<size_t> done{0};
         std::atomic<size_t> untrusted{0};
@@ -77,7 +77,7 @@ struct CmdVerify : StorePathsCommand
             try {
                 checkInterrupt();
 
-                Activity act2(*logger, Verbosity::Info, ActivityType::Unknown, fmt("checking '%s'", storePath));
+                Activity act2(*logger, lvlInfo, actUnknown, fmt("checking '%s'", storePath));
 
                 MaintainCount<std::atomic<size_t>> mcActive(active);
                 update();
@@ -98,14 +98,14 @@ struct CmdVerify : StorePathsCommand
 
                     if (hash.first != info->narHash) {
                         corrupted++;
-                        act2.result(ResultType::CorruptedPath, store->printStorePath(info->path));
+                        act2.result(resCorruptedPath, store->printStorePath(info->path));
                         logError({
                             .name = "Hash error - path modified",
                             .hint = hintfmt(
                                 "path '%s' was modified! expected hash '%s', got '%s'",
                                 store->printStorePath(info->path),
-                                info->narHash.to_string(Base::Base32, true),
-                                hash.first.to_string(Base::Base32, true))
+                                info->narHash.to_string(Base32, true),
+                                hash.first.to_string(Base32, true))
                         });
                     }
                 }
@@ -153,12 +153,13 @@ struct CmdVerify : StorePathsCommand
 
                     if (!good) {
                         untrusted++;
-                        act2.result(ResultType::UntrustedPath, store->printStorePath(info->path));
+                        act2.result(resUntrustedPath, store->printStorePath(info->path));
                         logError({
                             .name = "Untrusted path",
                             .hint = hintfmt("path '%s' is untrusted",
                                 store->printStorePath(info->path))
                         });
+
                     }
 
                 }