From a4cc516896ad3a9ac0c03294607b191a635825a3 Mon Sep 17 00:00:00 2001
From: Roy Lee <roylee17@gmail.com>
Date: Mon, 13 Sep 2021 16:55:40 -0700
Subject: [PATCH] [lbry] ci: fix linting (nakedret)

---
 blockchain/common_test.go | 6 +++---
 upnp.go                   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/blockchain/common_test.go b/blockchain/common_test.go
index 16ad6756..8560071b 100644
--- a/blockchain/common_test.go
+++ b/blockchain/common_test.go
@@ -69,7 +69,7 @@ func loadBlocks(filename string) (blocks []*btcutil.Block, err error) {
 
 	fi, err = os.Open(filename)
 	if err != nil {
-		return
+		return blocks, err
 	}
 
 	if strings.HasSuffix(filename, ".bz2") {
@@ -107,12 +107,12 @@ func loadBlocks(filename string) (blocks []*btcutil.Block, err error) {
 
 		block, err = btcutil.NewBlockFromBytes(rbytes)
 		if err != nil {
-			return
+			return blocks, err
 		}
 		blocks = append(blocks, block)
 	}
 
-	return
+	return blocks, err
 }
 
 // chainSetup is used to create a new db and chain instance with the genesis
diff --git a/upnp.go b/upnp.go
index 402924f5..d07d5ce9 100644
--- a/upnp.go
+++ b/upnp.go
@@ -136,7 +136,7 @@ func Discover() (nat NAT, err error) {
 		return
 	}
 	err = errors.New("UPnP port discovery failed")
-	return
+	return nat, err
 }
 
 // service represents the Service type in an UPnP xml description.
@@ -269,7 +269,7 @@ func getServiceURL(rootURL string) (url string, err error) {
 		return
 	}
 	url = combineURL(rootURL, d.ControlURL)
-	return
+	return url, err
 }
 
 // combineURL appends subURL onto rootURL.