Simplify vat.

vat/vat.go

@@ -24,23 +24,18 @@ type Bootable interface {
 
 type NetConfig struct {
 	Host        host.Host
-	Guest       api.Module
-	System      Bootable
+	Proto       protocol.ID
 	DialTimeout time.Duration
 }
 
-func (c NetConfig) Proto() protocol.ID {
-	return ProtoFromModule(c.Guest)
-}
-
 func (c NetConfig) Build(ctx context.Context) Network {
 	if c.DialTimeout <= 0 {
 		c.DialTimeout = time.Second * 10
 	}
 
 	l := ListenConfig{
 		Host: c.Host,
-	}.Listen(ctx, c.Proto())
+	}.Listen(ctx, c.Proto)
 
 	return Network{
 		NetConfig: c,
@@ -63,22 +58,6 @@ func (n Network) LocalID() rpc.PeerID {
 	return rpc.PeerID{Value: n.Host.ID()}
 }
 
-func (n Network) Serve(ctx context.Context) error {
-	c := n.System.Boot(n.Guest)
-	defer c.Release()
-
-	for {
-		if conn, err := n.Accept(ctx, &rpc.Options{
-			BootstrapClient: c.AddRef(),
-			Network:         n,
-		}); err == nil {
-			go n.ServeConn(ctx, conn)
-		} else {
-			return err
-		}
-	}
-}
-
 func (n Network) ServeConn(ctx context.Context, conn *rpc.Conn) {
 	defer conn.Close()
 	slog.InfoContext(ctx, "accepted",
@@ -117,7 +96,7 @@ func (n Network) Dial(id rpc.PeerID, opt *rpc.Options) (*rpc.Conn, error) {
 
 	pid := id.Value.(peer.ID)
 
-	stream, err := n.Host.NewStream(ctx, pid, n.Proto())
+	stream, err := n.Host.NewStream(ctx, pid, n.Proto)
 	if err != nil {
 		return nil, err
 	}

ww.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"log/slog"
 
+	"capnproto.org/go/capnp/v3/rpc"
 	"github.com/ipfs/boxo/path"
 	iface "github.com/ipfs/kubo/core/coreiface"
 	"github.com/libp2p/go-libp2p/core/host"
@@ -95,12 +96,25 @@ func (c Cluster) Serve(ctx context.Context) error {
 	}
 	defer mod.Close(ctx)
 
+	// Obtain the system client.  This gives us an API to our root
+	// process.
+	client := sys.Boot(mod)
+	defer client.Release()
+
 	net := vat.NetConfig{
-		Host:   c.Host,
-		System: sys,
-		Guest:  mod,
+		Host:  c.Host,
+		Proto: vat.ProtoFromModule(mod),
 	}.Build(ctx)
 	defer net.Release()
 
-	return net.Serve(ctx)
+	for {
+		if conn, err := net.Accept(ctx, &rpc.Options{
+			BootstrapClient: client.AddRef(),
+			Network:         net,
+		}); err == nil {
+			go net.ServeConn(ctx, conn)
+		} else {
+			return err
+		}
+	}
 }