Skip to content

Agent Mesh

fix lint

Antonio Ojea00df9fce95ef
diff --git a/cmd/sam/call.go b/cmd/sam/call.go
index 8abf3e24..fc29b7c4 100644
--- a/cmd/sam/call.go
+++ b/cmd/sam/call.go
@@ -66,7 +66,7 @@ func runCall(parent context.Context, cfg *runConfig, targetArg string) error {
if err := node.Start(parent); err != nil {
return fmt.Errorf("starting node: %w", err)
}
- defer node.Stop(context.Background())
+ defer func() { _ = node.Stop(context.Background()) }()
ctx, cancel := context.WithTimeout(parent, cfg.callTimeout)
defer cancel()
@@ -85,7 +85,7 @@ func runCall(parent context.Context, cfg *runConfig, targetArg string) error {
if err != nil {
return fmt.Errorf("creating reputation observer: %w", err)
}
- defer observer.Close()
+ defer func() { _ = observer.Close() }()
nonce := strings.TrimSpace(cfg.callNonce)
if nonce == "" {
@@ -155,7 +155,7 @@ func loadLocalVouch() (*identity.Vouch, error) {
if err != nil {
return nil, fmt.Errorf("opening credential store: %w", err)
}
- defer store.Close()
+ defer func() { _ = store.Close() }()
creds, err := store.Load()
if err != nil {
return nil, fmt.Errorf("loading credentials: %w", err)
diff --git a/cmd/sam/identity_login.go b/cmd/sam/identity_login.go
index 05d14926..0d237dd1 100644
--- a/cmd/sam/identity_login.go
+++ b/cmd/sam/identity_login.go
@@ -51,7 +51,7 @@ func runIdentityLogin(parent context.Context, cfg *runConfig, clientID string) e
fmt.Fprintf(os.Stderr, "Fetching Hub discovery document from %s …\n", hubURL)
disc, err := identity.FetchHubDiscovery(parent, hubURL)
if err != nil {
- return fmt.Errorf("hub discovery: %w\n\nMake sure the Hub is reachable and implements OIDC discovery.", err)
+ return fmt.Errorf("hub discovery: %w (make sure the Hub is reachable and implements OIDC discovery)", err)
}
flowCfg := identity.DeviceFlowConfig{ClientID: clientID}
@@ -88,7 +88,7 @@ func runIdentityLogin(parent context.Context, cfg *runConfig, clientID string) e
if err := node.Start(parent); err != nil {
return fmt.Errorf("starting node: %w", err)
}
- defer node.Stop(context.Background())
+ defer func() { _ = node.Stop(context.Background()) }()
peerID := node.PeerID().String()
// If the Hub exposes a vouch endpoint, fetch a signed Vouch.
@@ -105,7 +105,7 @@ func runIdentityLogin(parent context.Context, cfg *runConfig, clientID string) e
if err != nil {
return fmt.Errorf("opening credential store: %w", err)
}
- defer store.Close()
+ defer func() { _ = store.Close() }()
creds := &identity.StoredCredentials{
PeerID: peerID,
diff --git a/cmd/sam/identity_whoami.go b/cmd/sam/identity_whoami.go
index 77673d51..f76e0cdc 100644
--- a/cmd/sam/identity_whoami.go
+++ b/cmd/sam/identity_whoami.go
@@ -29,52 +29,52 @@ func runIdentityWhoami() error {
if err != nil {
return fmt.Errorf("opening credential store: %w", err)
}
- defer store.Close()
+ defer func() { _ = store.Close() }()
creds, err := store.Load()
if err != nil {
return fmt.Errorf("loading credentials: %w", err)
}
if creds == nil {
- fmt.Fprintln(os.Stdout, "Not logged in. Run `sam identity login --hub <url>` to authenticate.")
+ _, _ = fmt.Fprintln(os.Stdout, "Not logged in. Run `sam identity login --hub <url>` to authenticate.")
return nil
}
- fmt.Fprintf(os.Stdout, "Hub : %s\n", creds.HubURL)
+ _, _ = fmt.Fprintf(os.Stdout, "Hub : %s\n", creds.HubURL)
if creds.PeerID != "" {
- fmt.Fprintf(os.Stdout, "PeerID : %s\n", creds.PeerID)
+ _, _ = fmt.Fprintf(os.Stdout, "PeerID : %s\n", creds.PeerID)
}
if !creds.TokenExpiry.IsZero() {
if time.Now().After(creds.TokenExpiry) {
- fmt.Fprintf(os.Stdout, "Token : EXPIRED (was %s)\n", creds.TokenExpiry.Format(time.RFC3339))
+ _, _ = fmt.Fprintf(os.Stdout, "Token : EXPIRED (was %s)\n", creds.TokenExpiry.Format(time.RFC3339))
} else {
- fmt.Fprintf(os.Stdout, "Token : valid until %s\n", creds.TokenExpiry.Format(time.RFC3339))
+ _, _ = fmt.Fprintf(os.Stdout, "Token : valid until %s\n", creds.TokenExpiry.Format(time.RFC3339))
}
}
if v := creds.Vouch; v != nil {
- fmt.Fprintf(os.Stdout, "PeerID : %s\n", v.PeerID)
+ _, _ = fmt.Fprintf(os.Stdout, "PeerID : %s\n", v.PeerID)
if v.Subject != "" {
- fmt.Fprintf(os.Stdout, "Subject: %s\n", v.Subject)
+ _, _ = fmt.Fprintf(os.Stdout, "Subject: %s\n", v.Subject)
}
if email := v.Email(); email != "" {
- fmt.Fprintf(os.Stdout, "Email : %s\n", email)
+ _, _ = fmt.Fprintf(os.Stdout, "Email : %s\n", email)
}
if name := v.Name(); name != "" {
- fmt.Fprintf(os.Stdout, "Name : %s\n", name)
+ _, _ = fmt.Fprintf(os.Stdout, "Name : %s\n", name)
}
if org := v.Org(); org != "" {
- fmt.Fprintf(os.Stdout, "Org : %s\n", org)
+ _, _ = fmt.Fprintf(os.Stdout, "Org : %s\n", org)
}
- fmt.Fprintf(os.Stdout, "Issuer : %s\n", v.Issuer)
+ _, _ = fmt.Fprintf(os.Stdout, "Issuer : %s\n", v.Issuer)
if v.IsExpired() {
- fmt.Fprintf(os.Stdout, "Vouch : EXPIRED (was %s)\n", v.Expiry.Format(time.RFC3339))
+ _, _ = fmt.Fprintf(os.Stdout, "Vouch : EXPIRED (was %s)\n", v.Expiry.Format(time.RFC3339))
} else {
- fmt.Fprintf(os.Stdout, "Vouch : valid until %s\n", v.Expiry.Format(time.RFC3339))
+ _, _ = fmt.Fprintf(os.Stdout, "Vouch : valid until %s\n", v.Expiry.Format(time.RFC3339))
}
} else {
- fmt.Fprintln(os.Stdout, "Vouch : none (Hub does not issue vouches, or run login again)")
+ _, _ = fmt.Fprintln(os.Stdout, "Vouch : none (Hub does not issue vouches, or run login again)")
}
return nil
}
diff --git a/cmd/sam/inspect.go b/cmd/sam/inspect.go
index cb45140e..b1e6aef1 100644
--- a/cmd/sam/inspect.go
+++ b/cmd/sam/inspect.go
@@ -122,15 +122,15 @@ func runInspectCard(cfg *runConfig, input string) error {
fmt.Println(string(data))
} else {
fmt.Printf("Peer ID: %s\n", card.PeerID)
- fmt.Printf("Name: %s\n", card.AgentCard.Name)
- fmt.Printf("Description: %s\n", card.AgentCard.Description)
+ fmt.Printf("Name: %s\n", card.Name)
+ fmt.Printf("Description: %s\n", card.Description)
fmt.Printf("Version: %s\n", card.Version)
fmt.Printf("Algorithm: %s\n", card.Algorithm)
fmt.Printf("Issued At: %s\n", card.IssuedAt.Format("2006-01-02T15:04:05Z07:00"))
- if len(card.AgentCard.Skills) > 0 {
+ if len(card.Skills) > 0 {
fmt.Println("\nSkills:")
- for _, skill := range card.AgentCard.Skills {
+ for _, skill := range card.Skills {
fmt.Printf(" - %s: %s\n", skill.ID, skill.Description)
}
}
diff --git a/cmd/sam/mesh_federations.go b/cmd/sam/mesh_federations.go
index d322b4d6..2852a35f 100644
--- a/cmd/sam/mesh_federations.go
+++ b/cmd/sam/mesh_federations.go
@@ -48,7 +48,7 @@ func runMeshFederationsList(format string) error {
if err != nil {
return fmt.Errorf("creating federation manager: %w", err)
}
- defer mgr.Close()
+ defer func() { _ = mgr.Close() }()
names, err := mgr.ListFederations()
if err != nil {
@@ -56,8 +56,8 @@ func runMeshFederationsList(format string) error {
}
if len(names) == 0 {
- fmt.Fprintln(os.Stdout, "No federation databases found.")
- fmt.Fprintf(os.Stdout, "Use --federation <name> with any command to create one.\n")
+ _, _ = fmt.Fprintln(os.Stdout, "No federation databases found.")
+ _, _ = fmt.Fprintf(os.Stdout, "Use --federation <name> with any command to create one.\n")
return nil
}
@@ -77,9 +77,9 @@ func runMeshFederationsList(format string) error {
return enc.Encode(out)
default:
w := tabwriter.NewWriter(os.Stdout, 0, 0, 2, ' ', 0)
- fmt.Fprintln(w, "NAME\tPATH")
+ _, _ = fmt.Fprintln(w, "NAME\tPATH")
for _, n := range names {
- fmt.Fprintf(w, "%s\t%s/%s.db\n", n, mgr.BaseDir(), n)
+ _, _ = fmt.Fprintf(w, "%s\t%s/%s.db\n", n, mgr.BaseDir(), n)
}
return w.Flush()
}
@@ -109,11 +109,11 @@ func runMeshFederationsDrop(name string, confirmed bool) error {
if err != nil {
return fmt.Errorf("creating federation manager: %w", err)
}
- defer mgr.Close()
+ defer func() { _ = mgr.Close() }()
if err := mgr.DropFederation(name); err != nil {
return fmt.Errorf("dropping federation %q: %w", name, err)
}
- fmt.Fprintf(os.Stdout, "Federation %q dropped.\n", name)
+ _, _ = fmt.Fprintf(os.Stdout, "Federation %q dropped.\n", name)
return nil
}
diff --git a/cmd/sam/mesh_get_agents.go b/cmd/sam/mesh_get_agents.go
index b339f68b..e54cf164 100644
--- a/cmd/sam/mesh_get_agents.go
+++ b/cmd/sam/mesh_get_agents.go
@@ -53,7 +53,7 @@ func runMeshGetAgents(parent context.Context, cfg *runConfig) error {
if err := node.Start(parent); err != nil {
return fmt.Errorf("starting node: %w", err)
}
- defer node.Stop(context.Background())
+ defer func() { _ = node.Stop(context.Background()) }()
svc, err := protocol.NewDiscoveryService(node, protocol.WithMaxDHTCardAge(cfg.dhtCardMaxAge))
if err != nil {
diff --git a/cmd/sam/node.go b/cmd/sam/node.go
index bcb6fbe4..d6eb4253 100644
--- a/cmd/sam/node.go
+++ b/cmd/sam/node.go
@@ -121,7 +121,7 @@ func parseDHTMode(mode string) samnet.DHTMode {
func waitForShutdown(parent context.Context, runFor time.Duration) error {
if runFor > 0 {
t := time.NewTimer(runFor)
- defer t.Stop()
+ defer func() { _ = t.Stop() }()
select {
case <-parent.Done():
return parent.Err()
diff --git a/cmd/sam/output.go b/cmd/sam/output.go
index 7e1cc6b2..c394583d 100644
--- a/cmd/sam/output.go
+++ b/cmd/sam/output.go
@@ -91,9 +91,9 @@ func printAgents(w io.Writer, cards []*protocol.AgentCard, format outputFormat,
func printAgentsTable(w io.Writer, rows []agentRow) error {
tw := tabwriter.NewWriter(w, 0, 0, 3, ' ', 0)
- fmt.Fprintln(tw, "PEER ID\tIDENTITY\tCAPABILITY\tLATENCY\tISSUED AT")
+ _, _ = fmt.Fprintln(tw, "PEER ID\tIDENTITY\tCAPABILITY\tLATENCY\tISSUED AT")
for _, r := range rows {
- fmt.Fprintf(tw, "%s\t%s\t%s\t%s\t%s\n",
+ _, _ = fmt.Fprintf(tw, "%s\t%s\t%s\t%s\t%s\n",
truncate(r.PeerID, 20),
r.Identity,
r.Capability,
diff --git a/cmd/sam/publish.go b/cmd/sam/publish.go
index f637f05b..e00e3875 100644
--- a/cmd/sam/publish.go
+++ b/cmd/sam/publish.go
@@ -84,7 +84,7 @@ func runPublish(parent context.Context, cfg *runConfig) error {
if err := node.Start(parent); err != nil {
return fmt.Errorf("starting node: %w", err)
}
- defer node.Stop(context.Background())
+ defer func() { _ = node.Stop(context.Background()) }()
priv := node.Host().Peerstore().PrivKey(node.PeerID())
if priv == nil {
diff --git a/cmd/sam/publish_card.go b/cmd/sam/publish_card.go
index 070b9cfd..2369e7f6 100644
--- a/cmd/sam/publish_card.go
+++ b/cmd/sam/publish_card.go
@@ -38,7 +38,7 @@ func runPublishCard(parent context.Context, cfg *runConfig) error {
if err := node.Start(parent); err != nil {
return fmt.Errorf("starting node: %w", err)
}
- defer node.Stop(context.Background())
+ defer func() { _ = node.Stop(context.Background()) }()
priv := node.Host().Peerstore().PrivKey(node.PeerID())
if priv == nil {
diff --git a/cmd/sam/publish_mcp.go b/cmd/sam/publish_mcp.go
index 4885929f..d3a1713e 100644
--- a/cmd/sam/publish_mcp.go
+++ b/cmd/sam/publish_mcp.go
@@ -47,7 +47,7 @@ func runPublishMCP(parent context.Context, cfg *runConfig) error {
if err := node.Start(parent); err != nil {
return fmt.Errorf("starting node: %w", err)
}
- defer node.Stop(context.Background())
+ defer func() { _ = node.Stop(context.Background()) }()
priv := node.Host().Peerstore().PrivKey(node.PeerID())
if priv == nil {
@@ -110,12 +110,12 @@ func (c *httpMCPConnector) Open(ctx context.Context) (mcp.Transport, error) {
resp, err := c.client.Do(req)
if err != nil {
- pw.Close()
+ _ = pw.Close()
return nil, fmt.Errorf("connecting to local MCP server at %s: %w", c.addr, err)
}
if resp.StatusCode != http.StatusOK {
- resp.Body.Close()
- pw.Close()
+ _ = resp.Body.Close()
+ _ = pw.Close()
return nil, fmt.Errorf("local MCP server returned %s", resp.Status)
}
return &mcp.IOTransport{Reader: resp.Body, Writer: pw}, nil
diff --git a/cmd/sam/up.go b/cmd/sam/up.go
index 6803c504..b03a8abd 100644
--- a/cmd/sam/up.go
+++ b/cmd/sam/up.go
@@ -39,7 +39,7 @@ func runUp(parent context.Context, cfg *runConfig) error {
if err := node.Start(parent); err != nil {
return fmt.Errorf("starting node: %w", err)
}
- defer node.Stop(context.Background())
+ defer func() { _ = node.Stop(context.Background()) }()
_, signingKey, err := ed25519.GenerateKey(rand.Reader)
if err != nil {
diff --git a/pkg/identity/device_flow.go b/pkg/identity/device_flow.go
index d893bb50..4e566aa6 100644
--- a/pkg/identity/device_flow.go
+++ b/pkg/identity/device_flow.go
@@ -208,7 +208,7 @@ func FetchVouch(ctx context.Context, vouchEndpoint, accessToken, peerID string,
if err != nil {
return nil, fmt.Errorf("vouch request: %w", err)
}
- defer resp.Body.Close()
+ defer func() { _ = resp.Body.Close() }()
body, err := io.ReadAll(io.LimitReader(resp.Body, 1<<16))
if err != nil {
@@ -252,7 +252,7 @@ func postForm(ctx context.Context, endpoint string, form url.Values, client *htt
if err != nil {
return nil, fmt.Errorf("POST %s: %w", endpoint, err)
}
- defer resp.Body.Close()
+ defer func() { _ = resp.Body.Close() }()
return io.ReadAll(io.LimitReader(resp.Body, 1<<16))
}
@@ -280,7 +280,7 @@ func doHTTPRequest(req *http.Request) ([]byte, error) {
if err != nil {
return nil, fmt.Errorf("%s %s: %w", req.Method, req.URL, err)
}
- defer resp.Body.Close()
+ defer func() { _ = resp.Body.Close() }()
body, err := io.ReadAll(io.LimitReader(resp.Body, 1<<16))
if err != nil {
return nil, fmt.Errorf("reading response body: %w", err)
diff --git a/pkg/net/node_test.go b/pkg/net/node_test.go
index 5348792b..9911c083 100644
--- a/pkg/net/node_test.go
+++ b/pkg/net/node_test.go
@@ -173,7 +173,7 @@ func TestDHTRouting(t *testing.T) {
if err := provider.Start(ctx); err != nil {
t.Fatalf("starting provider: %v", err)
}
- defer provider.Stop(ctx)
+ defer func() { _ = provider.Stop(ctx) }()
// Create and start the consumer node.
consumer, err := samnet.New(
@@ -186,7 +186,7 @@ func TestDHTRouting(t *testing.T) {
if err := consumer.Start(ctx); err != nil {
t.Fatalf("starting consumer: %v", err)
}
- defer consumer.Stop(ctx)
+ defer func() { _ = consumer.Stop(ctx) }()
// Connect the two nodes so the DHT can route between them.
providerInfo := peer.AddrInfo{
diff --git a/pkg/protocol/a2a.go b/pkg/protocol/a2a.go
index f092c486..374fc358 100644
--- a/pkg/protocol/a2a.go
+++ b/pkg/protocol/a2a.go
@@ -199,7 +199,7 @@ func Execute(ctx context.Context, h host.Host, req ExecuteRequest, observer Obse
observer.OnFailure(peerID, FailureTypeLiveness)
return nil, &LivenessError{PeerID: peerID, Err: err}
}
- defer stream.Close()
+ defer func() { _ = stream.Close() }()
// Propagate the caller's deadline to the stream so that all subsequent
// reads and writes respect the context timeout even after the stream is
@@ -265,7 +265,7 @@ func Execute(ctx context.Context, h host.Host, req ExecuteRequest, observer Obse
}
func (s *A2AService) handleStream(stream network.Stream) {
- defer stream.Close()
+ defer func() { _ = stream.Close() }()
peerID := stream.Conn().RemotePeer().String()
started := time.Now()
@@ -336,7 +336,7 @@ func (s *A2AService) handleStream(stream network.Stream) {
fail(FailureTypeInternal, fmt.Errorf("connecting local MCP transport: %w", err))
return
}
- defer conn.Close()
+ defer func() { _ = conn.Close() }()
if err := conn.Write(context.Background(), msg); err != nil {
fail(FailureTypeInternal, fmt.Errorf("writing local MCP request: %w", err))
diff --git a/pkg/protocol/a2a_test.go b/pkg/protocol/a2a_test.go
index a7334cff..fca1030a 100644
--- a/pkg/protocol/a2a_test.go
+++ b/pkg/protocol/a2a_test.go
@@ -95,13 +95,13 @@ func TestExecuteSuccessRecordsObserver(t *testing.T) {
if err != nil {
t.Fatalf("libp2p.New(server) error = %v", err)
}
- defer serverHost.Close()
+ defer func() { _ = serverHost.Close() }()
clientHost, err := libp2p.New()
if err != nil {
t.Fatalf("libp2p.New(client) error = %v", err)
}
- defer clientHost.Close()
+ defer func() { _ = clientHost.Close() }()
serverObserver := &testObserver{}
svc, err := NewA2AService(serverHost, staticResponseConnector{}, serverObserver)
@@ -151,7 +151,7 @@ func TestExecuteReturnsLivenessErrorWhenPeerDown(t *testing.T) {
if err != nil {
t.Fatalf("libp2p.New(client) error = %v", err)
}
- defer clientHost.Close()
+ defer func() { _ = clientHost.Close() }()
target := peer.AddrInfo{ID: serverHost.ID(), Addrs: serverHost.Addrs()}
if err := serverHost.Close(); err != nil {
diff --git a/pkg/protocol/discovery.go b/pkg/protocol/discovery.go
index 4d2f7ee6..9477cf23 100644
--- a/pkg/protocol/discovery.go
+++ b/pkg/protocol/discovery.go
@@ -254,7 +254,7 @@ func (s *DiscoveryService) fetchCardFromStream(ctx context.Context, pi peer.Addr
if err != nil {
return nil, fmt.Errorf("opening card stream to %s: %w", pi.ID, err)
}
- defer stream.Close()
+ defer func() { _ = stream.Close() }()
var card AgentCard
if err := json.NewDecoder(stream).Decode(&card); err != nil {
@@ -270,7 +270,7 @@ func (s *DiscoveryService) fetchCardFromStream(ctx context.Context, pi peer.Addr
}
func (s *DiscoveryService) handleAgentCardStream(stream network.Stream) {
- defer stream.Close()
+ defer func() { _ = stream.Close() }()
s.mu.RLock()
card := s.localCard
diff --git a/pkg/protocol/discovery_test.go b/pkg/protocol/discovery_test.go
index 268a3a96..f75a914a 100644
--- a/pkg/protocol/discovery_test.go
+++ b/pkg/protocol/discovery_test.go
@@ -65,13 +65,13 @@ func TestDiscoverReturnsVerifiedCards(t *testing.T) {
if err != nil {
t.Fatalf("libp2p.New provider error = %v", err)
}
- defer providerHost.Close()
+ defer func() { _ = providerHost.Close() }()
consumerHost, err := libp2p.New()
if err != nil {
t.Fatalf("libp2p.New consumer error = %v", err)
}
- defer consumerHost.Close()
+ defer func() { _ = consumerHost.Close() }()
providerPriv := providerHost.Peerstore().PrivKey(providerHost.ID())
card, err := protocol.NewAgentCard(providerHost.ID(), []string{"inference"}, nil, providerPriv)
@@ -80,7 +80,7 @@ func TestDiscoverReturnsVerifiedCards(t *testing.T) {
}
providerHost.SetStreamHandler(protocol.AgentCardProtocolID, func(s network.Stream) {
- defer s.Close()
+ defer func() { _ = s.Close() }()
_ = json.NewEncoder(s).Encode(card)
})
@@ -113,19 +113,19 @@ func TestDiscoverPeerIDsReturnsUniqueRemotePeers(t *testing.T) {
if err != nil {
t.Fatalf("libp2p.New consumer error = %v", err)
}
- defer consumerHost.Close()
+ defer func() { _ = consumerHost.Close() }()
providerA, err := libp2p.New()
if err != nil {
t.Fatalf("libp2p.New providerA error = %v", err)
}
- defer providerA.Close()
+ defer func() { _ = providerA.Close() }()
providerB, err := libp2p.New()
if err != nil {
t.Fatalf("libp2p.New providerB error = %v", err)
}
- defer providerB.Close()
+ defer func() { _ = providerB.Close() }()
ch := make(chan peer.AddrInfo, 5)
ch <- peer.AddrInfo{ID: providerA.ID(), Addrs: providerA.Addrs()}
@@ -166,13 +166,13 @@ func TestDiscoverAndConnectReturnsPartialSuccess(t *testing.T) {
if err != nil {
t.Fatalf("libp2p.New consumer error = %v", err)
}
- defer consumerHost.Close()
+ defer func() { _ = consumerHost.Close() }()
provider, err := libp2p.New()
if err != nil {
t.Fatalf("libp2p.New provider error = %v", err)
}
- defer provider.Close()
+ defer func() { _ = provider.Close() }()
priv, _, err := crypto.GenerateEd25519Key(cryptorand.Reader)
if err != nil {
@@ -213,7 +213,7 @@ func TestDiscoverPrefersDHTCard(t *testing.T) {
if err != nil {
t.Fatalf("libp2p.New consumer error = %v", err)
}
- defer consumerHost.Close()
+ defer func() { _ = consumerHost.Close() }()
priv, _, err := crypto.GenerateEd25519Key(cryptorand.Reader)
if err != nil {
@@ -270,13 +270,13 @@ func TestDiscoverFallsBackToStreamWhenDHTCardInvalid(t *testing.T) {
if err != nil {
t.Fatalf("libp2p.New provider error = %v", err)
}
- defer providerHost.Close()
+ defer func() { _ = providerHost.Close() }()
consumerHost, err := libp2p.New()
if err != nil {
t.Fatalf("libp2p.New consumer error = %v", err)
}
- defer consumerHost.Close()
+ defer func() { _ = consumerHost.Close() }()
providerPriv := providerHost.Peerstore().PrivKey(providerHost.ID())
card, err := protocol.NewAgentCard(providerHost.ID(), []string{"inference"}, nil, providerPriv)
@@ -285,7 +285,7 @@ func TestDiscoverFallsBackToStreamWhenDHTCardInvalid(t *testing.T) {
}
providerHost.SetStreamHandler(protocol.AgentCardProtocolID, func(s network.Stream) {
- defer s.Close()
+ defer func() { _ = s.Close() }()
_ = json.NewEncoder(s).Encode(card)
})
@@ -326,7 +326,7 @@ func TestDiscoverAllowsStaleDHTCardWhenMaxAgeDisabled(t *testing.T) {
if err != nil {
t.Fatalf("libp2p.New consumer error = %v", err)
}
- defer consumerHost.Close()
+ defer func() { _ = consumerHost.Close() }()
priv, _, err := crypto.GenerateEd25519Key(cryptorand.Reader)
if err != nil {
diff --git a/pkg/protocol/mcp_bridge.go b/pkg/protocol/mcp_bridge.go
index 86766a91..92be1917 100644
--- a/pkg/protocol/mcp_bridge.go
+++ b/pkg/protocol/mcp_bridge.go
@@ -74,7 +74,7 @@ func (b *MCPBridge) Open(ctx context.Context, peerID peer.ID, req BridgeOpenRequ
}
func (b *MCPBridge) handleInbound(stream network.Stream) {
- defer stream.Close()
+ defer func() { _ = stream.Close() }()
reader := bufio.NewReader(stream)
@@ -160,13 +160,13 @@ func proxyMCPMessages(ctx context.Context, remote mcp.Transport, local mcp.Trans
if err != nil {
return fmt.Errorf("connecting remote MCP transport: %w", err)
}
- defer remoteConn.Close()
+ defer func() { _ = remoteConn.Close() }()
localConn, err := local.Connect(ctx)
if err != nil {
return fmt.Errorf("connecting local MCP transport: %w", err)
}
- defer localConn.Close()
+ defer func() { _ = localConn.Close() }()
errCh := make(chan error, 2)
go forwardMCP(ctx, remoteConn, localConn, errCh)
diff --git a/pkg/protocol/mcp_bridge_test.go b/pkg/protocol/mcp_bridge_test.go
index 080015d5..fd823ba5 100644
--- a/pkg/protocol/mcp_bridge_test.go
+++ b/pkg/protocol/mcp_bridge_test.go
@@ -48,7 +48,7 @@ type echoConnector struct{}
func (echoConnector) Open(context.Context) (mcp.Transport, error) {
a, b := net.Pipe()
go func() {
- defer b.Close()
+ defer func() { _ = b.Close() }()
buf := make([]byte, 32*1024)
for {
n, err := b.Read(buf)
@@ -73,13 +73,13 @@ func TestMCPBridgeAllowsAuthorizedStream(t *testing.T) {
if err != nil {
t.Fatalf("libp2p.New(server) error = %v", err)
}
- defer serverHost.Close()
+ defer func() { _ = serverHost.Close() }()
clientHost, err := libp2p.New()
if err != nil {
t.Fatalf("libp2p.New(client) error = %v", err)
}
- defer clientHost.Close()
+ defer func() { _ = clientHost.Close() }()
verifier := &fakeVerifier{}
_, err = NewMCPBridge(serverHost, verifier, echoConnector{})
@@ -106,7 +106,7 @@ func TestMCPBridgeAllowsAuthorizedStream(t *testing.T) {
if err != nil {
t.Fatalf("Open() error = %v", err)
}
- defer stream.Close()
+ defer func() { _ = stream.Close() }()
payload := []byte("{\"jsonrpc\":\"2.0\",\"id\":1,\"method\":\"ping\"}\n")
if _, err := stream.Write(payload); err != nil {
@@ -134,13 +134,13 @@ func TestMCPBridgeDeniesUnauthorizedStream(t *testing.T) {
if err != nil {
t.Fatalf("libp2p.New(server) error = %v", err)
}
- defer serverHost.Close()
+ defer func() { _ = serverHost.Close() }()
clientHost, err := libp2p.New()
if err != nil {
t.Fatalf("libp2p.New(client) error = %v", err)
}
- defer clientHost.Close()
+ defer func() { _ = clientHost.Close() }()
denyVerifier := &fakeVerifier{err: errors.New("insufficient funds")}
_, err = NewMCPBridge(serverHost, denyVerifier, echoConnector{})
@@ -167,7 +167,7 @@ func TestMCPBridgeDeniesUnauthorizedStream(t *testing.T) {
if err != nil {
t.Fatalf("Open() error = %v", err)
}
- defer stream.Close()
+ defer func() { _ = stream.Close() }()
buf := make([]byte, 2048)
n, err := stream.Read(buf)
diff --git a/tests/integration/call_test.go b/tests/integration/call_test.go
index 5acbc3d9..042ba76a 100644
--- a/tests/integration/call_test.go
+++ b/tests/integration/call_test.go
@@ -108,7 +108,7 @@ func runCallIntegration(t *testing.T) {
if err != nil {
t.Fatalf("opening reputation DB: %v", err)
}
- defer db.Close()
+ defer func() { _ = db.Close() }()
type reputationRecord struct {
PeerID string `json:"peer_id"`
@@ -174,7 +174,9 @@ func runCallProviderRole() error {
}
// In a subprocess role, fire Stop asynchronously so the process can exit
// promptly; the OS will clean up resources when the process terminates.
- defer func() { go node.Stop(context.Background()) }()
+ defer func() {
+ go func() { _ = node.Stop(context.Background()) }()
+ }()
// Register the A2A handler BEFORE writing the info file so the consumer
// cannot connect and attempt Execute before the protocol is ready.
@@ -273,7 +275,9 @@ func runCallConsumerRole() error {
}
// In a subprocess role, fire Stop asynchronously so the process can exit
// promptly; the OS will clean up resources when the process terminates.
- defer func() { go node.Stop(context.Background()) }()
+ defer func() {
+ go func() { _ = node.Stop(context.Background()) }()
+ }()
if err := connectCallWithRetry(ctx, node, *providerAddrInfo); err != nil {
return fmt.Errorf("connecting to provider bootstrap: %w", err)
@@ -287,7 +291,7 @@ func runCallConsumerRole() error {
if err != nil {
return fmt.Errorf("creating bolt observer: %w", err)
}
- defer observer.Close()
+ defer func() { _ = observer.Close() }()
vouch := identity.NewVouch(node.PeerID().String(), "self", "test-subject", map[string]string{"name": "consumer"}, time.Hour)
req := protocol.ExecuteRequest{
@@ -376,25 +380,6 @@ func connectCallWithRetry(ctx context.Context, node samnet.Node, pi peer.AddrInf
}
}
-func discoverCallPeersWithRetry(ctx context.Context, svc *protocol.DiscoveryService, capability string) ([]peer.AddrInfo, error) {
- ticker := time.NewTicker(300 * time.Millisecond)
- defer ticker.Stop()
- for {
- peers, err := svc.DiscoverPeers(ctx, capability)
- if err == nil && len(peers) > 0 {
- return peers, nil
- }
- select {
- case <-ctx.Done():
- if err != nil {
- return nil, fmt.Errorf("discovering peers for capability %q: %w", capability, err)
- }
- return nil, fmt.Errorf("no peers discovered for capability %q", capability)
- case <-ticker.C:
- }
- }
-}
-
func writeCallPeerInfo(path string, info callPeerInfo) error {
if path == "" {
return fmt.Errorf("%s is required", callInfoEnv)
@@ -482,7 +467,7 @@ type delayedResponseConnector struct {
}
func (c delayedResponseConnector) Open(context.Context) (mcp.Transport, error) {
- return delayedResponseTransport{delay: c.delay}, nil
+ return delayedResponseTransport(c), nil
}
type delayedResponseTransport struct {
diff --git a/tests/integration/cuj_test.go b/tests/integration/cuj_test.go
index 8aa8e121..e76496e2 100644
--- a/tests/integration/cuj_test.go
+++ b/tests/integration/cuj_test.go
@@ -82,7 +82,7 @@ func runCUJ2HolePunchRelayAssisted(t *testing.T) {
const protoID coreprotocol.ID = "/sam/cuj/holepunch/1.0"
target.Host().SetStreamHandler(protoID, func(s network.Stream) {
- defer s.Close()
+ defer func() { _ = s.Close() }()
r := bufio.NewReader(s)
line, _ := r.ReadString('\n')
_, _ = io.WriteString(s, line)
@@ -157,7 +157,9 @@ func cujStartNode(t *testing.T, cfg cujNodeConfig) samnet.Node {
if err := n.Start(context.Background()); err != nil {
t.Fatalf("starting node: %v", err)
}
- t.Cleanup(func() { go n.Stop(context.Background()) })
+ t.Cleanup(func() {
+ go func() { _ = n.Stop(context.Background()) }()
+ })
return n
}
diff --git a/tests/integration/mesh_test.go b/tests/integration/mesh_test.go
index 0c54f56a..bbd89d6f 100644
--- a/tests/integration/mesh_test.go
+++ b/tests/integration/mesh_test.go
@@ -168,7 +168,7 @@ func runMeshPublisher() error {
if err := node.Start(ctx); err != nil {
return fmt.Errorf("publisher node start: %w", err)
}
- defer node.Stop(context.Background())
+ defer func() { _ = node.Stop(context.Background()) }()
// Write the peer info before publishing so the subscriber can start
// connecting as soon as the DHT bootstrap is ready.
@@ -256,7 +256,7 @@ func runMeshSubscriber() error {
if err := node.Start(ctx); err != nil {
return fmt.Errorf("subscriber node start: %w", err)
}
- defer node.Stop(context.Background())
+ defer func() { _ = node.Stop(context.Background()) }()
if err := meshConnectWithRetry(ctx, node, *publisherAddrInfo); err != nil {
return fmt.Errorf("connecting to publisher bootstrap: %w", err)
@@ -327,7 +327,7 @@ func meshEchoRoundTrip(ctx context.Context, bridge *protocol.MCPBridge, target p
if err != nil {
return fmt.Errorf("opening bridge stream: %w", err)
}
- defer stream.Close()
+ defer func() { _ = stream.Close() }()
payload := []byte("{\"jsonrpc\":\"2.0\",\"id\":1,\"method\":\"ping\"}\n")
if _, err := stream.Write(payload); err != nil {
@@ -560,13 +560,13 @@ func configureMeshLinkInNetNS(t *testing.T, pid int, linkName, cidr string) {
if err != nil {
t.Fatalf("getting current netns: %v", err)
}
- defer originalNS.Close()
+ defer func() { _ = originalNS.Close() }()
targetNS, err := netns.GetFromPid(pid)
if err != nil {
t.Fatalf("getting netns for pid %d: %v", pid, err)
}
- defer targetNS.Close()
+ defer func() { _ = targetNS.Close() }()
if err := netns.Set(targetNS); err != nil {
t.Fatalf("entering netns for pid %d: %v", pid, err)
@@ -610,7 +610,7 @@ func writeMeshPeerInfo(path string, info meshPeerInfo) error {
if err != nil {
return fmt.Errorf("creating mesh info file: %w", err)
}
- defer f.Close()
+ defer func() { _ = f.Close() }()
return json.NewEncoder(f).Encode(info)
}
@@ -679,7 +679,7 @@ type meshEchoConnector struct{}
func (meshEchoConnector) Open(context.Context) (mcp.Transport, error) {
a, b := net.Pipe()
go func() {
- defer b.Close()
+ defer func() { _ = b.Close() }()
buf := make([]byte, 32*1024)
for {
n, err := b.Read(buf)
diff --git a/tests/integration/p2p_test.go b/tests/integration/p2p_test.go
index 4d364144..23a65753 100644
--- a/tests/integration/p2p_test.go
+++ b/tests/integration/p2p_test.go
@@ -133,7 +133,7 @@ func runProviderRole() error {
if err != nil {
return err
}
- defer node.Stop(context.Background())
+ defer func() { _ = node.Stop(context.Background()) }()
if err := node.Start(ctx); err != nil {
return fmt.Errorf("provider node start: %w", err)
@@ -238,7 +238,7 @@ func runConsumerRole() error {
if err != nil {
return err
}
- defer node.Stop(context.Background())
+ defer func() { _ = node.Stop(context.Background()) }()
if err := node.Start(ctx); err != nil {
return fmt.Errorf("consumer node start: %w", err)
@@ -362,7 +362,7 @@ func expectDeniedBridge(ctx context.Context, bridge *protocol.MCPBridge, provide
if err != nil {
return fmt.Errorf("opening denied bridge stream: %w", err)
}
- defer stream.Close()
+ defer func() { _ = stream.Close() }()
buf := make([]byte, 1024)
n, readErr := stream.Read(buf)
@@ -386,7 +386,7 @@ func expectAllowedBridge(ctx context.Context, bridge *protocol.MCPBridge, provid
if err != nil {
return fmt.Errorf("opening allowed bridge stream: %w", err)
}
- defer stream.Close()
+ defer func() { _ = stream.Close() }()
payload := []byte("{\"jsonrpc\":\"2.0\",\"id\":1,\"method\":\"handshake\"}\n")
if _, err := stream.Write(payload); err != nil {
@@ -425,7 +425,7 @@ func writeProviderInfo(path string, info providerInfo) error {
if err != nil {
return fmt.Errorf("creating provider info file: %w", err)
}
- defer f.Close()
+ defer func() { _ = f.Close() }()
if err := json.NewEncoder(f).Encode(info); err != nil {
return fmt.Errorf("encoding provider info: %w", err)
}
@@ -574,13 +574,13 @@ func configureLinkInNetNS(t *testing.T, pid int, linkName, cidr string) {
if err != nil {
t.Fatalf("getting current netns: %v", err)
}
- defer originalNS.Close()
+ defer func() { _ = originalNS.Close() }()
targetNS, err := netns.GetFromPid(pid)
if err != nil {
t.Fatalf("getting target netns for pid %d: %v", pid, err)
}
- defer targetNS.Close()
+ defer func() { _ = targetNS.Close() }()
if err := netns.Set(targetNS); err != nil {
t.Fatalf("entering netns for pid %d: %v", pid, err)
@@ -637,7 +637,7 @@ type echoConnector struct{}
func (echoConnector) Open(context.Context) (mcp.Transport, error) {
a, b := net.Pipe()
go func() {
- defer b.Close()
+ defer func() { _ = b.Close() }()
buf := make([]byte, 32*1024)
for {
n, err := b.Read(buf)