From 444171da7ee534206f522cfa47c617c83819e225 Mon Sep 17 00:00:00 2001 From: Louis Thibault Date: Sat, 25 May 2024 16:42:59 -0400 Subject: [PATCH] Minor clean-up. --- vat/vat.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/vat/vat.go b/vat/vat.go index d26b511..eaa84d2 100644 --- a/vat/vat.go +++ b/vat/vat.go @@ -4,7 +4,6 @@ import ( "context" "fmt" "log/slog" - "path/filepath" "time" "capnproto.org/go/capnp/v3" @@ -28,8 +27,7 @@ type NetConfig struct { } func (c NetConfig) Proto() protocol.ID { - proto := filepath.Join(Proto, c.Guest.Name()) - return protocol.ID(proto) + return ProtoFromModule(c.Guest) } func (c NetConfig) Build(ctx context.Context) Network { @@ -37,9 +35,13 @@ func (c NetConfig) Build(ctx context.Context) Network { c.DialTimeout = time.Second * 10 } + l := ListenConfig{ + Host: c.Host, + }.Listen(ctx, c.Proto()) + return Network{ NetConfig: c, - Listener: ListenConfig{Host: c.Host}.Listen(ctx, c.Proto()), + Listener: l, } }