Skip to content

Clean up dropped resources in relayer construction #1927

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jmank88 merged 3 commits into from
Mar 26, 2026
+8 −8
Merged

Clean up dropped resources in relayer construction #1927

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e75d950
Clean up dropped resources in relayer construction
ogtownsend Mar 25, 2026
fe2fdad
track more deps
ogtownsend Mar 25, 2026
68eff64
track more deps
ogtownsend Mar 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions pkg/loop/internal/relayer/relayer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func (p *PluginRelayerClient) NewRelayer(ctx context.Context, config string, key
pb.RegisterKeystoreServer(s, ks.NewServer(keystore))
})
if err != nil {
return 0, nil, fmt.Errorf("Failed to create relayer client: failed to serve keystore: %w", err)
return 0, deps, fmt.Errorf("Failed to create relayer client: failed to serve keystore: %w", err)
Comment thread
jmank88 marked this conversation as resolved.
}
deps.Add(ksRes)

Expand All @@ -70,15 +70,15 @@ func (p *PluginRelayerClient) NewRelayer(ctx context.Context, config string, key
pb.RegisterKeystoreServer(s, ks.NewServer(csaKeystore))
})
if err != nil {
return 0, nil, fmt.Errorf("Failed to create relayer client: failed to serve CSA keystore: %w", err)
return 0, deps, fmt.Errorf("Failed to create relayer client: failed to serve CSA keystore: %w", err)
}
deps.Add(ksCSARes)

capabilityRegistryID, capabilityRegistryResource, err := p.ServeNew("CapabilitiesRegistry", func(s *grpc.Server) {
pb.RegisterCapabilitiesRegistryServer(s, capability.NewCapabilitiesRegistryServer(p.BrokerExt, capabilityRegistry))
})
if err != nil {
return 0, nil, fmt.Errorf("failed to serve new capability registry: %w", err)
return 0, deps, fmt.Errorf("failed to serve new capability registry: %w", err)
}
deps.Add(capabilityRegistryResource)

Expand All @@ -89,9 +89,9 @@ func (p *PluginRelayerClient) NewRelayer(ctx context.Context, config string, key
CapabilityRegistryID: capabilityRegistryID,
})
if err != nil {
return 0, nil, fmt.Errorf("Failed to create relayer client: failed request: %w", err)
return 0, deps, fmt.Errorf("Failed to create relayer client: failed request: %w", err)
}
return reply.RelayerID, nil, nil
return reply.RelayerID, deps, nil
Comment thread
ogtownsend marked this conversation as resolved.
})
return newRelayerClient(p.BrokerExt, cc), nil
}
Expand Down Expand Up @@ -127,7 +127,7 @@ func (p *pluginRelayerServer) NewRelayer(ctx context.Context, request *pb.NewRel
p.CloseAll(ksRes)
return nil, net.ErrConnDial{Name: "CSAKeystore", ID: request.KeystoreCSAID, Err: err}
}
ksCSARes := net.Resource{Closer: ksConn, Name: "CSAKeystore"}
ksCSARes := net.Resource{Closer: ksCSAConn, Name: "CSAKeystore"}

capRegistryConn, err := p.Dial(request.CapabilityRegistryID)
if err != nil {
Expand Down Expand Up @@ -324,7 +324,7 @@ func (r *relayerClient) NewCCIPProvider(ctx context.Context, cargs types.CCIPPro
ccipocr3pb.RegisterExtraDataCodecBundleServer(s, ccipocr3loop.NewExtraDataCodecBundleServer(cargs.ExtraDataCodecBundle))
})
if err != nil {
return 0, nil, fmt.Errorf("failed to serve ExtraDataCodecBundle: %w", err)
return 0, deps, fmt.Errorf("failed to serve ExtraDataCodecBundle: %w", err)
}
deps.Add(edcRes)
extraDataCodecBundleID = edcID
Expand All @@ -344,7 +344,7 @@ func (r *relayerClient) NewCCIPProvider(ctx context.Context, cargs types.CCIPPro
},
})
if err != nil {
return 0, nil, err
return 0, deps, err
}
return reply.CcipProviderID, deps, nil
})
Expand Down
Loading