include a root in car responses

fix #354
filecoin-project · Jul 13, 2023 · 5686890 · 5686890
1 parent d5e275d
commit 5686890
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 9 deletions.
diff --git a/cmd/lassie/fetch.go b/cmd/lassie/fetch.go
@@ -242,7 +242,7 @@ func defaultFetchRun(
 		carWriter = storage.NewDeferredCarWriterForPath(rootCid, outfile)
 	}
 
-	tempStore := storage.NewDeferredStorageCar(tempDir)
+	tempStore := storage.NewDeferredStorageCar(tempDir, rootCid)
 	carStore := storage.NewCachingTempStore(carWriter.BlockWriteOpener(), tempStore)
 	defer carStore.Close()
 

diff --git a/pkg/server/http/ipfs.go b/pkg/server/http/ipfs.go
@@ -120,7 +120,7 @@ func ipfsHandler(lassie *lassie.Lassie, cfg HttpServerConfig) func(http.Response
 		// the response writer. Once closed, no other content should be written.
 		bytesWritten := make(chan struct{}, 1)
 
-		tempStore := storage.NewDeferredStorageCar(cfg.TempDir)
+		tempStore := storage.NewDeferredStorageCar(cfg.TempDir, rootCid)
 		var carWriter storage.DeferredWriter
 		if includeDupes {
 			carWriter = storage.NewDuplicateAdderCarForStream(req.Context(), rootCid, path.String(), dagScope, tempStore, res)

diff --git a/pkg/storage/cachingtempstore_test.go b/pkg/storage/cachingtempstore_test.go
@@ -49,7 +49,7 @@ func TestDeferredCarWriterWritesCARv1(t *testing.T) {
 
 			var buf bytes.Buffer
 			cw := NewDeferredCarWriterForStream(testCid1, &buf)
-			ss := NewCachingTempStore(cw.BlockWriteOpener(), NewDeferredStorageCar(""))
+			ss := NewCachingTempStore(cw.BlockWriteOpener(), NewDeferredStorageCar("", testCid1))
 			t.Cleanup(func() { ss.Close() })
 
 			if tt.readBeforeWrite {

diff --git a/pkg/storage/deferredstoragecar.go b/pkg/storage/deferredstoragecar.go
@@ -21,6 +21,7 @@ var _ ReadableWritableStorage = (*DeferredStorageCar)(nil)
 // in the case of an error).
 type DeferredStorageCar struct {
 	tempDir string
+	root    cid.Cid
 
 	lk     sync.Mutex
 	closed bool
@@ -29,9 +30,10 @@ type DeferredStorageCar struct {
 }
 
 // NewDeferredStorageCar creates a new DeferredStorageCar.
-func NewDeferredStorageCar(tempDir string) *DeferredStorageCar {
+func NewDeferredStorageCar(tempDir string, root cid.Cid) *DeferredStorageCar {
 	return &DeferredStorageCar{
 		tempDir: tempDir,
+		root:    root,
 	}
 }
 
@@ -136,7 +138,7 @@ func (dcs *DeferredStorageCar) readWrite() (ReadableWritableStorage, error) {
 		if dcs.f, err = os.CreateTemp(dcs.tempDir, "lassie_carstorage"); err != nil {
 			return nil, err
 		}
-		rw, err := carstorage.NewReadableWritable(dcs.f, []cid.Cid{}, carv2.WriteAsCarV1(true))
+		rw, err := carstorage.NewReadableWritable(dcs.f, []cid.Cid{dcs.root}, carv2.WriteAsCarV1(true))
 		if err != nil {
 			return nil, err
 		}

diff --git a/pkg/storage/duplicateaddercar_test.go b/pkg/storage/duplicateaddercar_test.go
@@ -32,7 +32,7 @@ func TestDuplicateAdderCar(t *testing.T) {
 	unixfsFileWithDupsBlocks := testutil.ToBlocks(t, lsys, unixfsFileWithDups.Root, selectorparse.CommonSelector_ExploreAllRecursively)
 	buf := new(bytes.Buffer)
 
-	store := storage.NewDeferredStorageCar("")
+	store := storage.NewDeferredStorageCar("", unixfsFileWithDups.Root)
 	ctx := context.Background()
 	carWriter := storage.NewDuplicateAdderCarForStream(ctx, unixfsFileWithDups.Root, "", types.DagScopeAll, store, buf)
 	cachingTempStore := storage.NewCachingTempStore(carWriter.BlockWriteOpener(), store)

diff --git a/pkg/storage/storage_test.go b/pkg/storage/storage_test.go
@@ -40,9 +40,9 @@ func TestTempCarStorage(t *testing.T) {
 						return nil
 					}, nil
 				}
-				cw = NewCachingTempStore(bwo, NewDeferredStorageCar(tempDir))
+				cw = NewCachingTempStore(bwo, NewDeferredStorageCar(tempDir, testCid1))
 			} else {
-				cw = NewDeferredStorageCar(tempDir)
+				cw = NewDeferredStorageCar(tempDir, testCid1)
 			}
 
 			ents, err := os.ReadDir(tempDir)
@@ -154,7 +154,7 @@ func TestPreloadStore(t *testing.T) {
 			return nil
 		}, nil
 	}
-	mainStore := NewCachingTempStore(bwo, NewDeferredStorageCar(t.TempDir()))
+	mainStore := NewCachingTempStore(bwo, NewDeferredStorageCar(t.TempDir(), td[0].cid))
 	t.Cleanup(func() {
 		require.NoError(t, mainStore.Close())
 	})