From c316a9f7b3310a4a1ad3d7d430be8cd2bbfcb859 Mon Sep 17 00:00:00 2001
From: Yutaka Takeda <yt0916@gmail.com>
Date: Sun, 14 Jul 2019 14:16:59 -0700
Subject: [PATCH] Fix lint errors

pion/webrtc#712
---
 candidate_relay.go        | 2 +-
 connectivity_vnet_test.go | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/candidate_relay.go b/candidate_relay.go
index 3eb32c7..0cc01ff 100644
--- a/candidate_relay.go
+++ b/candidate_relay.go
@@ -66,7 +66,7 @@ func NewCandidateRelay(config *CandidateRelayConfig) (*CandidateRelay, error) {
 func (c *CandidateRelay) close() error {
 	err := c.candidateBase.close()
 	if c.onClose != nil {
-		c.onClose()
+		err = c.onClose()
 		c.onClose = nil
 	}
 	return err
diff --git a/connectivity_vnet_test.go b/connectivity_vnet_test.go
index 1232f98..46f7a13 100644
--- a/connectivity_vnet_test.go
+++ b/connectivity_vnet_test.go
@@ -21,8 +21,8 @@ type virtualNet struct {
 }
 
 func (v *virtualNet) close() {
-	v.server.Close() // nolint:errcheck
-	v.wan.Stop()
+	v.server.Close() // nolint:errcheck,gosec
+	v.wan.Stop()     // nolint:errcheck,gosec
 }
 
 func buildVNet(natType *vnet.NATType) (*virtualNet, error) {
@@ -250,10 +250,7 @@ func closePipe(t *testing.T, ca *Conn, cb *Conn) bool {
 		return false
 	}
 	err = cb.Close()
-	if !assert.NoError(t, err, "should succeed") {
-		return false
-	}
-	return true
+	return assert.NoError(t, err, "should succeed")
 }
 
 func TestConnectivityVNet(t *testing.T) {