From eb989f6942d407377e8ad53ef8a0ad3b8857b1e0 Mon Sep 17 00:00:00 2001
From: Oliver Gugger <gugger@gmail.com>
Date: Thu, 6 May 2021 14:01:17 +0200
Subject: [PATCH] multi: enable prealloc linter for non-test code

---
 .golangci.yml   | 8 ++++----
 blockmanager.go | 8 ++++----
 neutrino.go     | 2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index e5c2ea55..330237f9 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -32,10 +32,6 @@ linters:
     # land.
     - gocyclo
 
-    # Instances of table driven tests that don't pre-allocate shouldn't trigger
-    # the linter.
-    - prealloc
-
     # Init functions are used by loggers throughout the codebase.
     - gochecknoinits
 
@@ -48,3 +44,7 @@ issues:
         - gosec
         - errcheck
         - dupl
+
+        # Instances of table driven tests that don't pre-allocate shouldn't
+        # trigger the linter.
+        - prealloc
diff --git a/blockmanager.go b/blockmanager.go
index 57dadd14..49fcae94 100644
--- a/blockmanager.go
+++ b/blockmanager.go
@@ -822,12 +822,12 @@ type checkpointedCFHeadersQuery struct {
 
 // requests creates the query.Requests for this CF headers query.
 func (c *checkpointedCFHeadersQuery) requests() []*query.Request {
-	var reqs []*query.Request
-	for _, m := range c.msgs {
-		reqs = append(reqs, &query.Request{
+	reqs := make([]*query.Request, len(c.msgs))
+	for idx, m := range c.msgs {
+		reqs[idx] = &query.Request{
 			Req:        m,
 			HandleResp: c.handleResponse,
-		})
+		}
 	}
 	return reqs
 }
diff --git a/neutrino.go b/neutrino.go
index 8b7efb9a..e0dd47c9 100644
--- a/neutrino.go
+++ b/neutrino.go
@@ -337,7 +337,7 @@ func (sp *ServerPeer) OnAddr(_ *peer.Peer, msg *wire.MsgAddr) {
 		return
 	}
 
-	var addrsSupportingServices []*wire.NetAddress
+	addrsSupportingServices := make([]*wire.NetAddress, 0, len(msg.AddrList))
 	for _, na := range msg.AddrList {
 		// Don't add more address if we're disconnecting.
 		if !sp.Connected() {