From f61f67ddee12a976a0a6a20652e7c545b49fa46c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 1 Mar 2017 16:07:15 +0100
Subject: RemoteStore::addToStore(): Send NAR rather than string containing NAR

This allows the NAR to be streamed in the future (though we're not
doing that yet).
---
 src/libstore/export-import.cc | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

(limited to 'src/libstore/export-import.cc')

diff --git a/src/libstore/export-import.cc b/src/libstore/export-import.cc
index e584ae538dae..531f010d93a7 100644
--- a/src/libstore/export-import.cc
+++ b/src/libstore/export-import.cc
@@ -61,27 +61,6 @@ void Store::exportPath(const Path & path, Sink & sink)
     hashAndWriteSink << exportMagic << path << info->references << info->deriver << 0;
 }
 
-struct TeeSource : Source
-{
-    Source & readSource;
-    ref<std::string> data;
-    TeeSource(Source & readSource)
-        : readSource(readSource)
-        , data(make_ref<std::string>())
-    {
-    }
-    size_t read(unsigned char * data, size_t len)
-    {
-        size_t n = readSource.read(data, len);
-        this->data->append((char *) data, n);
-        return n;
-    }
-};
-
-struct NopSink : ParseSink
-{
-};
-
 Paths Store::importPaths(Source & source, std::shared_ptr<FSAccessor> accessor, bool dontCheckSigs)
 {
     Paths res;
@@ -92,7 +71,7 @@ Paths Store::importPaths(Source & source, std::shared_ptr<FSAccessor> accessor,
 
         /* Extract the NAR from the source. */
         TeeSource tee(source);
-        NopSink sink;
+        ParseSink sink;
         parseDump(sink, tee);
 
         uint32_t magic = readInt(source);
-- 
cgit 1.4.1