refactor(tvix/nar-bridge): update to new separated protos

Change-Id: I5eaadc837a4d3a7f635574437127a22de88f556b
Reviewed-on: https://cl.tvl.fyi/c/depot/+/9407
Tested-by: BuildkiteCI
Reviewed-by: Connor Brewster <cbrewster@hey.com>
Autosubmit: flokli <flokli@flokli.de>
This commit is contained in:
Florian Klink 2023-09-22 16:38:10 +03:00 committed by flokli
parent e13c86d916
commit 732dc68727
16 changed files with 170 additions and 158 deletions

View file

@ -3,7 +3,7 @@ package writer
import (
"testing"
storev1pb "code.tvl.fyi/tvix/store/protos"
castorev1pb "code.tvl.fyi/tvix/castore/protos"
"github.com/google/go-cmp/cmp"
"github.com/stretchr/testify/require"
"google.golang.org/protobuf/testing/protocmp"
@ -17,18 +17,18 @@ func requireProtoEq(t *testing.T, expected interface{}, actual interface{}) {
func TestPopNextNode(t *testing.T) {
t.Run("empty directory", func(t *testing.T) {
d := &storev1pb.Directory{
Directories: []*storev1pb.DirectoryNode{},
Files: []*storev1pb.FileNode{},
Symlinks: []*storev1pb.SymlinkNode{},
d := &castorev1pb.Directory{
Directories: []*castorev1pb.DirectoryNode{},
Files: []*castorev1pb.FileNode{},
Symlinks: []*castorev1pb.SymlinkNode{},
}
n := drainNextNode(d)
require.Equal(t, nil, n)
})
t.Run("only directories", func(t *testing.T) {
ds := &storev1pb.Directory{
Directories: []*storev1pb.DirectoryNode{{
ds := &castorev1pb.Directory{
Directories: []*castorev1pb.DirectoryNode{{
Name: []byte("a"),
Digest: []byte{},
Size: 0,
@ -37,12 +37,12 @@ func TestPopNextNode(t *testing.T) {
Digest: []byte{},
Size: 0,
}},
Files: []*storev1pb.FileNode{},
Symlinks: []*storev1pb.SymlinkNode{},
Files: []*castorev1pb.FileNode{},
Symlinks: []*castorev1pb.SymlinkNode{},
}
n := drainNextNode(ds)
requireProtoEq(t, &storev1pb.DirectoryNode{
requireProtoEq(t, &castorev1pb.DirectoryNode{
Name: []byte("a"),
Digest: []byte{},
Size: 0,