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/importer | |
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 '')
-rw-r--r-- | tvix/nar-bridge/pkg/importer/importer_test.go | 26 | ||||
-rw-r--r-- | tvix/nar-bridge/pkg/importer/roundtrip_test.go (renamed from tvix/nar-bridge/pkg/exporter/full_test.go) | 31 | ||||
-rw-r--r-- | tvix/nar-bridge/pkg/importer/util_test.go | 34 |
3 files changed, 41 insertions, 50 deletions
diff --git a/tvix/nar-bridge/pkg/importer/importer_test.go b/tvix/nar-bridge/pkg/importer/importer_test.go index de0548da9398..6754fd005551 100644 --- a/tvix/nar-bridge/pkg/importer/importer_test.go +++ b/tvix/nar-bridge/pkg/importer/importer_test.go @@ -11,35 +11,9 @@ import ( castorev1pb "code.tvl.fyi/tvix/castore/protos" "code.tvl.fyi/tvix/nar-bridge/pkg/importer" storev1pb "code.tvl.fyi/tvix/store/protos" - "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/require" - "google.golang.org/protobuf/testing/protocmp" - "lukechampine.com/blake3" ) -func requireProtoEq(t *testing.T, expected interface{}, actual interface{}) { - if diff := cmp.Diff(expected, actual, protocmp.Transform()); diff != "" { - t.Errorf("unexpected difference:\n%v", diff) - } -} - -func mustDirectoryDigest(d *castorev1pb.Directory) []byte { - dgst, err := d.Digest() - if err != nil { - panic(err) - } - return dgst -} - -func mustBlobDigest(r io.Reader) []byte { - hasher := blake3.New(32, nil) - _, err := io.Copy(hasher, r) - if err != nil { - panic(err) - } - return hasher.Sum([]byte{}) -} - func TestSymlink(t *testing.T) { f, err := os.Open("../../testdata/symlink.nar") require.NoError(t, err) diff --git a/tvix/nar-bridge/pkg/exporter/full_test.go b/tvix/nar-bridge/pkg/importer/roundtrip_test.go index 4875c08e2133..89603cfcfdbe 100644 --- a/tvix/nar-bridge/pkg/exporter/full_test.go +++ b/tvix/nar-bridge/pkg/importer/roundtrip_test.go @@ -1,4 +1,4 @@ -package exporter_test +package importer_test import ( "bytes" @@ -10,15 +10,15 @@ import ( "testing" castorev1pb "code.tvl.fyi/tvix/castore/protos" - "code.tvl.fyi/tvix/nar-bridge/pkg/exporter" "code.tvl.fyi/tvix/nar-bridge/pkg/importer" + storev1pb "code.tvl.fyi/tvix/store/protos" "github.com/stretchr/testify/require" - "lukechampine.com/blake3" ) -func TestFull(t *testing.T) { - // We pipe nar_1094wph9z4nwlgvsd53abfz8i117ykiv5dwnq9nnhz846s7xqd7d.nar to the exporter, - // and store all the file contents and directory objects received in two hashmaps. +func TestRoundtrip(t *testing.T) { + // We pipe nar_1094wph9z4nwlgvsd53abfz8i117ykiv5dwnq9nnhz846s7xqd7d.nar to + // storev1pb.Export, and store all the file contents and directory objects + // received in two hashmaps. // We then feed it to the writer, and test we come up with the same NAR file. f, err := os.Open("../../testdata/nar_1094wph9z4nwlgvsd53abfz8i117ykiv5dwnq9nnhz846s7xqd7d.nar") @@ -57,7 +57,7 @@ func TestFull(t *testing.T) { // done populating everything, now actually test the export :-) var buf bytes.Buffer - err = exporter.Export( + err = storev1pb.Export( &buf, pathInfo, func(directoryDgst []byte) (*castorev1pb.Directory, error) { @@ -79,20 +79,3 @@ func TestFull(t *testing.T) { require.NoError(t, err, "exporter shouldn't fail") require.Equal(t, narContents, buf.Bytes()) } - -func mustDirectoryDigest(d *castorev1pb.Directory) []byte { - dgst, err := d.Digest() - if err != nil { - panic(err) - } - return dgst -} - -func mustBlobDigest(r io.Reader) []byte { - hasher := blake3.New(32, nil) - _, err := io.Copy(hasher, r) - if err != nil { - panic(err) - } - return hasher.Sum([]byte{}) -} diff --git a/tvix/nar-bridge/pkg/importer/util_test.go b/tvix/nar-bridge/pkg/importer/util_test.go new file mode 100644 index 000000000000..623253ed1a35 --- /dev/null +++ b/tvix/nar-bridge/pkg/importer/util_test.go @@ -0,0 +1,34 @@ +package importer_test + +import ( + "io" + "testing" + + castorev1pb "code.tvl.fyi/tvix/castore/protos" + "github.com/google/go-cmp/cmp" + "google.golang.org/protobuf/testing/protocmp" + "lukechampine.com/blake3" +) + +func requireProtoEq(t *testing.T, expected interface{}, actual interface{}) { + if diff := cmp.Diff(expected, actual, protocmp.Transform()); diff != "" { + t.Errorf("unexpected difference:\n%v", diff) + } +} + +func mustDirectoryDigest(d *castorev1pb.Directory) []byte { + dgst, err := d.Digest() + if err != nil { + panic(err) + } + return dgst +} + +func mustBlobDigest(r io.Reader) []byte { + hasher := blake3.New(32, nil) + _, err := io.Copy(hasher, r) + if err != nil { + panic(err) + } + return hasher.Sum([]byte{}) +} |