Cleanup

Author: edolstra

src/libstore/daemon.cc

@@ -434,12 +434,9 @@ static void performOp(
             bool repairBool;
             conn.from >> repairBool;
             auto repair = RepairFlag{repairBool};
-            std::shared_ptr<const Provenance> provenance;
-            if (conn.features.contains(WorkerProto::featureProvenance)) {
-                auto s = readString(conn.from);
-                if (!s.empty())
-                    provenance = Provenance::from_json_str(s);
-            }
+            auto provenance = conn.features.contains(WorkerProto::featureProvenance)
+                                  ? Provenance::from_json_str_optional(readString(conn.from))
+                                  : nullptr;
 
             logger->startWork();
             auto pathInfo = [&]() {
@@ -920,11 +917,9 @@ static void performOp(
         conn.from >> info.registrationTime >> info.narSize >> info.ultimate;
         info.sigs = readStrings<StringSet>(conn.from);
         info.ca = ContentAddress::parseOpt(readString(conn.from));
-        if (conn.features.contains(WorkerProto::featureProvenance)) {
-            auto s = readString(conn.from);
-            if (!s.empty())
-                info.provenance = Provenance::from_json_str(s);
-        }
+        info.provenance = conn.features.contains(WorkerProto::featureProvenance)
+                              ? Provenance::from_json_str_optional(readString(conn.from))
+                              : nullptr;
         conn.from >> repair >> dontCheckSigs;
         if (!trusted && dontCheckSigs)
             dontCheckSigs = false;

src/libstore/worker-protocol.cc

@@ -304,11 +304,8 @@ UnkeyedValidPathInfo WorkerProto::Serialise<UnkeyedValidPathInfo>::read(const St
         info.sigs = readStrings<StringSet>(conn.from);
         info.ca = ContentAddress::parseOpt(readString(conn.from));
     }
-    if (conn.provenance) {
-        auto s = readString(conn.from);
-        if (!s.empty())
-            info.provenance = Provenance::from_json_str(s);
-    }
+    if (conn.provenance)
+        info.provenance = Provenance::from_json_str_optional(readString(conn.from));
     return info;
 }
 

src/libutil/include/nix/util/provenance.hh

@@ -13,6 +13,8 @@ struct Provenance
 {
     static ref<const Provenance> from_json_str(std::string_view);
 
+    static std::shared_ptr<const Provenance> from_json_str_optional(std::string_view);
+
     static ref<const Provenance> from_json(const nlohmann::json & json);
 
     std::string to_json_str() const;

src/libutil/provenance.cc

@@ -29,6 +29,13 @@ ref<const Provenance> Provenance::from_json_str(std::string_view s)
     return from_json(nlohmann::json::parse(s));
 }
 
+std::shared_ptr<const Provenance> Provenance::from_json_str_optional(std::string_view s)
+{
+    if (s.empty())
+        return nullptr;
+    return Provenance::from_json_str(s);
+}
+
 ref<const Provenance> Provenance::from_json(const nlohmann::json & json)
 {
     auto & obj = getObject(json);