From fd2eb41e6433e72516ae149949b8b0050305293d Mon Sep 17 00:00:00 2001
From: Carlo Nucera <carlo.nucera@protonmail.com>
Date: Tue, 2 Jun 2020 15:44:58 -0400
Subject: [PATCH] Move file-hash to content-address

---
 src/libstore/{file-hash.cc => content-address.cc} | 2 +-
 src/libstore/{file-hash.hh => content-address.hh} | 0
 src/libstore/derivations.hh                       | 2 +-
 src/libstore/path.hh                              | 2 +-
 src/libstore/store-api.hh                         | 2 +-
 src/nix/hash.cc                                   | 2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename src/libstore/{file-hash.cc => content-address.cc} (98%)
 rename src/libstore/{file-hash.hh => content-address.hh} (100%)

diff --git a/src/libstore/file-hash.cc b/src/libstore/content-address.cc
similarity index 98%
rename from src/libstore/file-hash.cc
rename to src/libstore/content-address.cc
index caf9a83e9..421127f5a 100644
--- a/src/libstore/file-hash.cc
+++ b/src/libstore/content-address.cc
@@ -1,4 +1,4 @@
-#include "file-hash.hh"
+#include "content-address.hh"
 
 namespace nix {
 
diff --git a/src/libstore/file-hash.hh b/src/libstore/content-address.hh
similarity index 100%
rename from src/libstore/file-hash.hh
rename to src/libstore/content-address.hh
diff --git a/src/libstore/derivations.hh b/src/libstore/derivations.hh
index dba9318d9..838b63358 100644
--- a/src/libstore/derivations.hh
+++ b/src/libstore/derivations.hh
@@ -3,7 +3,7 @@
 #include "path.hh"
 #include "types.hh"
 #include "hash.hh"
-#include "file-hash.hh"
+#include "content-address.hh"
 
 #include <map>
 
diff --git a/src/libstore/path.hh b/src/libstore/path.hh
index dfc0a9531..fdbc906ef 100644
--- a/src/libstore/path.hh
+++ b/src/libstore/path.hh
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "rust-ffi.hh"
-#include "file-hash.hh"
+#include "content-address.hh"
 
 namespace nix {
 
diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh
index 7836c04dc..441e3efc5 100644
--- a/src/libstore/store-api.hh
+++ b/src/libstore/store-api.hh
@@ -2,7 +2,7 @@
 
 #include "path.hh"
 #include "hash.hh"
-#include "file-hash.hh"
+#include "content-address.hh"
 #include "serialise.hh"
 #include "crypto.hh"
 #include "lru-cache.hh"
diff --git a/src/nix/hash.cc b/src/nix/hash.cc
index ec23b77bc..26bbcef1c 100644
--- a/src/nix/hash.cc
+++ b/src/nix/hash.cc
@@ -1,6 +1,6 @@
 #include "command.hh"
 #include "hash.hh"
-#include "file-hash.hh"
+#include "content-address.hh"
 #include "legacy.hh"
 #include "shared.hh"
 #include "references.hh"