From 5f6d557d4454398c38d85f6774152d5e0a4436d7 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Tue, 26 Nov 2024 12:01:29 +0100 Subject: pkg/rpcserver: refactoring in preparation for dynamic interface extraction Few assorted changes to reduce future diffs: - add rpcserver.RemoteConfig similar to LocalConfig (there are too many parameters) - add CheckGlobs to requesting additional globs from VMs - pass whole InfoRequest to the MachineChecked callback so that it's possible to read globs information - add per-mode config checking in the manager - add Manager.saveJson helper --- pkg/rpcserver/rpcserver_test.go | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'pkg/rpcserver/rpcserver_test.go') diff --git a/pkg/rpcserver/rpcserver_test.go b/pkg/rpcserver/rpcserver_test.go index 760ae5e13..a885ad720 100644 --- a/pkg/rpcserver/rpcserver_test.go +++ b/pkg/rpcserver/rpcserver_test.go @@ -80,7 +80,11 @@ func TestNew(t *testing.T) { cfg.Target, err = prog.GetTarget(cfg.TargetOS, cfg.TargetArch) assert.NoError(t, err) - serv, err := New(cfg, nil, NewStats(), tt.debug) + serv, err := New(&RemoteConfig{ + Config: cfg, + Stats: NewStats(), + Debug: tt.debug, + }) if tt.expectedErr != nil { assert.Equal(t, tt.expectedErr, err) } else if tt.expectsErr { @@ -195,7 +199,12 @@ func TestHandleConn(t *testing.T) { cfg.Target.Revision = tt.req.SyzRevision assert.NoError(t, err) - s, err := New(cfg, managerMock, NewStats(), debug) + s, err := New(&RemoteConfig{ + Config: cfg, + Manager: managerMock, + Stats: NewStats(), + Debug: debug, + }) assert.NoError(t, err) serv := s.(*server) -- cgit mrf-deployment