refact: simplify overlay refresh logic and remove redundant test
rabbitprincess committed
Apr 12, 2026 at 22:14 UTC
252fd60d21a3d05d938d613af7262855c67053e7
2 files changed
+1
-53
portal/discovery/refresher.go
+1
-4
@@ -64,10 +64,7 @@ func NewRefresher(relaySet *RelaySet, rootCAPEM []byte, overlay OverlayRuntime)
64
65
func (r *Refresher) Refresh(ctx context.Context) error {
66
if r.overlay != nil {
67
- err := r.refreshOverlay(ctx)
68
- if err == nil {
69
- return nil
70
- }
67
+ r.refreshOverlay(ctx)
68
if ctx.Err() != nil {
69
return ctx.Err()
70
}
portal/server_test.go
-49
@@ -316,55 +316,6 @@ func TestServerStartUsesManualCertificateWithoutACMEProvider(t *testing.T) {
316
}
317
}
318
319
-func TestServerStartDiscoveryIncludesIdentityAndOmitsSignerFields(t *testing.T) {
320
- t.Parallel()
321
-
322
- server, err := NewServer(ServerConfig{
323
- PortalURL: "https://localhost:4017",
324
- IdentityPath: tempIdentityPath(t),
325
- ACME: acme.Config{KeyDir: t.TempDir()},
326
- APIListenAddr: "127.0.0.1:0",
327
- SNIListenAddr: "127.0.0.1:0",
328
- DiscoveryEnabled: true,
329
- })
330
- if err != nil {
331
- t.Fatalf("NewServer() error = %v", err)
332
- }
333
-
334
- ctx, cancel := context.WithCancel(context.Background())
335
- defer cancel()
336
-
337
- if err := server.Start(ctx, nil); err != nil {
338
- t.Fatalf("Start() error = %v", err)
339
- }
340
-
341
- client := newTestClient(t, cancel, server)
342
-
343
- resp, err := client.Get("https://" + utils.HostPortOrLoopback(server.apiListener.Addr().String()) + types.PathDiscovery)
344
- if err != nil {
345
- t.Fatalf("GET /discovery error = %v", err)
346
- }
347
- defer resp.Body.Close()
348
-
349
- if resp.StatusCode != http.StatusOK {
350
- t.Fatalf("GET /discovery status = %d, want %d", resp.StatusCode, http.StatusOK)
351
- }
352
-
353
- body, err := io.ReadAll(resp.Body)
354
- if err != nil {
355
- t.Fatalf("read /discovery response: %v", err)
356
- }
357
- bodyText := string(body)
358
- for _, key := range []string{"\"address\"", "\"name\"", "\"relay_id\"", "\"owner_address\"", "\"signer_public_key\""} {
359
- if !strings.Contains(bodyText, key) {
360
- t.Fatalf("/discovery body = %q, want %q present", bodyText, key)
361
- }
362
- }
363
- if strings.Contains(bodyText, "descriptor_signature") {
364
- t.Fatalf("/discovery body = %q, want descriptor_signature omitted", bodyText)
365
- }
366
-}
367
-
319
func TestServerStartRejectsMismatchedACMEBaseDomain(t *testing.T) {
320
t.Parallel()
321