From b3d91239ae9f21a60057b278ceeff663fb786246 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Sat, 14 Jan 2023 16:38:43 -0500
Subject: Make `ValidPathInfo` have plain `StorePathSet` references like before

This change can wait for another PR.
---
 src/libstore/path-info.hh | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'src/libstore/path-info.hh')

diff --git a/src/libstore/path-info.hh b/src/libstore/path-info.hh
index 9254835b7..476df79c2 100644
--- a/src/libstore/path-info.hh
+++ b/src/libstore/path-info.hh
@@ -17,19 +17,20 @@ class Store;
 struct SubstitutablePathInfo
 {
     std::optional<StorePath> deriver;
-    StoreReferences references;
+    StorePathSet references;
     uint64_t downloadSize; /* 0 = unknown or inapplicable */
     uint64_t narSize; /* 0 = unknown */
 };
 
 typedef std::map<StorePath, SubstitutablePathInfo> SubstitutablePathInfos;
 
+
 struct ValidPathInfo
 {
     StorePath path;
     std::optional<StorePath> deriver;
     Hash narHash;
-    StoreReferences references;
+    StorePathSet references;
     time_t registrationTime = 0;
     uint64_t narSize = 0; // 0 = unknown
     uint64_t id; // internal use only
@@ -81,12 +82,6 @@ struct ValidPathInfo
     /* Return true iff the path is verifiably content-addressed. */
     bool isContentAddressed(const Store & store) const;
 
-    /* Functions to view references + hasSelfReference as one set, mainly for
-       compatibility's sake. */
-    StorePathSet referencesPossiblyToSelf() const;
-    void insertReferencePossiblyToSelf(StorePath && ref);
-    void setReferencesPossiblyToSelf(StorePathSet && refs);
-
     static const size_t maxSigs = std::numeric_limits<size_t>::max();
 
     /* Return the number of signatures on this .narinfo that were
-- 
cgit v1.2.3