diff options
| author | Florian Klink <flokli@flokli.de> | 2023-10-10T18·52+0200 |
|---|---|---|
| committer | flokli <flokli@flokli.de> | 2023-10-10T19·08+0000 |
| commit | fe963ae0a3f5254023a55e3d0bca318953c9af12 (patch) | |
| tree | 56824042e09862dd0dde9381cf3f4b2c77b594d9 /tvix/nar-bridge/pkg/http/nar_get.go | |
| parent | e6ba84ea50217c83d0aafdbbe7c5a659ba3e6586 (diff) | |
chore(tvix/nar-bridge): move to Export from storev1pb r/6773
This removes the Export method in nar-bridge, and updates all users to the version now in storev1pb. It moves the roundtrip test to the importer crate, and some of the utility functions into a separate util_test.go file. Change-Id: I81d9e0b35dfd78ef1042bed307281eecd2aaa2a8 Reviewed-on: https://cl.tvl.fyi/c/depot/+/9603 Reviewed-by: Brian McGee <brian@bmcgee.ie> Tested-by: BuildkiteCI
Diffstat (limited to 'tvix/nar-bridge/pkg/http/nar_get.go')
| -rw-r--r-- | tvix/nar-bridge/pkg/http/nar_get.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tvix/nar-bridge/pkg/http/nar_get.go b/tvix/nar-bridge/pkg/http/nar_get.go index 0c2b299e78..85405d81f4 100644 --- a/tvix/nar-bridge/pkg/http/nar_get.go +++ b/tvix/nar-bridge/pkg/http/nar_get.go @@ -13,7 +13,6 @@ import ( "sync" castorev1pb "code.tvl.fyi/tvix/castore/protos" - "code.tvl.fyi/tvix/nar-bridge/pkg/exporter" storev1pb "code.tvl.fyi/tvix/store/protos" "github.com/go-chi/chi/v5" nixhash "github.com/nix-community/go-nix/pkg/hash" @@ -94,7 +93,7 @@ func renderNar( } // render the NAR file - err := exporter.Export( + err := storev1pb.Export( w, pathInfo, func(directoryDigest []byte) (*castorev1pb.Directory, error) { |